From 6638af6bea3b3a9c2ab8eb34a5cbced7aec825b4 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 25 十月 2023 14:55:22 +0800
Subject: [PATCH] 10.25。1

---
 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java |   68 ++++++++++++++++++++++++++++------
 1 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 5f79d70..b5eb976 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -3,14 +3,10 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.other.entity.Store;
-import com.dsh.other.entity.TStoreOther;
-import com.dsh.other.entity.TStoreOtherConfigTrue;
+import com.dsh.other.entity.*;
 import com.dsh.other.feignclient.model.*;
 import com.dsh.other.model.*;
-import com.dsh.other.service.StoreService;
-import com.dsh.other.service.TStoreOtherConfigTrueService;
-import com.dsh.other.service.TStoreOtherService;
+import com.dsh.other.service.*;
 import com.dsh.other.util.GDMapGeocodingUtil;
 import com.dsh.other.util.ResultUtil;
 import com.dsh.other.util.ToolUtil;
@@ -21,6 +17,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("")
@@ -35,6 +32,10 @@
 
     @Autowired
     private TStoreOtherService tStoreOtherService;
+
+    @Autowired
+    private TBackRecordService backRecordService;
+
 
     /**
      * 根据城市管理员id获取门店
@@ -216,14 +217,34 @@
     @PostMapping("/store/queryStoreByIds")
     public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
         try {
-            return storeService.list(new LambdaQueryWrapper<Store>()
-                    .in(Store::getId,ids));
+            List<Store> list = storeService.list(new LambdaQueryWrapper<Store>()
+                    .in(Store::getId, ids));
+            for (Store store : list) {
+                Integer operatorId = store.getOperatorId();
+                if(operatorId == null){
+                    operatorId=-1;
+                }
+                String name = storeService.getOName(operatorId);
+                store.setOName(name);
+            }
+            return list;
         }catch (Exception e){
             e.printStackTrace();
             return new ArrayList<>();
         }
     }
 
+    @ResponseBody
+    @PostMapping("/store/queryStoreIdByCityCode")
+    List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect){
+        try {
+            return storeService.list(new LambdaQueryWrapper<Store>()
+                    .in(Store::getCityCode,collect)).stream().map(Store::getId).collect(Collectors.toList());
+        }catch (Exception e){
+            e.printStackTrace();
+            return new ArrayList<>();
+        }
+    }
 
 
 
@@ -233,10 +254,11 @@
     @ApiImplicitParams({
             @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = false),
             @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
+            @ApiImplicitParam(value = "cityCode", name = "cityCode", dataType = "string", required = false),
     })
-    public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat){
+    public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat,String cityCode){
         try {
-            List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat);
+            List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat,cityCode);
             return ResultUtil.success(baseVos);
         }catch (Exception e){
             e.printStackTrace();
@@ -279,6 +301,28 @@
         }
     }
 
+    @ResponseBody
+    @PostMapping("/store/queryByStoreId")
+    public OperatorUser queryByStoreId(@RequestBody Integer id){
+        try {
+            return storeService.queryByStoreId(id);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    @PostMapping("/store/addBackRecord")
+    public void addBackRecord(@RequestBody String s){
+        TBackRecord tBackRecord = new TBackRecord();
+        String[] split = s.split("_");
+        tBackRecord.setMoney(Double.valueOf(split[0]));
+        tBackRecord.setUserId(Integer.valueOf(split[1]));
+        tBackRecord.setTime(new Date());
+        backRecordService.save(tBackRecord);
+    }
+
 
 
 
@@ -313,9 +357,9 @@
         try {
             List<TStoreOtherConfigTrue> tStoreOtherConfigTrues = new ArrayList<>();
 
-            List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id));
+            List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id).eq(TStoreOther::getState,1));
             if(list.size()>0){
-                tStoreOtherConfigTrues= tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().eq(TStoreOtherConfigTrue::getPid, list.get(0).getId()));
+                tStoreOtherConfigTrues= tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().in(TStoreOtherConfigTrue::getPid, list.stream().map(TStoreOther::getId).collect(Collectors.toList())).eq(TStoreOtherConfigTrue::getState,1));
             }
             return ResultUtil.success(tStoreOtherConfigTrues);
         }catch (Exception e){

--
Gitblit v1.7.1