product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1/3

Browse Source
This commit is contained in:
wangpengfei
2024-01-03 21:48:08 +08:00
parent 530a3e1ce1
commit d813cdc99a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

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

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

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