需求

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<>();
 
@@ -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()) {