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

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

@@ -352,7 +352,7 @@ public class PayOrderLogic {
         WebsitNormCharge websitNormCharge = websitNormChargeService.getById(workerOrderItem.getGoodsId());
         if (websitNormCharge.getNormType().equals("M")) {
             // 获取当前关联师傅库存记录
-            List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getWorkerId());
+            List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getIdentity());
             if (CollectionUtil.isNotEmpty(stockBeanList)) {
                 // 获取待支付的师傅收费订单
                 final List<WorkerOrder> workerOrderList = workerOrderService.lambdaQuery()

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/OrderBaseCountBean.java

@@ -15,6 +15,8 @@ public class OrderBaseCountBean {
     private Integer dpg = 0;
     @ApiModelProperty("待接收数量")
     private Integer djs = 0;
+    @ApiModelProperty("待预约")
+    private Integer dyy = 0;
     @ApiModelProperty("服务中数量")
     private Integer fwz = 0;
     @ApiModelProperty("异常待处理数量")

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

@@ -32,6 +32,10 @@ import javax.mail.MessagingException;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -611,7 +615,7 @@ public class AgreementLogic {
 
 
                         policyOrder.setStartTime(DateUtil.beginOfDay(startTime));
-                        policyOrder.setEndTime(policy.getEndTime());
+                        policyOrder.setEndTime(this.getEndOfDay(policy.getEndTime()));
 
                         if (new Date().after(policyOrder.getStartTime()))
                             policyOrder.setPolicyOrderStatus("BZZ");
@@ -631,7 +635,7 @@ public class AgreementLogic {
                         workerPolicy.setPolicyOrder(policy.getPolicyNumber());
                         workerPolicy.setPolicyType("AC");
                         workerPolicy.setStartTime(policyOrder.getStartTime());
-                        workerPolicy.setEndTime(policyOrder.getEndTime());
+                        workerPolicy.setEndTime(this.getEndOfDay(policyOrder.getEndTime()));
                         workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                         workerPolicy.setWebsitId(policyOrder.getWebsitId());
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -678,7 +682,7 @@ public class AgreementLogic {
                         workerPolicy.setPolicyType(policyOrder.getType());
                         workerPolicy.setStatus(PolicyOrderEmStutasEnum.DSX.getKey());
                         workerPolicy.setStartTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), 1)));
-                        workerPolicy.setEndTime(DateUtil.offsetMillisecond(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)),-999));
+                        workerPolicy.setEndTime(this.getEndOfDay(DateUtil.offsetMillisecond(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)),-999)));
                         workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                         workerPolicy.setWebsitId(policyOrder.getWebsitId());
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -1158,4 +1162,16 @@ public class AgreementLogic {
         }
 
     }
+
+    /**
+     * 获取某天最小时间
+     * @param date 时间
+     * @return 获取某天最小时间
+     */
+    public  Date getEndOfDay(Date date) {
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());;
+        LocalTime localTime = LocalTime.of(23, 59, 59);
+        LocalDateTime endOfDay = localDateTime.with(localTime);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
 }

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

@@ -27,6 +27,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.rmi.RemoteException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -126,7 +130,7 @@ public class PolicyOrderLogic {
             workerPolicy.setPolicyOrder(policyOrder.getPolicyNumber());
             workerPolicy.setPolicyType("EM");
             workerPolicy.setStartTime(policyOrder.getStartTime());
-            workerPolicy.setEndTime(policyOrder.getEndTime());
+            workerPolicy.setEndTime(this.getEndOfDay(policyOrder.getEndTime()));
             workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
             workerPolicy.setWebsitId(policyOrder.getWebsitId());
             workerPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -178,7 +182,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.parse((String) row.get(10), "yyyy-MM-dd"));
