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

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

@@ -136,6 +136,7 @@ public class ChangeOrderLogic {
         pgOrderOperatorLog.setType(OrderOperatorLogTypeEnum.GAIYUE.getRemark());
         pgOrderOperatorLog.setTypeText(OrderOperatorLogTypeEnum.GAIYUE.getRemark());
         pgOrderOperatorLog.setAppointmentTime(pgOrderBase.getAppointmentTime());
+        pgOrderOperatorLog.setAppointmentEndTime(pgOrderBase.getAppointmentEndTime());
         pgOrderOperatorLog.setContent(remark);
         orderLogLogic.addLog(pgOrderOperatorLog);
     }

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

@@ -67,7 +67,7 @@ public class OrderLogLogic {
             //预约和改约需要记录操作明细，并变更工单预约时间
             pgOrderBaseService.lambdaUpdate()
                     .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
-                    .set(PgOrderBase::getAppointmentEndTime, DateUtils.addHours(pgOrderOperatorLog.getAppointmentTime(), 1))
+                    .set(PgOrderBase::getAppointmentEndTime, pgOrderOperatorLog.getAppointmentEndTime())
                     .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
                     .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
                     .update();

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

@@ -821,12 +821,12 @@ public class OrderBaseExcelLogic {
         Map<String, WebsitUser> websitUserMap = websitUsers.stream()
                 .collect(Collectors.toMap(WebsitUser::getWorkerNumber, v -> v));
 
-        List<User> users = userService.lambdaQuery().eq(User::getType,"WORKER").list();
+        List<User> users = userService.lambdaQuery().eq(User::getType, "WORKER").list();
         Map<String, User> userMap = users.stream()
                 .collect(Collectors.toMap(User::getUserId, v -> v));
 
         //工单渠道
-       // Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
+        // Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
         //网点名称
         Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
@@ -913,7 +913,7 @@ public class OrderBaseExcelLogic {
             if (StringUtils.isNotBlank(createWebsitId)) {
                 adminWebsit = adminWebsitMap.get(createWebsitId);
                 if (adminWebsit == null) {
-                    throw new RemoteServiceException(errPrefix + "网点不存在");
+                    //throw new RemoteServiceException(errPrefix + "网点不存在");
                 }
             }
 
@@ -922,7 +922,7 @@ public class OrderBaseExcelLogic {
             if (StringUtils.isNotBlank(websitId)) {
                 adminWebsitWorker = adminWebsitMap.get(websitId);
                 if (adminWebsitWorker == null) {
-                    throw new RemoteServiceException(errPrefix + "网点不存在");
+                    // throw new RemoteServiceException(errPrefix + "网点不存在");
                 }
             }
 
@@ -980,8 +980,13 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setStreetId(region.getId());
             pgOrderBase.setAddress(address);
 
-            pgOrderBase.setCreateWebsitId(adminWebsit.getWebsitId());
-            pgOrderBase.setCreateWebsitName(adminWebsit.getName());
+            if (adminWebsit == null) {
+                pgOrderBase.setCreateWebsitId(createWebsitId);
+                pgOrderBase.setCreateWebsitName(createWebsitName);
+            } else {
+                pgOrderBase.setCreateWebsitId(adminWebsit.getWebsitId());
+                pgOrderBase.setCreateWebsitName(adminWebsit.getName());
+            }
 
             pgOrderBase.setSource(source);
             pgOrderBase.setUrgent(urgent);
@@ -1046,58 +1051,57 @@ public class OrderBaseExcelLogic {
             }
 
 
-
-
             if (adminWebsitWorker != null) {
 
                 pgOrderBase.setWebsitId(adminWebsitWorker.getWebsitId());
                 pgOrderBase.setWebsitName(adminWebsitWorker.getName());
                 pgOrderBase.setWebsitPhone(adminWebsitWorker.getWebsitPhone());
+            }else {
+                pgOrderBase.setWebsitId(websitId);
+                pgOrderBase.setWebsitName(websitName);
 
+            }
 
-                if (StringUtils.isNotBlank(workerId)) {
 
-                    WebsitUser websitUser = websitUserMap.get(workerId);
+            if (StringUtils.isNotBlank(workerId)) {
 
+                WebsitUser websitUser = websitUserMap.get(workerId);
 
-                    pgOrderBase.setWorkerNumber(workerId);
-                    pgOrderBase.setWorkerName(workerName);
 
-                    pgOrderBase.setWorkerReceTime(new Date());
-                    pgOrderBase.setDispatchTime(new Date());
+                pgOrderBase.setWorkerNumber(workerId);
+                pgOrderBase.setWorkerName(workerName);
 
+                pgOrderBase.setWorkerReceTime(new Date());
+                pgOrderBase.setDispatchTime(new Date());
 
-                    PgOrderWorker pgOrderWorker = new PgOrderWorker();
-                    pgOrderWorker.setOrderBaseId(pgOrderId);
-                    pgOrderWorker.setWorkerNumber(workerId);
-                    pgOrderWorker.setWebsitId(pgOrderBase.getWebsitId());
-                    pgOrderWorker.setWebsitName(pgOrderBase.getWebsitName());
-                    pgOrderWorker.setWorkerName(workerName);
 
-                    if (websitUser != null){
-                        pgOrderWorker.setWorkerId(websitUser.getUserId());
-                        pgOrderBase.setWorkerId(websitUser.getUserId());
+                PgOrderWorker pgOrderWorker = new PgOrderWorker();
+                pgOrderWorker.setOrderBaseId(pgOrderId);
+                pgOrderWorker.setWorkerNumber(workerId);
+                pgOrderWorker.setWebsitId(pgOrderBase.getWebsitId());
+                pgOrderWorker.setWebsitName(pgOrderBase.getWebsitName());
+                pgOrderWorker.setWorkerName(workerName);
 
-                        User user = userMap.get(websitUser.getUserId());
+                if (websitUser != null) {
+                    pgOrderWorker.setWorkerId(websitUser.getUserId());
+                    pgOrderBase.setWorkerId(websitUser.getUserId());
 
-                        if (!StringUtil.isEmpty(user.getMobile())) {
-                            pgOrderBase.setWorkerNumber(user.getMobile());
-                            pgOrderWorker.setWorkerMobile(user.getMobile());
-                        }
+                    User user = userMap.get(websitUser.getUserId());
 
+                    if (!StringUtil.isEmpty(user.getMobile())) {
+                        pgOrderBase.setWorkerNumber(user.getMobile());
+                        pgOrderWorker.setWorkerMobile(user.getMobile());
                     }
 
+                }
 
 
+                pgOrderWorker.setIsMaster(true);
+                pgOrderWorkers.add(pgOrderWorker);
 
-                    pgOrderWorker.setIsMaster(true);
-                    pgOrderWorkers.add(pgOrderWorker);
-
-                }
             }
 
 
-
             if (Convert.toInt(totalNum) > 0) {
 
                 GoodsCategory mainGoodsCategory = categoryMap1.get(categoryType);
@@ -1116,7 +1120,7 @@ public class OrderBaseExcelLogic {
 
                 if (brand == null) {
                     pgOrderProduct.setBrandName("格力");
-                }else {
+                } else {
                     pgOrderProduct.setBrandName("格力");
                     pgOrderProduct.setBrandId(brand.getId());
                 }
@@ -1132,7 +1136,7 @@ public class OrderBaseExcelLogic {
         //生成师傅信息
         if (CollectionUtils.isNotEmpty(pgOrderWorkers)) {
             List<String> collect = addPgOrderBase.stream().map(PgOrderBase::getId).collect(Collectors.toList());
-            pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId,collect).remove();
+            pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId, collect).remove();
             pgOrderWorkerService.saveBatch(pgOrderWorkers);
         }
 
@@ -1146,7 +1150,7 @@ public class OrderBaseExcelLogic {
             pgOrderProductService.saveBatch(pgOrderProducts);
 
             //重新生成产品信息和待采集数据
-            doProductDetailGonDan(pgOrderProducts,addPgOrderBase);
+            doProductDetailGonDan(pgOrderProducts, addPgOrderBase);
 
             //创建工单添加消息
             if (CollectionUtils.isNotEmpty(addPgOrderBase)) {
@@ -1160,7 +1164,7 @@ public class OrderBaseExcelLogic {
     }
 
 
-    private void doProductDetailGonDan(List<PgOrderProduct> pgOrderProducts,List<PgOrderBase> addPgOrderBaseList) {
+    private void doProductDetailGonDan(List<PgOrderProduct> pgOrderProducts, List<PgOrderBase> addPgOrderBaseList) {
 
         for (PgOrderBase pgOrderBase : addPgOrderBaseList) {
 
@@ -1172,20 +1176,19 @@ public class OrderBaseExcelLogic {
             if (CollectionUtils.isNotEmpty(pgOrderProductList)) {
                 for (PgOrderProduct pgOrderProduct : pgOrderProductList) {
 
-                 //判断有无导入过
+                    //判断有无导入过
                     List<PgOrderProductDetail> pgOrderProductDetails = pgOrderProductDetailService.lambdaQuery()
                             .in(PgOrderProductDetail::getOrderBaseId, pgOrderBase.getId()).list();
 
                     pgOrderProductDetailService.lambdaUpdate()
                             .in(PgOrderProductDetail::getOrderBaseId, pgOrderBase.getId()).remove();
 
-                    if (!CollectionUtils.isEmpty(pgOrderProductDetails)){
+                    if (!CollectionUtils.isEmpty(pgOrderProductDetails)) {
 
                         pgOrderProduct.setId(pgOrderProduct.getId());
                         pgOrderProduct.updateById();
 
 
-
                         int sort = 0;
                         List<PgOrderProductDetail> pgOrderProductDetailList = pgOrderProductDetails.stream()
                                 .filter(item -> !item.getStatus().equals("WAIT")).collect(Collectors.toList());
@@ -1193,7 +1196,7 @@ public class OrderBaseExcelLogic {
                         for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailList) {
                             if (sort >= pgOrderProduct.getNum())
                                 break;
-                            pgOrderProductDetail.setSort(sort+1);
+                            pgOrderProductDetail.setSort(sort + 1);
                             pgOrderProductDetail.setOrderProductId(pgOrderProduct.getProductId());
 
                             pgOrderProductDetail.insert();
@@ -1206,15 +1209,15 @@ public class OrderBaseExcelLogic {
                         for (PgOrderProductDetail pgOrderProductDetail : pgOrderProductDetailListWait) {
                             if (sort >= pgOrderProduct.getNum())
                                 break;
-                            pgOrderProductDetail.setSort(sort+1);
+                            pgOrderProductDetail.setSort(sort + 1);
                             pgOrderProductDetail.setOrderProductId(pgOrderProduct.getProductId());
 
                             pgOrderProductDetail.insert();
                             sort++;
                         }
-                        if (sort < pgOrderProduct.getNum()){
+                        if (sort < pgOrderProduct.getNum()) {
                             List<PgOrderProductDetail> newProductDetail = new ArrayList<>();
-                            while(true){
+                            while (true) {
                                 if (sort >= pgOrderProduct.getNum())
                                     break;
                                 PgOrderProductDetail pgOrderProductDetail = BeanUtil.toBean(pgOrderProduct, PgOrderProductDetail.class);
@@ -1228,12 +1231,12 @@ public class OrderBaseExcelLogic {
                             pgOrderProductDetailService.saveBatch(newProductDetail);
                         }
 
-                    }else {
+                    } else {
 
                         //生成新的待采集数据
                         int sort = 0;
                         List<PgOrderProductDetail> newProductDetail = new ArrayList<>();
-                        while(true){
+                        while (true) {
                             if (sort >= pgOrderProduct.getNum())
                                 break;
                             PgOrderProductDetail pgOrderProductDetail = BeanUtil.toBean(pgOrderProduct, PgOrderProductDetail.class);

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

@@ -1038,7 +1038,7 @@ public class OrderBaseLogic {
 //                .setOrderChannelId(orderChannelDict.getDictCode())
 //                .setOrderChannelText(orderChannelDict.getDictValue())
                 .setAppointmentTime(orderAddBeanDTO.getAppointmentTime())
-                .setAppointmentEndTime(DateUtil.offsetHour(orderAddBeanDTO.getAppointmentTime(), 1))
+                .setAppointmentEndTime(orderAddBeanDTO.getAppointmentEndTime())
                 .setSaleCompany(orderAddBeanDTO.getSaleCompany())
                 .setRemark(orderAddBeanDTO.getRemark())
                 .setLastOperatorAppointmentTime(new Date())

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

@@ -90,7 +90,7 @@ public class OrderLogLogic {
             //预约和改约需要记录操作明细，并变更工单预约时间
             pgOrderBaseService.lambdaUpdate()
                     .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
-                    .set(PgOrderBase::getAppointmentEndTime, DateUtils.addHours(pgOrderOperatorLog.getAppointmentTime(), 1))
+                    .set(PgOrderBase::getAppointmentEndTime,pgOrderOperatorLog.getAppointmentEndTime() )
                     .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
                     .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
                     .update();