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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -311,8 +311,6 @@ public class UserLogic {
         for (UserWait userWait : list) {
             user.setWorkerNumber(userWait.getWorkerNumber());
             user.setNickName(userWait.getName());
-
-            user.setWorkerNumber(userWait.getWorkerNumber());
             user.setBankAccount(userWait.getBrank());
             user.setIdCard(userWait.getIdcard());
             if (userWait.getIdCardStartTime() != null) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -325,6 +325,8 @@ public class UserLogic {
 
                     userWaitPolicy.setUserWaitId(userWait.getId());
                     userWaitPolicy.setCompany(in_company);
+                    userWaitPolicy.setType("LINE");
+                    userWaitPolicy.setPolicyType("IN");
                     userWaitPolicy.setPolicyName(in_policy_name);
                     userWaitPolicy.setPolicyOrder(in_policy_order);
                     userWaitPolicy.setStartTime(DateUtil.parse(in_policy_start_time, "yyyy-MM-dd"));
@@ -358,6 +360,9 @@ public class UserLogic {
 
                     UserWaitPolicy userWaitPolicy = new UserWaitPolicy();
 
+                    userWaitPolicy.setType("LINE");
+                    userWaitPolicy.setPolicyType("EM");
+
                     userWaitPolicy.setUserWaitId(userWait.getId());
                     userWaitPolicy.setCompany(em_company);
                     userWaitPolicy.setPolicyName(em_policy_name);
@@ -393,7 +398,9 @@ public class UserLogic {
 
                     UserWaitPolicy userWaitPolicy = new UserWaitPolicy();
 
-                    userWaitPolicy.setUserWaitId(errPrefix+userWait.getId());
+                    userWaitPolicy.setType("LINE");
+                    userWaitPolicy.setPolicyType("AC");
+                    userWaitPolicy.setUserWaitId(userWait.getId());
                     userWaitPolicy.setCompany(company);
                     userWaitPolicy.setPolicyName(policy_name);
                     userWaitPolicy.setPolicyOrder(policy_order);

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1275,7 +1275,7 @@ public class OrderBaseLogic {
         orderLogLogic.addLog(pgOrderBase.getId(), "创建工单", "创建工单-自建工单", websitName);
         //派工网点
         if (StringUtils.isNotBlank(pgOrderBase.getWebsitId())) {
-            orderLogLogic.addLog(pgOrderBase.getId(), "指派网点", "派工给网点【" + pgOrderBase.getWebsitName() + "】", websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "指派网点", "派工给网点【" +(pgOrderBase.getWebsitId())+ pgOrderBase.getWebsitName() + "】", websitName);
         }
         //派工给师傅
         if (StringUtils.isNotBlank(pgOrderBase.getWorkerId())) {