需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -56,6 +56,24 @@ public class AdminWebsitController {
         return ResponseHelper.success(list);
     }
 
+
+    @GetMapping("/websitList")
+    @ApiOperation("网点列表")
+    public ResponseHelper<List<AdminWebsit>> websitList(
+            @ApiParam(value = "A=平台 B=商户网点 C=普通网点") @RequestParam(required = false) String type,
+            @RequestParam(required = false) Boolean isAll,
+            @RequestParam(required = false) Boolean status,
+            @RequestParam(required = false) Boolean isIncre,
+            @RequestParam(required = false) String streetCode,
+            @RequestParam(required = false) String channelId,
+            @RequestParam(required = false) String categoryId,
+            @RequestParam(required = false) String orderSourceId,
+            @RequestParam(required = false) String orderSmallId
+    ) {
+        List<AdminWebsit> list = adminWebsitLogic.websitList(type, isAll, isIncre, status,streetCode,channelId,categoryId,orderSmallId,orderSourceId);
+        return ResponseHelper.success(list);
+    }
+
     @GetMapping("/zone/list")
     @ApiOperation("区域列表")
     public ResponseHelper<AdminZone> zoneList() {

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -824,4 +824,34 @@ public class AdminWebsitLogic {
         excelData.setRows(rows);
         return excelData;
     }
+
+    public List<AdminWebsit> websitList(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
+                                        String orderSmallId, String orderSourceId) {
+
+            AdminUserCom adminUser = commonLogic.getAdminUser();
+
+
+            List<String> websitIds = new ArrayList<>();
+            if (!StringUtil.isEmpty(streetCode)) {
+                websitIds = websitDispatchService.lambdaQuery()
+                        .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
+                        .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
+                        .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
+                        .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
+                        .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
+                        .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
+                        .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
+            }
+
+
+            List<AdminWebsit> list = adminWebsitService.lambdaQuery()
+                    .eq(StringUtils.isNotBlank(type), AdminWebsit::getType, type)
+                    .in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
+                    .eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)
+                    .eq(status != null, AdminWebsit::getStatus, status)
+                    .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                    .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                    .list();
+            return list;
+    }
 }

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

@@ -1315,24 +1315,24 @@ public class OrderBaseExcelLogic {
 
             }else {
                 Region province = regionService.lambdaQuery()
-                        .like(Region::getProvinceName, pgOrderBase.getProvince()).last("limit 1").one();
+                        .like(Region::getProvinceName,pgOrderBase.getProvince()).last("limit 1").one();
 
 
                 Region city = regionService.lambdaQuery()
-                        .like(Region::getProvinceName, pgOrderBase.getProvince())
+                        .like(Region::getProvinceName,pgOrderBase.getProvince())
                         .eq(Region::getCityName,pgOrderBase.getCity())
                         .last("limit 1").one();
 
 
                 Region area = regionService.lambdaQuery()
-                        .like(Region::getProvinceName, pgOrderBase.getProvince())
+                        .like(Region::getProvinceName,pgOrderBase.getProvince())
                         .eq(Region::getCityName,pgOrderBase.getCity())
                         .eq(Region::getAreaName,pgOrderBase.getArea())
                         .last("limit 1").one();
 
 
                 Region street = regionService.lambdaQuery()
-                        .like(Region::getProvinceName, pgOrderBase.getProvince())
+                        .like(Region::getProvinceName,pgOrderBase.getProvince())
                         .eq(Region::getCityName,pgOrderBase.getCity())
                         .eq(Region::getAreaName,pgOrderBase.getArea())
                         .eq(Region::getName,pgOrderBase.getStreet())

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

@@ -1242,7 +1242,7 @@ public class OrderBaseLogic {
 
     public Region getRegion(String province, String city, String area, String street) {
         Region one = regionService.lambdaQuery()
-                .like(Region::getProvinceName, province).eq(Region::getCityName, city).eq(Region::getAreaName, area).eq(Region::getName, street).one();
+                .like(Region::getProvinceName,province).eq(Region::getCityName,city).eq(Region::getAreaName,area).eq(Region::getName,street).last("limit 1").one();
         return one;
     }