From b6d2055d482e5f3261372b8b071aa68c4dd61ebf Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sun, 21 Jan 2024 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=9F=E6=88=90=E7=BB=91?=
 =?UTF-8?q?=E5=8D=A1=E6=B5=81=E6=B0=B4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yythmall/biz/empcard/EmpCardMapper.xml    |  29 ++-
 .../biz/empcardgift/EmpCardGiftMapper.xml     |   4 +-
 .../biz/lpkgiftcard/LpkGiftCardMapper.xml     | 185 +++++++++---------
 .../biz/lpkgiftcard/LpkGiftCardService.java   |   5 +-
 .../vegereplenish/VegeReplenishService.java   |  12 ++
 5 files changed, 120 insertions(+), 115 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml
index bf7e866..7386eb7 100644
--- a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml
@@ -98,7 +98,7 @@
                bag.NAME          AS pname,
                card.state        AS states,
                card.serialNumber AS serialNumber,
-               card.isTransfer as isTransfer
+               card.isTransfer   as isTransfer
         FROM emp_card card
                  LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
         where card.sid = #{sid}
@@ -119,7 +119,7 @@
                bag.NAME          AS pname,
                card.state        AS states,
                card.serialNumber AS serialNumber,
-               card.isTransfer as isTransfer
+               card.isTransfer   as isTransfer
         FROM emp_card card
                  LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
         where card.sid = #{sid}
@@ -154,12 +154,13 @@
     </select>
     <select id="getBagGoods" resultType="com.yxt.yythmall.api.empcard.EmpCardVo">
         SELECT card.*,
-               s.sid  as goodsSid,
+               s.sid         as goodsSid,
                s.goodsNumber as goodsNumber
         FROM emp_card card
                  LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
                  left join lpk_giftbag_goods s on bag.sid = s.giftbagSid
-        where card.sid = #{sid} and  s.goodsSid=#{goodsSid}
+        where card.sid = #{sid}
+          and s.goodsSid = #{goodsSid}
     </select>
     <select id="cardStatisticsList" resultType="com.yxt.yythmall.api.empcard.EmpCardVo">
         SELECT
@@ -232,16 +233,14 @@
         </where>
     </select>
     <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
-        SELECT
-            e.sid as goodsSid,
-            e.name as goodsName,
-            d.goodsNumber as goodsNumber,
-            e.brandId as e.brandId,
-            e.cetegoryId as cetegoryId
-        FROM
-            emp_card gi
-                left join lpk_giftbag_goods d on d.giftbagSid=gi.giftbagSid
-                left join lpk_goods e on e.sid =d.goodsSid
-        where gi.sid=#{sid}
+        SELECT e.sid         AS goodsSid,
+               e.NAME        AS goodsName,
+               d.goodsNumber AS goodsNumber,
+               e.brandId     AS brandId,
+               e.categoryId  AS categoryId
+        FROM emp_card gi
+                 left join lpk_giftbag_goods d on d.giftbagSid = gi.giftbagSid
+                 left join lpk_goods e on e.sid = d.goodsSid
+        where gi.sid = #{sid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml
index 6dfe2fc..36ca8c5 100644
--- a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml
@@ -244,8 +244,8 @@
             e.sid as goodsSid,
             e.name as goodsName,
             d.goodsNumber as goodsNumber,
-            e.brandId as e.brandId,
-                e.cetegoryId as cetegoryId
+            e.brandId as brandId,
+                e.categoryId as categoryId
         FROM
             emp_card_gift gi
                 left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml
index 3b4a130..433d31d 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml
@@ -17,99 +17,96 @@
 
 
     <select id="getGifCardsByCustomerSid" resultType="com.yxt.yythmall.api.lpkgiftcard.AppletVo">