+                workerPolicy.setEndTime(this.getEndOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
                 workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                 workerPolicy.setWebsitId(policyOrder.getWebsitId());
                 workerPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -195,7 +199,7 @@ public class PolicyOrderLogic {
             }
 
             policyOrder.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
-            policyOrder.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
+            policyOrder.setEndTime(this.getEndOfDay(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd"))));
             policyOrder.setClassWebsitId((String) row.get(11));
             policyOrder.setClassWebsitName((String) row.get(12));
             policyOrder.setPayAmount(Convert.toBigDecimal(row.get(8)));
@@ -249,7 +253,7 @@ public class PolicyOrderLogic {
             policyOrder.setWebsitUserId(websitUser.getId());
 
             policyOrder.setStartTime(DateUtil.parse((String) row.get(6), "yyyy-MM-dd"));
-            policyOrder.setEndTime(DateUtil.parse((String) row.get(7), "yyyy-MM-dd"));
+            policyOrder.setEndTime(this.getEndOfDay(DateUtil.parse((String) row.get(7), "yyyy-MM-dd")));
 
             policyOrder.setIsSend(IsYesNoEnum.NO.getKey());
             policyOrder.setIsReceipt(IsYesNoEnum.NO.getKey());
@@ -292,7 +296,7 @@ public class PolicyOrderLogic {
             workerPolicy.setPolicyOrder(policyOrder.getPolicyNumber());
             workerPolicy.setPolicyType("EM");
             workerPolicy.setStartTime(DateUtil.parse((String) row.get(6), "yyyy-MM-dd"));
-            workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(7), "yyyy-MM-dd")));
+            workerPolicy.setEndTime(this.getEndOfDay(DateUtil.endOfDay(DateUtil.parse((String) row.get(7), "yyyy-MM-dd"))));
             workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
             workerPolicy.setWebsitId(policyOrder.getWebsitId());
             workerPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -323,7 +327,7 @@ public class PolicyOrderLogic {
 
             policyOrderService.lambdaUpdate()
                     .eq(PolicyOrder::getWebsitId, (String) row.get(1))
-                    .eq(PolicyOrder::getWorkerNumber, (String) row.get(3))
+                    .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
                     .eq(PolicyOrder::getType, "EM")
                     .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
                             PolicyOrderEmStutasEnum.DSX.getKey(),
@@ -335,4 +339,17 @@ public class PolicyOrderLogic {
 
         }
     }
+
+    /**
+     * 获取某天最小时间
+     * @param date 时间
+     * @return 获取某天最小时间
+     */
+    public  Date getEndOfDay(Date date) {
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());;
+        LocalTime localTime = LocalTime.of(23, 59, 59);
+        LocalDateTime endOfDay = localDateTime.with(localTime);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
 }

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

@@ -21,6 +21,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -239,6 +243,7 @@ public class WorkerManagerLogic {
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
+            workerPolicy.setEndTime(this.getEndOfDay(workerPolicy.getEndTime()));
         }
 
 
@@ -389,6 +394,7 @@ public class WorkerManagerLogic {
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
+            workerPolicy.setEndTime(this.getEndOfDay(workerPolicy.getEndTime()));
         }
 
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
@@ -732,6 +738,7 @@ public class WorkerManagerLogic {
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
+            workerPolicy.setEndTime(this.getEndOfDay(workerPolicy.getEndTime()));
         }
 
         this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
@@ -864,4 +871,17 @@ public class WorkerManagerLogic {
 
 
     }
+
+    /**
+     * 获取某天最小时间
+     * @param date 时间
+     * @return 获取某天最小时间
+     */
+    public  Date getEndOfDay(Date date) {
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());;
+        LocalTime localTime = LocalTime.of(23, 59, 59);
+        LocalDateTime endOfDay = localDateTime.with(localTime);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
 }

mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -114,6 +114,7 @@
             count(if(order_status in ('DJD'),1,null)) as 'djs',
             count(if(order_status in ('DQD'),1,null)) as 'dqd',
             count(if(order_status in ('FWZ'),1,null)) as 'fwz',
+            count(if(appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD'),1,null)) as 'dyy',
             count(if(is_exception = 1,1,null)) as 'ycdcl',
             count(if(appraise_status in ('C'),1,null)) as 'cp'
         from pg_order_base a