Merge branch 'fenxiao731' into uat

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html

@@ -85,7 +85,7 @@
 <script type="text/javascript">
     var prefix = ctx + "system/configuration"
     //var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
-    var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
+    var getCompanyListPrefix = "http://suishenbang.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
     $(document).ready(function () {
         var obj = {

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

@@ -94,7 +94,7 @@
     <script type="text/javascript">
         var prefix = ctx + "system/configuration";
         // var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
-        var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
+        var getCompanyListPrefix = "http://suishenbang.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
         $(document).ready(function () {
             var formArray = $('#form-configuration-edit').serializeArray();

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -1567,7 +1567,7 @@ public class AnalysisDiyCustomerComponent {
 
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
-                    userExt.setSalesLevel("reseller_level");
+                    userExt.setSalesLevel("customer_level");
                     userExt.setCustomerCode(jo.getString("depCode"));
                     userExt.setIsCustomerManager(isManager + "");
                     userExt.setSapEmployeeId(userNo);
@@ -1626,6 +1626,7 @@ public class AnalysisDiyCustomerComponent {
                                     user.getSysUserExt().setOrgCode(customerCode);
                                 }
                             }
+                            user.getSysUserExt().setSalesLevel("customer_level");
                             log.info("updateSysUserExt" + customerCode);
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }

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

@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and tms.is_delete=0
           and d.REVIEW_STATUS='未复核'
           and tms.get_goods_time IS NULL
-          AND tms.self_pick_time BETWEEN DATE_SUB( NOW(), INTERVAL 45 DAY ) AND NOW()
+          AND tms.self_pick_time BETWEEN DATE_SUB( NOW(), INTERVAL 46 DAY ) AND DATE_SUB(NOW(), INTERVAL 1 DAY )
         group by tms.customer_code
     </select>