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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -430,7 +430,7 @@ public class WorkerLogic {
 
         Date startTime = new Date();
 
-        if (!CollectionUtils.isEmpty(workerPolicies)){
+        if (!CollectionUtils.isEmpty(workerPolicies) && startTime.before(DateUtil.beginOfDay(DateUtil.offsetDay(workerPolicies.get(0).getEndTime(),1)))){
             startTime = DateUtil.beginOfDay(DateUtil.offsetDay(workerPolicies.get(0).getEndTime(),1));
         }
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/JsmWorkerOrder.java

@@ -22,5 +22,12 @@ public class JsmWorkerOrder {
     @ApiModelProperty("订单号")
     private Integer pageSize;
 
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+
+    @ApiModelProperty("订单号")
+    private String orderId;
+
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -144,6 +144,15 @@ public class OrderBaseController {
         return ResponseHelper.success(orderBaseId);
     }
 
+    @ApiNotAuth
+    @PostMapping("/orderDetailJsmMiniOne")
+    @ApiOperation(value = "工单jsm")
+    public ResponseHelper<IPage<PgOrderBaseDetail>> orderDetailJsmMiniOne(@Valid @RequestBody JsmWorkerOrder jsmWorkerOrder){
+        IPage<PgOrderBaseDetail> orderBaseId = orderBaseLogic.orderDetailJsmMiniOne(jsmWorkerOrder);
+        return ResponseHelper.success(orderBaseId);
+    }
+
+
 
     @PostMapping("/update")
     @ApiOperation(value = "修改工单")

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

@@ -2362,17 +2362,11 @@ public class OrderBaseLogic {
 
     public IPage<PgOrderBaseDetail> orderDetailJsmMini(JsmWorkerOrder jsmWorkerOrder) {
 
-        if (CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()))
-            return null;
-
-        List<String> status = new ArrayList<>();
-        if (!StringUtil.isEmpty(jsmWorkerOrder.getStatus())){
 
-        }
 
         IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .isNull(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getAppointmentTime)
-                .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YQX","FWZT","YCGB",
+                .notIn(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YQX","FWZT","YCGB",
                         "FWQX","FL","YJS","LRCD","DSHPG","CJ","YPD","DXSPD","DZBPG","DWDSPGP","DXSSPGP","DTJXSSPGP","DZBSPGP")
                 .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DFW"),PgOrderBase::getOrderStatus,"DSHPG","CJ","YPD","DXSPD","DZBPG","DWDSPGP","DXSSPGP","DTJXSSPGP","DZBSPGP","DFZXPD",
                         "DFZXSPGP","DWDPG","DWDPD","FWZ","GCSZT","BFWG","DSM","YZP","WDBH","XSBH","TJXSBH","ZBBH","FZXBH")
@@ -2381,7 +2375,65 @@ public class OrderBaseLogic {
 
                 .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("YWC"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
 
-                .in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+                .and(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()) && !StringUtil.isEmpty(jsmWorkerOrder.getMobile()),item ->
+                                item.in(PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+                                .or()
+                .eq(PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
+                )
+                .eq(!StringUtil.isEmpty(jsmWorkerOrder.getOrderId()),PgOrderBase::getSaleOrderId,jsmWorkerOrder.getOrderId())
+                .orderByDesc(PgOrderBase::getCreateTime)
+                .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+
+        List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();
+
+        for (Object o : pgOrderBases.getRecords()) {
+
+            PgOrderBase pgOrderBase = (PgOrderBase) o;
+            PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
+
+            List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
+                    .notIn(PgOrderOperatorLog::getType,"异常反馈","其他","改约",
+                            "异常反馈","回访","费用申请单","费用申请单审核","待件"
+                            ,"拉修","不接电话","延误","质量信息")
+                    .eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
+                    .orderByDesc(PgOrderOperatorLog::getId)
+                    .list();
+
+            List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery().eq(SettlementOrder::getWorkerOrderId, pgOrderBase.getId()).list();
+
+            List<SettlementOrderDetail> settlementOrderDetails = new ArrayList<>();
+            for (SettlementOrder settlementOrder : settlementOrderList) {
+                SettlementOrderDetail settlementOrderDetail = BeanUtil.toBean(settlementOrder, SettlementOrderDetail.class);
+
+                List<SettlementOrderItem> settlementOrderItems = settlementOrderItemService.lambdaQuery().eq(SettlementOrderItem::getSettlementOrderId, settlementOrder.getSettlementOrderId())
+                        .list();
+
+                settlementOrderDetail.setSettlementOrderItemList(settlementOrderItems);
+
+                settlementOrderDetails.add(settlementOrderDetail);
+            }
+            pgOrderBaseDetail.setPgOrderOperatorLogs(pgOrderOperatorLogs);
+            pgOrderBaseDetail.setSettlementOrderDetails(settlementOrderDetails);
+
+            pgOrderBaseDetails.add(pgOrderBaseDetail);
+
+            List<PgOrderProduct> pgOrderProducts = pgOrderProductService.lambdaQuery()
+                    .eq(PgOrderProduct::getOrderBaseId, pgOrderBase.getId())
+                    .list();
+
+            pgOrderBaseDetail.setPgOrderProducts(pgOrderProducts);
+
+        }
+        pgOrderBases.setRecords(pgOrderBaseDetails);
+        return pgOrderBases;
+    }
+
+    public IPage<PgOrderBaseDetail> orderDetailJsmMiniOne(JsmWorkerOrder jsmWorkerOrder) {
+
+
+        IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
+                 .in(PgOrderBase::getId,jsmWorkerOrder.getWorkerOrderIds())
+                .orderByDesc(PgOrderBase::getCreateTime)
                 .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
 
         List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();
@@ -2392,6 +2444,9 @@ public class OrderBaseLogic {
             PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
 
             List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
+                    .notIn(PgOrderOperatorLog::getType,"异常反馈","其他","改约",
+                            "异常反馈","回访","费用申请单","费用申请单审核","待件"
+                            ,"拉修","不接电话","延误","质量信息")
                     .eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
                     .orderByDesc(PgOrderOperatorLog::getId)
                     .list();