合并1113分支

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

@@ -146,10 +146,18 @@ public class SysUser extends BaseEntity
     //门店账号标识 1门店账号 0非门店账号
     private String  isShopAccount;
 
+    //大区
     private String officeName;
 
+    //销售部
     private String subOfficeName;
 
+    //销售部编码
+    private String subOfficeCode;
+
+    //公司名称
+    private String companyName;
+
     //应用类型对应关系
     private List<Map<String,Object> >loginTypeList;
    //门店对应关系
@@ -171,6 +179,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;
+    }
+
     private String shopType;
 
     public String getQuit(){return  quit;}

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -32,7 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
 		<result property="officeName"       column="sales_office_name"       />
-		<result property="subOfficeName"       column="sales_group_name"       />
+		<result property="subOfficeName"       column="subOffice_name"       />
+		<result property="subOfficeCode"       column="subOffice_code"       />
+		<result property="companyName"       column="sales_company_name"       />
 		<result property="isConsignee"       column="is_consignee"       />
 		<result property="isIndependently"  column="is_independently" />
 		<result property="isSelfDelivery" column="is_self_delivery" />
@@ -98,14 +100,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
        		    suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
-       		    suse.post_name,suse.post_code,suse.identity,cust.sales_office_name,cust.sales_office_name ,cust.sales_group_name
+       		    suse.post_name,suse.post_code,suse.identity,shop.subOffice_code,shop.subOffice_name,org.sales_company_name,org.sales_office_name
 		from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_company c on u.company_id = c.id
 			 left join sys_user_role ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 			 left join sys_user_ext suse on suse.user_id = u.user_id  and suse.del_flag = '0'
-			 left join data_master_customer cust on cust.CustomerCode = suse.customer_code
+			 LEFT JOIN sys_user_shop_ext shop  on u.user_id = shop.user_id
+			 LEFT JOIN data_master_org org on org.sales_group = shop.subOffice_code
     </sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">

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 = "出厂通知：您有订单<a href='https://suishenbangtest.nipponpaint.com.cn/order/onlineTracking/distributor?parType=customer_level&parValue=%s&status=6'>1701890984</a> 货物已出厂，可以进入<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);