Merge branch 'master' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -107,8 +107,11 @@ public class UserController {
             @ApiParam(required = true, value = "授权openid登陆code") @RequestParam(required = true) String code,
             HttpServletRequest request
     ) throws RemoteServiceException, WxErrorException, InterruptedException {
+        log.info("请求数据"+serviceId,code);
         UserWxBean userWxBean = userLogic.addUser(code,serviceId,request);
         userLogic.addVisit(request, userWxBean.getUserId());
+
+        log.info("输出返回数据"+userWxBean);
         return ResponseHelper.success(userWxBean);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/websit/SettlementOrderLogicVO.java

@@ -83,7 +83,7 @@ public class SettlementOrderLogicVO      {
     @ApiModelProperty(value = "结算状态")
     private SettlementStatusNewEnum status;
 
-    @ApiModelProperty(value = "分账失败原因")
+    @ApiModelProperty(value = "微信分账失败原因")
     private String queryRemark;
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -1490,8 +1490,9 @@ public class WechatLogic {
             try {
                 ProfitSharingQueryResult profitSharingQueryResult = profitSharingService.profitSharingQuery(profitSharingQueryRequest);
                 log.info("【开始分账】request:{}", JSONObject.toJSONString(profitSharingQueryResult));
-
+                settlementOrder.setIsQuery(true);
                 for (ProfitSharingQueryResult.Receiver receiver : profitSharingQueryResult.getReceivers()) {
+
                     if (receiver.getResult().equals("CLOSED")) {
                         settlementOrder.setStatus("YC");
                         settlementOrder.setIsQuery(true);
@@ -1511,10 +1512,10 @@ public class WechatLogic {
                             settlementOrder.setQueryRemark("分出方账户异常");
                         if (receiver.getFailReason().equals("INVALID_REQUEST"))
                             settlementOrder.setQueryRemark("描述参数设置失败");
-
-                        settlementOrder.updateById();
                     }
+
                 }
+                settlementOrder.updateById();
             }catch (Exception e){
                 log.info("查询分账异常："+e);
             }

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

@@ -181,7 +181,7 @@ public class PolicyOrderLogic {
 
             AdminWebsit adminWebsit = adminWebsitService.lambdaQuery().eq(AdminWebsit::getWebsitNumber, (String) row.get(1)).one();
 
-            User user = userService.lambdaQuery().eq(User::getIdCard, (String) row.get(6))
+            User user = userService.lambdaQuery().eq(User::getIdCard, (String) row.get(6)).eq(User::getMobile,(String) row.get(5))
                     .one();
 
             if (user == null)

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

@@ -76,25 +76,24 @@ public class OrderBaseExcelLogic {
      */
     @Transactional
     public void importOrder(List<Object> rows) {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
+
         //品牌map
-        Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
+        Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName("1");
         //工单类型map
-        Map<String, OrderSmallType> orderSmallTypeMap = sysDictCompanyLogic.orderSmallTypeMap(adminUser.getCompanyWechatId());
+        Map<String, OrderSmallType> orderSmallTypeMap = sysDictCompanyLogic.orderSmallTypeMap("1");
         //产品大类，小类map
         List<GoodsCategory> goodsCategoryList = goodsCategoryService.lambdaQuery()
-                .eq(GoodsCategory::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(GoodsCategory::getCompanyWechatId, "1")
                 .eq(GoodsCategory::getType, 2).list();
         Map<String, GoodsCategory> categoryMap1 = goodsCategoryList.stream().filter(v -> v.getLevel() == 1)
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
         Map<String, GoodsCategory> categoryMap2 = goodsCategoryList.stream().filter(v -> v.getLevel() == 2)
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
         //工单渠道
-        Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
+        Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, "1");
         //网点名称
         Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
-                .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .in(adminUser.getType() == 0, AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                .eq(AdminWebsit::getCompanyWechatId, "1")
                 .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
                 .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
         //已完工标识
@@ -104,7 +103,7 @@ public class OrderBaseExcelLogic {
         //本次导入的旧的工单集合 (并清空旧的师傅信息)
         Map<String, PgOrderBase> oldOrderBaseMap = getOldOrderBase(rows);
         //本商户的所有师傅
-        Map<String, User> workerMap = getWorkers(adminUser.getCompanyWechatId());
+        Map<String, User> workerMap = getWorkers("1");
         //本次新增的工单
         List<PgOrderBase> addPgOrderBase = new ArrayList<>();
 
@@ -232,8 +231,8 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setOrderTypeText(BaseEnum.keyToEnum(OrderTypeEnum.class, orderSmallType1.getOrderType()).getRemark());
             pgOrderBase.setOrderSmallType(orderSmallType1.getId());
             pgOrderBase.setOrderSmallTypeText(orderSmallType1.getOrderSmallTypeText());
-            pgOrderBase.setCompanyWechatId(adminUser.getCompanyWechatId());
-            pgOrderBase.setCompanyWechatName(adminUser.getCompanyName());
+            pgOrderBase.setCompanyWechatId("1");
+            pgOrderBase.setCompanyWechatName("广佛格力售后");
             if (adminWebsit != null) {
                 orderBaseStatusEnum = OrderBaseStatusEnum.DWDPG;
                 if (isQd) {
@@ -1301,15 +1300,13 @@ public class OrderBaseExcelLogic {
     public void saveThreeOrder(SyncOrderDto syncOrderDto) {
 
 
-
-        AdminUserCom adminUser = commonLogic.getAdminUser();
         //品牌map
-        Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
+        Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName("1");
         //工单类型map
-        Map<String, OrderSmallType> orderSmallTypeMap = sysDictCompanyLogic.orderSmallTypeMap(adminUser.getCompanyWechatId());
+        Map<String, OrderSmallType> orderSmallTypeMap = sysDictCompanyLogic.orderSmallTypeMap("1");
         //产品大类，小类map
         List<GoodsCategory> goodsCategoryList = goodsCategoryService.lambdaQuery()
-                .eq(GoodsCategory::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(GoodsCategory::getCompanyWechatId, "1")
                 .eq(GoodsCategory::getType, 2).list();
         Map<String, GoodsCategory> categoryMap1 = goodsCategoryList.stream().filter(v -> v.getLevel() == 1)
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
@@ -1327,8 +1324,7 @@ public class OrderBaseExcelLogic {
         // Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
         //网点名称
         Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
-                .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .in(adminUser.getType() == 0, AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                .eq(AdminWebsit::getCompanyWechatId, "1")
                 .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
                 .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
         //已完工标识
@@ -1337,7 +1333,7 @@ public class OrderBaseExcelLogic {
         //本次导入的旧的工单集合 (并清空旧的师傅信息)
         // Map<String, PgOrderBase> oldOrderBaseMap = getOldOrderBase(rows);
         //本商户的所有师傅
-        Map<String, User> workerMap = getWorkers(adminUser.getCompanyWechatId());
+        Map<String, User> workerMap = getWorkers("1");
 
         for (PgOrderBase pgOrderBase : syncOrderDto.getPgOrderBases()) {
 
@@ -1458,16 +1454,26 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setIsThreeOrder(true);
         }
 
+        List<PgOrderBase> orderIds = pgOrderBaseService.lambdaQuery()
+                .in(PgOrderBase::getId, syncOrderDto.getPgOrderBases().stream().map(PgOrderBase::getId).collect(Collectors.toList()))
+                .select(PgOrderBase::getId).list();
+        List<String> orderIdList = orderIds.stream().map(PgOrderBase::getId).collect(Collectors.toList());
+        orderIdList.add("efqebfqvyyudsfqie");
 
+        log.info("同步日志单数"+syncOrderDto.getPgOrderBases().size());
+        log.info("同步日志数"+syncOrderDto.getPgOrderOperatorLogs().size());
+        log.info("打印存在单数"+orderIdList.size());
 
+        if (syncOrderDto.getPgOrderBases().stream().filter(item -> !orderIdList.contains(item.getId())).collect(Collectors.toList()).size() < 1)
+            return;
 
-        pgOrderBaseService.saveBatch(syncOrderDto.getPgOrderBases());
+        pgOrderBaseService.saveBatch(syncOrderDto.getPgOrderBases().stream().filter(item -> !orderIdList.contains(item.getId())).collect(Collectors.toList()));
 
-        pgOrderProductDetailService.saveBatch(syncOrderDto.getPgOrderProductDetails());
+        pgOrderProductDetailService.saveBatch(syncOrderDto.getPgOrderProductDetails().stream().filter(item -> !orderIdList.contains(item.getOrderBaseId())).collect(Collectors.toList()));
 
-        pgOrderWorkerService.saveBatch(syncOrderDto.getOrderWorkers());
+        pgOrderWorkerService.saveBatch(syncOrderDto.getOrderWorkers().stream().filter(item -> !orderIdList.contains(item.getOrderBaseId())).collect(Collectors.toList()));
 
-        pgOrderProductService.saveBatch(syncOrderDto.getOrderProducts());
+        pgOrderProductService.saveBatch(syncOrderDto.getOrderProducts().stream().filter(item -> !orderIdList.contains(item.getOrderBaseId())).collect(Collectors.toList()));
 
 
         if (!CollectionUtils.isEmpty(syncOrderDto.getPgOrderOperatorLogs())) {
@@ -1475,7 +1481,7 @@ public class OrderBaseExcelLogic {
                 pgOrderOperatorLog.setIsThreeOrder(true);
             }
 
-            pgOrderOperatorLogService.saveBatch(syncOrderDto.getPgOrderOperatorLogs());
+            pgOrderOperatorLogService.saveBatch(syncOrderDto.getPgOrderOperatorLogs().stream().filter(item -> !orderIdList.contains(item.getOrderBaseId())).collect(Collectors.toList()));
         }
 
     }