From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java |   49 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 8f53790..f9920dd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -85,7 +85,7 @@
         Integer objectType = UserExt.getUser().getObjectType();
         System.out.println(objectType);
         model.addAttribute("userType",objectType);
-        return PREFIX + "TQuestionAdd.html";
+        return PREFIX + "TCouponAdd.html";
     }
 
     @RequestMapping("/coupon_record/{id}")
@@ -173,31 +173,26 @@
 
     @RequestMapping("/storeDetailsOfSearch")
     @ResponseBody
-    public Object listOfStore(Integer provinceId,Integer cityId,Integer operatorId,String storeName){
-        String provinceCode = null;
-        String cityCode = null;
-        if (ToolUtil.isNotEmpty(provinceId)){
-            Region provinceRegion = regiService.getById(provinceId);
-            provinceCode = provinceRegion.getCode();
-        }
-        if (ToolUtil.isNotEmpty(cityId)){
-            Region cityRegion = regiService.getById(cityId);
-            cityCode = cityRegion.getCode();
-        }
+    public Object listOfStore(String provinceId,String cityId,Integer operatorId,String storeName){
+
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceCode,cityCode,operatorId,storeName,page);
+        List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceId,cityId,operatorId,storeName,page);
         if (storeList.size() > 0 ){
             for (Map<String, Object> stringObjectMap : storeList) {
                 String provinceName = (String) stringObjectMap.get("province");
                 String cityName = (String) stringObjectMap.get("city");
                 stringObjectMap.put("provinceCity",provinceName+cityName);
                 Integer managerId = (Integer) stringObjectMap.get("operatorId");
-                if (managerId==null){
+                if (managerId==0){
                     stringObjectMap.put("accountName","平台");
                 }else{
                     TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
                     if (ToolUtil.isNotEmpty(operator)){
                         stringObjectMap.put("accountName",operator.getName());
+                    }else{
+                        stringObjectMap.put("accountName","平台");
+
                     }
                 }
 
@@ -221,6 +216,12 @@
         ofSearch.setUserPopulation(userPopulation);
         ofSearch.setStatus(status);
         ofSearch.setState(state);
+        if (UserExt.getUser().getObjectType()==3) {
+            ofSearch.setStoreId(UserExt.getUser().getObjectId());
+            ofSearch.setObjType(UserExt.getUser().getObjectType());
+        }
+
+
         return client.getCouponListOfSearch(ofSearch);
     }
 
@@ -241,8 +242,11 @@
         ofSearch.setState(state);
         ofSearch.setCityCode(cityCode);
         ofSearch.setStoreId(storeId);
-        return client.getCouponListOfSearch(ofSearch);
+        return client.getCouponListOfSearch1(ofSearch);
     }
+
+
+
     @RequestMapping(value = "/listRecord")
     @ResponseBody
     public Object listRecord(Integer id,String name, Integer type, String phone) {
@@ -296,10 +300,13 @@
     // 通过市 获取运营商
     @RequestMapping(value = "/getOperator")
     @ResponseBody
-    public Object getOperator(Integer city){
+    public Object getOperator(String city){
         List<TOperatorCity> name = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("name", city));
         List<Integer> collect = name.stream().map(TOperatorCity::getOperatorId)
                 .collect(Collectors.toList());
+        if (collect.size()==0){
+            return new ArrayList<>();
+        }
         return operatorService.list(new QueryWrapper<TOperator>().in("id",collect));
     }
 
@@ -338,9 +345,16 @@
         System.out.println(dataVo);
         Integer objectType = UserExt.getUser().getObjectType();
         dataVo.setUserType(objectType);
+        if(UserExt.getUser().getObjectType()==3){
+            dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
+            dataVo.setCompany(3);
+        }
+        dataVo.setObjType(UserExt.getUser().getObjectType());
         client.insertIntoData(dataVo);
         return new SuccessTip<>();
     }
+
+
     @PostMapping(value = "/update")
     @ResponseBody
     public Object update( Integer id,Integer num,Integer num1,String text){
@@ -348,6 +362,9 @@
         coupon.setQuantityIssued(num);
         coupon.setPickUpQuantity(num1);
         coupon.setIllustrate(text);
+        if (UserExt.getUser().getObjectType()==3) {
+            coupon.setAuditStatus(1);
+        }
         client.updateCouponData(coupon);
         return new SuccessTip<>();
     }

--
Gitblit v1.7.1