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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -1089,7 +1089,7 @@ public class PayOrderLogic {
 
         return settlementOrderService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(status),SettlementOrder::getStatus,status)
-                .eq(SettlementOrder::getWorkerId,currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(SettlementOrder::getUserId,currentCompanyWechat.getUser().getUserId())
                 .between(!StringUtil.isEmpty(startTime),SettlementOrder::getCreateTime,startTime,endTime)
                 .in(SettlementOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByDesc(SettlementOrder::getCreateTime)

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -301,11 +301,22 @@ public class WorkerManagerLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
+            String policy ="";
+
+            if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()))
+                policy = "意外险：";
+
+            if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()))
+                policy = "雇主险：";
+
+            if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()))
+                policy = "工伤险：";
+
             if (StringUtil.isEmpty(workerPolicy.getId())){
                 WebsitUserLog websitUserLog = new WebsitUserLog();
 
                 websitUserLog.setTypeText("添加保险");
-                websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
+                websitUserLog.setOpRemark(policy+"保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
                         DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));
 
                 websitUserLog.setWebsitUserId(workerPolicy.getWebsitUserId());
@@ -325,7 +336,7 @@ public class WorkerManagerLogic {
                     WebsitUserLog websitUserLog = new WebsitUserLog();
 
                     websitUserLog.setTypeText("更改保险日期");
-                    websitUserLog.setOpRemark("原保险时间为"+ DateUtil.format(workerPolicyOne.getStartTime(),"yyyy-MM-dd")+","+
+                    websitUserLog.setOpRemark(policy+"原保险时间为"+ DateUtil.format(workerPolicyOne.getStartTime(),"yyyy-MM-dd")+","+
                             DateUtil.format(workerPolicyOne.getEndTime(),"yyyy-MM-dd")+"，变更为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
                             DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));