-        SELECT
-            card.sid as sid,
-            card.state AS state,
-            CASE
-                card.state
-                WHEN 3 THEN '未提货'
-                WHEN 4 THEN '已经预约提货(预约部分提货)'
-                WHEN 5 THEN '已经提取完成'
-                END stateValue,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '1'
-                END logo,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '1'
-                END type,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '家庭菜窖'
-                END pName,
-            bag.dateStart AS dateStart,
-            bag.dateEnd AS dateEnd,
-            card.state AS states,
-            card.serialNumber AS serialNumber,
-            card.isItInvalid,
-            card.bindDate,
-            card.isTransfer,
-            card.isEnable,
-            card.`code`,
-            card.isReservation
+        SELECT card.sid          as sid,
+               card.state        AS state,
+               CASE
+                   card.state
+                   WHEN 3 THEN '未提货'
+                   WHEN 4 THEN '已经预约提货(预约部分提货)'
+                   WHEN 5 THEN '已经提取完成'
+                   END              stateValue,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '1'
+                   END              logo,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '1'
+                   END              type,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '家庭菜窖'
+                   END              pName,
+               bag.dateStart     AS dateStart,
+               bag.dateEnd       AS dateEnd,
+               card.state        AS states,
+               card.serialNumber AS serialNumber,
+               card.isItInvalid,
+               card.bindDate,
+               card.isTransfer,
+               card.isEnable,
+               card.`code`,
+               card.isReservation
         FROM lpk_giftcard card
                  LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
         WHERE card.customerSid = #{customerSid}
         UNION
-        SELECT
-            card.sid as sid,
-            card.state AS state,
-            CASE card.state
-                WHEN 3 THEN '未提货'
-                WHEN 4 THEN '已经预约提货(预约部分提货)'
-                WHEN 5 THEN '已经提取完成'
-                END stateValue,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '2'
-                END logo,
-            CASE
-                when card.sid IS NOT NULL THEN '2'
-                END type,
-            CASE card.isSenior
-                WHEN 1 THEN '家庭菜窖'
-                WHEN 2 THEN '亲情菜窖'
-                END pName,
-            card.startDate AS dateStart,
-            card.endDate      AS dateEnd,
-            card.state        AS states,
-            card.serialNumber AS serialNumber,
-            card.isItInvalid,
-            card.bindDate,
-            card.isTransfer,
-            card.isEnable,
-            card.`code`,
-            card.isReservation
+        SELECT card.sid          as sid,
+               card.state        AS state,
+               CASE card.state
+                   WHEN 3 THEN '未提货'
+                   WHEN 4 THEN '已经预约提货(预约部分提货)'
+                   WHEN 5 THEN '已经提取完成'
+                   END              stateValue,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '2'
+                   END              logo,
+               CASE
+                   when card.sid IS NOT NULL THEN '2'
+                   END              type,
+               CASE card.isSenior
+                   WHEN 1 THEN '家庭菜窖'
+                   WHEN 2 THEN '亲情菜窖'
+                   END              pName,
+               card.startDate    AS dateStart,
+               card.endDate      AS dateEnd,
+               card.state        AS states,
+               card.serialNumber AS serialNumber,
+               card.isItInvalid,
+               card.bindDate,
+               card.isTransfer,
+               card.isEnable,
+               card.`code`,
+               card.isReservation
         FROM emp_card_gift card
                  LEFT JOIN emp_card emp ON emp.sid = card.empCardSid
                  LEFT JOIN lpk_giftbag gif ON gif.sid = emp.giftbagSid
         WHERE card.customerSid = #{customerSid}
         UNION
