1/3

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

@@ -442,8 +442,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             record.setCode(card.getCode());
             empCardGrantLogService.updateById(record);
             int i = 0;
-            EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
+//            EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
-            for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
+            for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : empAppletVo.getGoodsVos()) {
                 EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
                 LpkReserveOrderGoods goods2 = lpkReserveOrderGoodsMapper.getReserveByCardSid(empCard.getSid(), vo1.getGoodsSid());
                 double c=0;
@@ -464,7 +464,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
                     i++;
                 }
             }
-            if (vo.getGoodsVos().size() == i) {
+            if (empAppletVo.getGoodsVos().size() == i) {
                 int i1=lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper<LpkReserveOrderGoods>().eq("cardSid",empCard.getSid()));
                 if(i1==0){
                     //如果没有预约记录 直接改转赠状态
@@ -543,7 +543,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             }
             baseMapper.insert(card);
             for (GoodsVo vo : dto.getGoodsVoList()) {
-                if(vo.getLNum()!=0){
+                if(vo.getSelect()!=0){
                     EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
                     dto1.setEmpCardGiftSid(card.getSid());
                     dto1.setGoodsSid(vo.getGoodsSid());
@@ -650,7 +650,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             }
             baseMapper.insert(card);
             for (GoodsVo vo : dto.getGoodsVoList()) {
-                if(vo.getLNum()!=0){
+                if(vo.getSelect()!=0){
                     EmpCardGiftGoodsDto dto1 = new EmpCardGiftGoodsDto();
                     dto1.setEmpCardGiftSid(card.getSid());
                     dto1.setGoodsSid(vo.getGoodsSid());

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml

@@ -187,7 +187,7 @@
         o.cardType	as type,
         s.`name` as store,
         case
-            when o.sid is not null then '家庭卡'
+            when o.sid is not null then '家庭菜窖'
         end as bagName,
         o.cardSid as cardSid,
         o.sid as orderSid,
@@ -207,7 +207,7 @@
         o.cardType	as type,
         s.`name` as store,
         case
-        when o.sid is not null then '亲情卡'
+        when o.sid is not null then '亲情菜窖'
         end as bagName,
         o.cardSid as cardSid,
         o.sid as orderSid,
@@ -227,7 +227,7 @@
         o.cardType	as type,
         s.`name` as store,
         case
-        when o.sid is not null then '企业卡'
+        when o.sid is not null then '企业菜窖'
         end as bagName,
         o.cardSid as cardSid,
         o.sid as orderSid,