Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/approval/HistoricalRecord.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

watero-wechat-service/src/main/java/com/iamberry/wechat/service/giftCard/GiftCardServiceImpl.java

@@ -171,7 +171,7 @@ public class GiftCardServiceImpl implements GiftCardService {
 		orderData.put("orders", maps);                                                    // 订单产品
 		orderData.put("pay_name", "weixinpay");                                            // 支付方式
 		orderData.put("pay_time", DateTimeUtil.format(new Date()));// 支付时间
-		orderData.put("postscript","");                        // 买家留言
+		orderData.put("postscript","礼品卡提货");                        // 买家留言
 		orderData.put("province_name", provinceName);                                    // 省份
 		orderData.put("sd_id", sd_id);                                                    // 对应 efast 店铺 id
 		orderData.put("shipping_fee", 0);                                                // 快递费

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.order.Order;
@@ -142,6 +143,22 @@ public class MQTask implements InitializingBean {
 		logger.info("------------task invoke success-----------");
 	}
 
+	/*public static void main(String[] args) {
+		Map<String, Object> orderData = new HashMap<String, Object>();
+		Map<String, String> requestData = new HashMap<String, String>();
+		com.fasterxml.jackson.databind.ObjectMapper mapper = new ObjectMapper();
+		orderData.put("orderId", 11);
+		orderData.put("sd_id", 1);
+		requestData.put("app_act", "rst.trade.logistics.get");
+		String orderDataStr = null;
+		try {
+			orderDataStr = mapper.writeValueAsString(orderData);
+		} catch (JsonProcessingException e) {
+			e.printStackTrace();
+		}
+		requestData.put("info", orderDataStr);
+		System.out.println("app_act==:" + requestData.get("app_act") + "info==:" + requestData.get("info"));
+	}*/
 	/**
 	 * 根据订单号拉取物流信息
 	 * @throws Exception