-        SELECT
-            card.sid as sid,
-            card.state AS state,
-            CASE
-                card.state
-                WHEN 3 THEN '未提货'
-                WHEN 4 THEN '已经预约提货(预约部分提货)'
-                WHEN 5 THEN '已经提取完成'
-                END stateValue,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '3'
-                END logo,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '3'
-                END type,
-            CASE
-                WHEN card.sid IS NOT NULL THEN '企业菜窖'
-                END pName,
-            bag.dateStart AS dateStart,
-            bag.dateEnd AS dateEnd,
-            card.state AS states,
-            card.serialNumber AS serialNumber,
-            card.isItInvalid,
-            card.bindDate,
-            card.isTransfer,
-            card.isEnable,
-            card.`code`,
-            card.isReservation
+        SELECT card.sid          as sid,
+               card.state        AS state,
+               CASE
+                   card.state
+                   WHEN 3 THEN '未提货'
+                   WHEN 4 THEN '已经预约提货(预约部分提货)'
+                   WHEN 5 THEN '已经提取完成'
+                   END              stateValue,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '3'
+                   END              logo,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '3'
+                   END              type,
+               CASE
+                   WHEN card.sid IS NOT NULL THEN '企业菜窖'
+                   END              pName,
+               bag.dateStart     AS dateStart,
+               bag.dateEnd       AS dateEnd,
+               card.state        AS states,
+               card.serialNumber AS serialNumber,
+               card.isItInvalid,
+               card.bindDate,
+               card.isTransfer,
+               card.isEnable,
+               card.`code`,
+               card.isReservation
         FROM emp_card card
                  LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
         WHERE card.customerSid = #{customerSid}
@@ -325,16 +322,14 @@
         </where>
     </select>
     <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
-        SELECT
-            e.sid as goodsSid,
-            e.name as goodsName,
-            d.goodsNumber as goodsNumber,
-            e.brandId as e.brandId,
-                e.cetegoryId as cetegoryId
-        FROM
-            lpk_giftcard gi
-                left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
-                left join lpk_goods e on e.sid =d.goodsSid
-        where gi.sid=#{sid}
+        SELECT e.sid         as goodsSid,
+               e.name        as goodsName,
+               d.goodsNumber as goodsNumber,
+               e.brandId     as brandId,
+               e.categoryId  as categoryId
+        FROM lpk_giftcard gi
+                 left join lpk_giftbag_goods d on d.giftbagSid = gi.giftbagSid
+                 left join lpk_goods e on e.sid = d.goodsSid
+        where gi.sid = #{sid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
index 92b4d4a..23af395 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
@@ -201,12 +201,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         baseMapper.updateById(lpkGiftCard);
         List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
         VegetableCellarDto dto = new VegetableCellarDto();
-        //生成绑卡流水
-
         //加入菜窖
-        dto.setCustomerSid(dto.getCustomerSid());
+        dto.setCustomerSid(bindCardDto.getCustomerSid());
         dto.setVos(k);
         vegetableCellarService.save1Goods(dto);
+        //生成绑卡流水
         vegeReplenishService.saveBindRecord(bindCardDto, "0");
         return rb.success().setMsg("绑定成功");
     }
diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java
index 9b0eb09..cad7d16 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java
@@ -55,6 +55,8 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
     private EmpCardGiftService empCardGiftService;
     @Autowired
     private EmpCardGiftGoodsService empCardGiftGoodsService;
+    @Autowired
+    private LpkGoodsService lpkGoodsService;
 
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveBindRecord(BindCardDto dto, String type) {
@@ -83,6 +85,9 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
                             detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
                             detail.setOrderSid(entity.getSid());
                             detail.setCreateTime(new DateTime());
+                            if (StringUtils.isNotBlank(g.getName())) {
+                                detail.setGoodsName(g.getName());
+                            }
                             vegeReplenishDetailService.insert(detail);
                         });
                     }
@@ -102,6 +107,9 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
                             detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
                             detail.setOrderSid(entity.getSid());
                             detail.setCreateTime(new DateTime());
+                            if (StringUtils.isNotBlank(g.getName())) {
+                                detail.setGoodsName(g.getName());
+                            }
                             vegeReplenishDetailService.insert(detail);
                         });
                     }
@@ -116,6 +124,10 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
                     goods.stream().forEach(g -> {
                         VegeReplenishDetail detail = new VegeReplenishDetail();
                         detail.setGoodsSid(g.getGoodsSid());
+                        LpkGoods lpkGoods = lpkGoodsService.fetchBySid(g.getGoodsSid());
+                        if (null != lpkGoods) {
+                            detail.setGoodsName(lpkGoods.getName());
+                        }
                         detail.setGoodsNumber(g.getGoodsNumber());
                         detail.setOrderSid(entity.getSid());
                         detail.setCreateTime(new DateTime());