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

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

@@ -888,7 +888,7 @@ public class PayOrderLogic {
                 )
                 .eq(!StringUtil.isEmpty(payStatus) && payStatus.equals(MaterialExamineStatusEnum.PAID.getKey()),WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
 
-                .eq(WorkerOrder::getUserId,currentCompanyWechat.getUserId())
+                .eq(WorkerOrder::getWorkerId,currentCompanyWechat.getUser().getWorkerNumber())
                 .between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime,startTime,endTime)
                 .in(WorkerOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByDesc(WorkerOrder::getCreateTime)
@@ -1106,7 +1106,7 @@ public class PayOrderLogic {
     public List<WorkerOrderDetail> getOrderList(String workerOrderId) {
 
         List<WorkerOrder> list = workerOrderService.lambdaQuery().eq(WorkerOrder::getWorkerOrderId, workerOrderId)
-                .eq(WorkerOrder::getPayStatus,PayStatusEnum.PAID.getKey()).list();
+                .in(WorkerOrder::getPayStatus,PayStatusEnum.WAIT.getKey(),PayStatusEnum.PAID.getKey()).list();
 
         if (CollectionUtils.isEmpty(list))
             return new ArrayList<>();

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -176,7 +176,8 @@ public class OrderBaseLogic {
             return new Page<>(pageNum,pageSize);
         }
         List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
-                    .eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
+                    .and(item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
+                    .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
                     .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
 
         if(byDay != null){

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

@@ -605,6 +605,8 @@ public class AgreementLogic {
                         policyOrder.setStartTime(startTime);
                         policyOrder.setEndTime(policy.getEndTime());
 
+                        policyOrder.updateById();
+
                         //生成师傅待生效保险
                         WorkerPolicy workerPolicy = new WorkerPolicy();
                         workerPolicy.setWebsitId(policyOrder.getWorkerNumber());
@@ -734,16 +736,16 @@ public class AgreementLogic {
     public void offInsure() {
 
         workerPolicyService.lambdaUpdate()
-                .le(WorkerPolicy::getEndTime, new Date())
+                .le(WorkerPolicy::getEndTime, DateUtil.beginOfDay(new Date()))
                 .set(WorkerPolicy::getStatus, PolicyOrderStatusEnum.YSX.getKey()).update();
 
         policyOrderService.lambdaUpdate()
-                .le(PolicyOrder::getEndTime, new Date())
+                .le(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
                 .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey()).update();
 
 
         List<PolicyOrder> list = policyOrderService.lambdaQuery()
-                .ge(PolicyOrder::getEndTime, new Date())
+                .ge(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -752,7 +754,7 @@ public class AgreementLogic {
 
         if (!CollectionUtils.isEmpty(list)) {
             workerPolicyService.lambdaUpdate()
-                    .ge(WorkerPolicy::getEndTime, new Date())
+                    .ge(WorkerPolicy::getEndTime,  DateUtil.beginOfDay(new Date()))
                     .le(WorkerPolicy::getStartTime, new Date())
                     .in(WorkerPolicy::getOrderId, list.stream().map(PolicyOrder::getId).collect(Collectors.toList()))
                     .ne(WorkerPolicy::getStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -762,7 +764,7 @@ public class AgreementLogic {
 
 
         policyOrderService.lambdaUpdate()
-                .ge(PolicyOrder::getEndTime, new Date())
+                .ge(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -804,16 +806,16 @@ public class AgreementLogic {
             User user = userService.getById(websitUser.getUserId());
 
             String remark = StringUtil.isEmpty(websitUser.getOverdueRemark())?"":websitUser.getOverdueRemark();
-            if ((StringUtil.isEmpty(remark) && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+            if ((StringUtil.isEmpty(remark) && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                     || (!StringUtil.isEmpty(remark) && remark.split("高空证").length < 1
-                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) ){
+                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))) ){
                 remark = remark+"高空证"+DateUtil.format(user.getEndTime(),"yyyy-MM-dd");
             }
 
 
-            if ((StringUtil.isEmpty(remark) && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+            if ((StringUtil.isEmpty(remark) && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                     || (!StringUtil.isEmpty(remark) && remark.split("身份证").length < 1
-                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1))) ){
+                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay( DateUtil.beginOfDay(new Date())),1))) ){
                 remark = remark+"身份证"+DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd");
             }
 
@@ -824,9 +826,9 @@ public class AgreementLogic {
             for (WorkerPolicy workerPolicy : workerPolicies) {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) &&
                         (
-                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                         || (!StringUtil.isEmpty(remark) && remark.split("意外险").length < 1
-                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(  DateUtil.beginOfDay(new Date()),1))
                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
                         )
                 ) {
@@ -835,9 +837,9 @@ public class AgreementLogic {
                 }
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) &&
                         (
-                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                                         || (!StringUtil.isEmpty(remark) && remark.split("雇主险").length < 1
-                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
                                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
                         )
                 ) {
@@ -846,10 +848,10 @@ public class AgreementLogic {
 
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) &&
                         (
-                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                                         || (!StringUtil.isEmpty(remark) && remark.split("工伤险").length < 1
-                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
-                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
+                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
                         )
                 ) {
                     remark = remark+"工伤险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");

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

@@ -171,7 +171,7 @@ public class PolicyOrderLogic {
                 workerPolicy.setPolicyOrder(policyOrder.getPolicyNumber());
                 workerPolicy.setPolicyType("IN");
                 workerPolicy.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
-                workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
+                workerPolicy.setEndTime(DateUtil.parse((String) row.get(10), "yyyy-MM-dd"));
                 workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                 workerPolicy.setWebsitId(policyOrder.getWebsitId());
                 workerPolicy.setWebsitName(policyOrder.getWebsitName());

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

@@ -111,14 +111,14 @@ public class WorkerManagerLogic {
 
 
         if (pgOrderBaseService.lambdaQuery()
-                .and(item -> item.eq(PgOrderBase::getWorkerId,websitUserBean.getUserId()).or().like(PgOrderBase::getWorkerIdList,websitUserBean.getUserId()))
+                .and(item -> item.eq(PgOrderBase::getWorkerNumber,websitUserBean.getWorkerNumber()).or().like(PgOrderBase::getWorkerIdList,websitUserBean.getUserId()))
                 .eq(PgOrderBase::getWebsitId,websitUserBean.getWebsitId())
                 .notIn(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.YJS.getKey(),
                         OrderBaseStatusEnum.YWG.getKey(),OrderBaseStatusEnum.FWQX.getKey(),OrderBaseStatusEnum.YWGO.getKey(),
                         OrderBaseStatusEnum.YGBGD.getKey(),OrderBaseStatusEnum.FGFZF.getKey(),OrderBaseStatusEnum.YZFGD.getKey(),
                         OrderBaseStatusEnum.FZXBWG.getKey(),OrderBaseStatusEnum.FBBWG.getKey(),OrderBaseStatusEnum.LSXX.getKey(),
                         OrderBaseStatusEnum.PLGB.getKey(),OrderBaseStatusEnum.ZCGB.getKey()
-                        ).count() > 1) {
+                        ).count() > 0) {
 
             throw new RemoteServiceException("师傅存在未完工工单，请改派后再离职");
         }
@@ -170,23 +170,16 @@ public class WorkerManagerLogic {
 
         WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
 
-        if (!user.getIdCardEndTime().equals(user.getIdCardEndTime())){
+        if (
+                !(user.getIdCardEndTime().equals(workerManagerBean.getUser().getIdCardEndTime())) ||
+                !(user.getIdCardStartTime().equals(workerManagerBean.getUser().getIdCardStartTime()))){
             WebsitUserLog websitUserLog = new WebsitUserLog();
 
             websitUserLog.setTypeText("身份证修改");
-            websitUserLog.setOpRemark("身份证结束日期变更"+ DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd")+","+
-                    DateUtil.format(workerManagerBean.getUser().getIdCardEndTime(),"yyyy-MM-dd"));
-
-            websitUserLog.setWebsitUserId(workerManagerBean.getId());
-
-            websitUserLog.insert();
-        }
-        if (!user.getIdCardStartTime().equals(user.getIdCardStartTime())){
-            WebsitUserLog websitUserLog = new WebsitUserLog();
-
-            websitUserLog.setTypeText("身份证修改");
-            websitUserLog.setOpRemark("身份证开始日期变更"+ DateUtil.format(user.getIdCardStartTime(),"yyyy-MM-dd")+","+
-                    DateUtil.format(workerManagerBean.getUser().getIdCardStartTime(),"yyyy-MM-dd"));
+            websitUserLog.setOpRemark("原身份证日期"+ DateUtil.format(user.getIdCardStartTime(),"yyyy-MM-dd")+","+
+                    DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd")+"，变更为"+
+                    DateUtil.format(workerManagerBean.getUser().getIdCardStartTime(),"yyyy-MM-dd")+","+
+                            DateUtil.format(workerManagerBean.getUser().getIdCardEndTime(),"yyyy-MM-dd"));
 
             websitUserLog.setWebsitUserId(workerManagerBean.getId());
 
@@ -220,7 +213,7 @@ public class WorkerManagerLogic {
         workerManagerBean.getUser().updateById();
 
 
-        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
 
         workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
 
@@ -238,15 +231,17 @@ public class WorkerManagerLogic {
 
         workerImgService.saveOrUpdateBatch(workerManagerBean.getWorkerImgs());
 
+        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
         workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getWebsitUserId,workerManagerBean.getId()).remove();
 
 
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
-            workerPolicy.setEndTime(DateUtil.endOfDay(workerPolicy.getEndTime()));
         }
 
+
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
 
 
@@ -261,8 +256,6 @@ public class WorkerManagerLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
-            workerPolicy.setEndTime(DateUtil.endOfDay(workerPolicy.getEndTime()));
-
             if (StringUtil.isEmpty(workerPolicy.getId())){
                 WebsitUserLog websitUserLog = new WebsitUserLog();
 
@@ -287,7 +280,8 @@ public class WorkerManagerLogic {
                     WebsitUserLog websitUserLog = new WebsitUserLog();
 
                     websitUserLog.setTypeText("更改保险日期");
-                    websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
+                    websitUserLog.setOpRemark("原保险时间为"+ 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"));
 
                     websitUserLog.setWebsitUserId(workerPolicy.getWebsitUserId());
@@ -412,9 +406,8 @@ public class WorkerManagerLogic {
 
             for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
 
-                workerPolicy.setEndTime(DateUtil.offsetDay(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
 
-                if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
+                if (DateUtil.endOfDay(workerPolicy.getEndTime()).after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                     workerPolicy.setStatus("BZZ");
                 } else {
                     workerPolicy.setStatus("DSX");
@@ -737,7 +730,6 @@ public class WorkerManagerLogic {
 
 
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
-            workerPolicy.setEndTime(DateUtil.offsetMillisecond(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
         }

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

@@ -1127,6 +1127,6 @@ public class UserLogic {
 
     public List<WebsitUserLog> listLog(String id) {
 
-        return websitUserLogService.lambdaQuery().eq(WebsitUserLog::getWebsitUserId,id).list();
+        return websitUserLogService.lambdaQuery().eq(WebsitUserLog::getWebsitUserId,id).orderByDesc(WebsitUserLog::getCreateTime).list();
     }
 }

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

@@ -203,7 +203,7 @@ public class OrderBaseExcelLogic {
             }
             SysDictCompany orderChannelDict = orderChannelMap.get(orderChannel);
             if (orderChannelDict == null) {
-                throw new RemoteServiceException(errPrefix + "销售类型不存在");
+                throw new RemoteServiceException(errPrefix + "工单渠道不存在");
             }
 
             //工单状态