From ab0cb928d5322f686971cfcada0703248733a929 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 3 Jan 2024 08:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/biz/empcard/EmpCardService.java  | 14 ++++++-------
 .../biz/empcardgift/EmpCardGiftService.java   | 20 +++++++++++++++++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
index fb174a5..c0d4583 100644
--- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
@@ -311,7 +311,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
 
         list.forEach(s -> {
             EmpCardGiftVo goods = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData();
-            LpkReserveOrderGoods goods1 = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
+            LpkReserveOrderGoods goodsOne = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
             GoodsVo goodsVo = new GoodsVo();
             goodsVo.setGoods(s.getGoodsName());
             goodsVo.setNum(s.getGoodsNumber());
@@ -326,14 +326,14 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
                 goodsVo.setLNum(0);
                 goodsVos.add(goodsVo);
             } else {
-                if (null != goods && null != goods1) {
-                    if ((goods.getGoodsNumber()+goods1.getGoodsNumber()) != s.getGoodsNumber()) {
-                        goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goods1.getGoodsNumber());
+                if (null != goods && null != goodsOne) {
+                    if ((goods.getGoodsNumber()+goodsOne.getGoodsNumber()) != s.getGoodsNumber()) {
+                        goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goodsOne.getGoodsNumber());
                         goodsVo.setSelect(0);
                     }
-                } else if(null != goods1){
-                    if (goods1.getGoodsNumber() != s.getGoodsNumber()) {
-                        goodsVo.setLNum(s.getGoodsNumber()- goods1.getGoodsNumber());
+                } else if(null != goodsOne){
+                    if (goodsOne.getGoodsNumber() != s.getGoodsNumber()) {
+                        goodsVo.setLNum(s.getGoodsNumber()- goodsOne.getGoodsNumber());
                         goodsVo.setSelect(0);
                     }
                 }else if(null != goods){
diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
index fa9b4bb..d8648a6 100644
--- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
@@ -45,6 +45,7 @@ import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
 import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator;
 import com.yxt.yyth.biz.lpkgoods.LpkGoodsService;
 import com.yxt.yyth.biz.lpkreserveorder.LpkReserveOrderService;
+import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsMapper;
 import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
 import com.yxt.yyth.biz.lpkstore.LpkStoreService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,6 +98,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
     @Autowired
     LpkGiftBagService lpkGiftBagService;
     @Autowired
+    private LpkReserveOrderGoodsMapper lpkReserveOrderGoodsMapper;
+    @Autowired
     private FileUploadComponent fileUploadComponent;
 
     @Autowired
@@ -412,9 +415,17 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             record.setEmpCardSid(dto.getEmpCardSid());
             record.setCode(dto.getCode());
             empCardGrantLogService.updateById(record);
-
-            EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
             int i = 0;
+            /*EmpAppletVo voss =empCardService.getEmpCardBySid(empCard.getSid()).getData();
+            for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : voss.getGoodsVos()) {
+                LpkReserveOrderGoods goods1 = lpkReserveOrderGoodsMapper.getReserveByCardSid(empCard.getSid(), vo1.getGoodsSid());
+                if (null != goods1) {
+                    if (vo1.getNum() <= goods1.getGoodsNumber()) {
+                        i++;
+                    }
+                }
+            }*/
+            EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
             for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
                 EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
                 if (null != goods1) {
@@ -426,6 +437,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
                     empCardService.changState(dto.getEmpCardSid(), "3");
                 }
             }
+           /* if (vo.getGoodsVos().size() == i) {
+                empCardService.changState(empCard.getSid(), "5");
+            } else {
+                empCardService.changState(empCard.getSid(), "4");
+            }*/
         }
         return rb.success();
     }