Merge remote-tracking branch 'origin/uat' into uat

# Conflicts:
#	suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java
#	suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml
#	suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -152,6 +152,13 @@ public class SysUser extends BaseEntity
 
     private String subOfficeName;
 
+
+    //销售部编码
+    private String subOfficeCode;
+
+    //公司名称
+    private String companyName;
+
     //应用类型对应关系
     private List<Map<String,Object> >loginTypeList;
    //门店对应关系
@@ -173,6 +180,22 @@ public class SysUser extends BaseEntity
         return loginTypeList;
     }
 
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public String getSubOfficeCode() {
+        return subOfficeCode;
+    }
+
+    public void setSubOfficeCode(String subOfficeCode) {
+        this.subOfficeCode = subOfficeCode;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
 
     public String getQuit(){return  quit;}
 

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -310,14 +310,20 @@ public class WxController extends ApiBaseController {
     public Object sendOrderDeliverMessage() {
 
         ParameterObject obj = getParameterObject();
+        logger.info("发送订单通知:{}"+obj);
         obj.checkParameterNotNull("chain,order,customerName");
         String chain = obj.getString("chain");
         String customerName = obj.getString("customerName");
         String order = obj.getString("order");
-        String temple = configService.selectConfigByKey("wx.notification.order.complete");
-        String orderFormat = getOrderFormat(order, customerName);
-
-        String message = String.format(temple, orderFormat, chain);
+        String message = "";
+        if("123456789".equals(order)){
+            message = "出厂通知：您有订单6114600627 货物已出厂，可以进入<a href='https://suishenbangtest.nipponpaint.com.cn/order/onlineTracking/distributor?parType=customer_level&parValue=%s&status=6'>随身邦</a>查询详情。";
+           // message = "交货通知：您有订单6114600627 已于今天交货，可以进入<a href='https://suishenbangtest.nipponpaint.com.cn/order/onlineTracking/distributor?parType=customer_level&parValue=%s&status=4'>随身邦</a>查询详情。";
+        }else {
+            String temple = configService.selectConfigByKey("wx.notification.order.complete");
+            String orderFormat = getOrderFormat(order, customerName);
+            message = String.format(temple, orderFormat, chain);
+        }
         Set<String> customerCodes = new HashSet<>();
         customerCodes.add(chain);
         logger.info("收到需要通知的经销商组织代码："+chain);