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

企业卡

Browse Source
This commit is contained in:
dimengzhe
2024-01-03 08:33:06 +08:00
parent a002e0d83f
commit ab0cb928d5
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
View File

@@ -311,7 +311,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
list.forEach(s -> { list.forEach(s -> {
EmpCardGiftVo goods = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData(); 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 goodsVo = new GoodsVo();
goodsVo.setGoods(s.getGoodsName()); goodsVo.setGoods(s.getGoodsName());
goodsVo.setNum(s.getGoodsNumber()); goodsVo.setNum(s.getGoodsNumber());
@@ -326,14 +326,14 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
goodsVo.setLNum(0); goodsVo.setLNum(0);
goodsVos.add(goodsVo); goodsVos.add(goodsVo);
} else { } else {
if (null != goods && null != goods1) { if (null != goods && null != goodsOne) {
if ((goods.getGoodsNumber()+goods1.getGoodsNumber()) != s.getGoodsNumber()) { if ((goods.getGoodsNumber()+goodsOne.getGoodsNumber()) != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goods1.getGoodsNumber()); goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goodsOne.getGoodsNumber());
goodsVo.setSelect(0); goodsVo.setSelect(0);
} }
} else if(null != goods1){ } else if(null != goodsOne){
if (goods1.getGoodsNumber() != s.getGoodsNumber()) { if (goodsOne.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- goods1.getGoodsNumber()); goodsVo.setLNum(s.getGoodsNumber()- goodsOne.getGoodsNumber());
goodsVo.setSelect(0); goodsVo.setSelect(0);
} }
}else if(null != goods){ }else if(null != goods){

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

@@ -45,6 +45,7 @@ import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator; import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator;
import com.yxt.yyth.biz.lpkgoods.LpkGoodsService; import com.yxt.yyth.biz.lpkgoods.LpkGoodsService;
import com.yxt.yyth.biz.lpkreserveorder.LpkReserveOrderService; 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.lpkreserveordergoods.LpkReserveOrderGoodsService;
import com.yxt.yyth.biz.lpkstore.LpkStoreService; import com.yxt.yyth.biz.lpkstore.LpkStoreService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -97,6 +98,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
@Autowired @Autowired
LpkGiftBagService lpkGiftBagService; LpkGiftBagService lpkGiftBagService;
@Autowired @Autowired
private LpkReserveOrderGoodsMapper lpkReserveOrderGoodsMapper;
@Autowired
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
@@ -412,9 +415,17 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
record.setEmpCardSid(dto.getEmpCardSid()); record.setEmpCardSid(dto.getEmpCardSid());
record.setCode(dto.getCode()); record.setCode(dto.getCode());
empCardGrantLogService.updateById(record); empCardGrantLogService.updateById(record);
EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData();
int i = 0; 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()) { for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData(); EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData();
if (null != goods1) { if (null != goods1) {
@@ -426,6 +437,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
empCardService.changState(dto.getEmpCardSid(), "3"); empCardService.changState(dto.getEmpCardSid(), "3");
} }
} }
/* if (vo.getGoodsVos().size() == i) {
empCardService.changState(empCard.getSid(), "5");
} else {
empCardService.changState(empCard.getSid(), "4");
}*/
} }
return rb.success(); return rb.success();
} }