From 27b31578aacb7f846214d3dfd458f490934786c8 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 1 Dec 2023 16:48:30 +0800
Subject: [PATCH] 12/1

---
 .../com/yxt/yyth/api/lpkstore/LpkStoreQuery.java   |  1 +
 .../java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java | 14 ++++++++------
 .../yyth/biz/lpkgiftcard/LpkGiftCardService.java   |  7 +++++--
 .../com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java  |  1 +
 .../com/yxt/yyth/biz/lpkstore/LpkStoreMapper.xml   |  8 ++++++++
 .../com/yxt/yyth/biz/lpkstore/LpkStoreRest.java    |  6 ++++++
 .../com/yxt/yyth/biz/lpkstore/LpkStoreService.java | 11 +++++++++++
 7 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreQuery.java b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreQuery.java
index 0497924..46614ac 100644
--- a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreQuery.java
+++ b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreQuery.java
@@ -12,4 +12,5 @@ import lombok.Data;
 @Data
 public class LpkStoreQuery implements Query {
     private String name;
+    private String sort;
 }
diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java
index a6c1f57..746c63a 100644
--- a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java
@@ -19,10 +19,12 @@ import java.util.UUID;
 public class LpkStoreVo implements Vo {
     private String sid;
     private String createTime;
-    private String remarks;
-    private String code;
-    private String name;
-    private String address;
-    private String phone;
-    private String businessHours;
+    private String remarks;//备注信息
+    private String code;//编号
+    private String name;//名称
+    private String address;//地址
+    private String phone;//电话
+    private String businessHours;//营业时间，提货时间（早X点到晚X点）
+    private String linker;//联系人
+    private  String sort;//排序
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
index afa02a4..3796c3c 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -27,6 +27,7 @@ import com.yxt.yyth.api.lpkgoods.LpkGoodsQuery;
 import com.yxt.yyth.api.lpkgoods.LpkGoodsVo;
 import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo;
 import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
+import com.yxt.yyth.api.lpkstore.LpkStoreQuery;
 import com.yxt.yyth.api.lpkstore.StoreSelect;
 import com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordService;
 import com.yxt.yyth.biz.lpkcardgrantrecord.LpkCardGrantRecordService;
@@ -177,7 +178,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ResultBean rb = new ResultBean().fail();
         AppletVo vo = baseMapper.getGifCardBySid(sid);
         List<LpkGiftBagGoodsVo> list = LpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid());
-        List<StoreSelect> l = lpkStoreService.getAllStore().getData();
+//        List<StoreSelect> l = lpkStoreService.getAllStore().getData();
+        LpkStoreQuery query=new LpkStoreQuery();
+//        List<StoreSelect> l = lpkStoreService.getAllStoreByQuery(query).getData();
 
         List<GoodsVo> goodsVos = new ArrayList<>();
         list.forEach(s -> {
@@ -203,7 +206,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             }
         });
         vo.setGoodsVos(goodsVos);
-        vo.setSelect(l);
+//        vo.setSelect(l);
         LpkReserveOrderVo vo1 =lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
         if(null!=vo1){
             vo.setStoreSid(vo1.getStore());
diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java
index d5dd741..7c66529 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java
@@ -25,4 +25,5 @@ public interface LpkStoreMapper extends BaseMapper<LpkStore> {
     IPage<LpkStoreVo> storeListPage(IPage<LpkStore> page, @Param(Constants.WRAPPER) QueryWrapper<LpkStore> qw);
     @Select("select sid as value,name as text from lpk_store")
     List<StoreSelect> getAllStore();
+    List<LpkStoreVo> getAllStoreByQuery(@Param(Constants.WRAPPER) QueryWrapper<LpkStore> qw);
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.xml
index 168479b..b8fa39d 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.xml
@@ -18,4 +18,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getAllStoreByQuery" resultType="com.yxt.yyth.api.lpkstore.LpkStoreVo">
+        select
+        *
+        from lpk_store
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java
index 68cd8be..4c48958 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java
@@ -57,4 +57,10 @@ public class LpkStoreRest {
     public ResultBean getAllStore(){
         return lpkStoreService.getAllStore();
     }
+    @ApiOperation("获取全部取货点名称")
+    @PostMapping ("/getAllStoreByQuery")
+    public ResultBean getAllStoreByQuery(LpkStoreQuery query){
+        return lpkStoreService.getAllStoreByQuery(query);
+    }
+
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java
index df84d05..49ab7fa 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java
@@ -90,4 +90,15 @@ public class LpkStoreService extends MybatisBaseService<LpkStoreMapper, LpkStore
         List<StoreSelect> vos= baseMapper.getAllStore();
         return rb.success().setData(vos);
     }
+    public ResultBean<List<LpkStoreVo>> getAllStoreByQuery(LpkStoreQuery query){
+        ResultBean rb=new ResultBean();
+        QueryWrapper<LpkStore> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("name", query.getName());
+        }
+        qw.eq("isEnable", "1");
+        qw.orderByDesc("sort");
+        List<LpkStoreVo> vos= baseMapper.getAllStoreByQuery(qw);
+        return rb.success().setData(vos);
+    }
 }