watero推送订单，推送邮编

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/UserMachineInfo.java

@@ -37,7 +37,9 @@ public class UserMachineInfo implements Serializable{
 	private String userMachineAddressName;//收件人姓名
 	
 	private String userMachineAddressTel;//收件人电话
-	
+
+	private String userMachineAddressPostalcode;//收件人邮编
+
 	private String userMachinePostName;//快递名称
 	
 	private String userMachinePostNum;//快递单号
@@ -190,4 +192,12 @@ public class UserMachineInfo implements Serializable{
 	public void setUserMachinePostNum(String userMachinePostNum) {
 		this.userMachinePostNum = userMachinePostNum;
 	}
+
+	public String getUserMachineAddressPostalcode() {
+		return userMachineAddressPostalcode;
+	}
+
+	public void setUserMachineAddressPostalcode(String userMachineAddressPostalcode) {
+		this.userMachineAddressPostalcode = userMachineAddressPostalcode;
+	}
 }

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

@@ -150,7 +150,8 @@ public class GiftCardServiceImpl implements GiftCardService {
 		orderData.put("city_name", addressDesc[1]);                                    // 城市
 		orderData.put("consignee", machineInfo.getUserMachineAddressName());                        // 收货人
 		orderData.put("district_name", addressDesc[2]);                                    // 区域
-		orderData.put("email", "");                                                        // email
+		orderData.put("postalcode", machineInfo.getUserMachineAddressPostalcode());     // 邮政编码
+		orderData.put("email", "");                                                         // email
 		orderData.put("goods_amount", productColor.getColorDiscount() / 100);                    // 商品总价
 		orderData.put("goods_count", 1);                                        // 产品数量
 		orderData.put("mobile", machineInfo.getUserMachineAddressTel());                            // 手机号码

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -246,6 +246,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("city_name", addressDesc[1]);                                    // 城市
 		orderData.put("consignee", order.getSalesAddressName());                        // 收货人
 		orderData.put("district_name", addressDesc[2]);                                    // 区域
+		orderData.put("postalcode", order.getSalesAddressPostnum());     // salesAddressPostnum
 		orderData.put("email", "");                                                        // email
 		orderData.put("goods_amount", (order.getSalesAmount()));                    // 商品总价
 		orderData.put("goods_count", items.size());                                        // 产品数量

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/giftCard/CardHandler.java

@@ -258,20 +258,20 @@ public class CardHandler {
                 return json;
             }
             // 判断是否已经达到目标并赠送一台水机，如果赠送了，则推送消息
-				if ("1".equals(map.get("target"))) {
-					Member member = memberService.getMemberByUserOpenId(agent.getAgentOpenId());
-					sendMessageUtil.prizeReceivePush(
-							"您好，您已经达到销售目标，详情为:",
-                        URLDecoder.decode(member.getUserNickname(), "UTF-8"),
-                        "Watero水时代",
-                        "0元",
-                        DateTimeUtil.format(new Date()),
-                        "美国watero净饮水一体机一台",
-                        "请点击完善收货地址并领取奖励。",
-                        member.getUserOpenid(),
-                        ResultInfo.AGENT_REFERRER_MACHINE_PAGE
-                                + "?agentMachineId="
-                                + map.get("agentMachineId"));
+			if ("1".equals(map.get("target"))) {
+				Member member = memberService.getMemberByUserOpenId(agent.getAgentOpenId());
+				sendMessageUtil.prizeReceivePush(
+						"您好，您已经达到销售目标，详情为:",
+					URLDecoder.decode(member.getUserNickname(), "UTF-8"),
+					"Watero水时代",
+					"0元",
+					DateTimeUtil.format(new Date()),
+					"美国watero净饮水一体机一台",
+					"请点击完善收货地址并领取奖励。",
+					member.getUserOpenid(),
+					ResultInfo.AGENT_REFERRER_MACHINE_PAGE
+							+ "?agentMachineId="
+							+ map.get("agentMachineId"));
             }
 
         } catch (Exception e) {

watero-wechat-web/src/main/webapp/view/gift_card_user_exchange.html

@@ -200,7 +200,7 @@
         });
         document.querySelector('.loading-bg').style.display='none';
     });
-    var address='',nickname='',ads_tel='';
+    var address='',nickname='',ads_tel='',ads_pos='';
     // 获取微信共享地址
     mui('body').on('tap', '#open-wechat-addres-a', function() {
         editAddrV1(
@@ -209,6 +209,7 @@
                 address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
                 nickname=res.userName;
                 ads_tel= res.telNumber;
+                ads_pos =  res.postalCode;
                 wechatAddr.status = true;
                 wechatAddr.detailInfo = address;
                 wechatAddr.postalCode = res.postalCode;
@@ -242,6 +243,7 @@
                 "userMachineAddressInfo": address,
                 "userMachineAddressName": nickname,
                 "userMachineAddressTel":ads_tel,
+                "userMachineAddressPostalcode": ads_pos
             };
             $.ajax({
                 type: 'post',