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

12/4

Browse Source
This commit is contained in:
wangpengfei
2023-12-04 21:38:06 +08:00
parent 2517637a12
commit 692bc099e3
3 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
View File

@@ -97,7 +97,7 @@
date_format(rr.buildDate, '%Y-%m-%d') as buildDate date_format(rr.buildDate, '%Y-%m-%d') as buildDate
FROM FROM
lpk_giftcard card lpk_giftcard card
left join lpk_bank bank on bank.sid=card.bankSid left join lpk_bank bank on bank.sid=card.bankSid
left join lpk_card_grant_record rr on rr.sid =card.grantRecordSid left join lpk_card_grant_record rr on rr.sid =card.grantRecordSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}

2
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
View File

@@ -77,7 +77,7 @@ public class LpkGiftCardRest {
@ApiOperation(value = "礼包卡信息列表导出") @ApiOperation(value = "礼包卡信息列表导出")
@PostMapping("/exportExcel") @PostMapping("/exportExcel")
public void exportExcel(@RequestBody LpkGiftCardListQuery query) { public void exportExcel(@RequestBody LpkGiftCardListQuery query) {
lpkGiftCardService.exportExcel(query); lpkGiftCardService.exportExcel(query);
} }
@ApiOperation(value = "礼包卡发放信息") @ApiOperation(value = "礼包卡发放信息")

83
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
View File

@@ -111,7 +111,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return rb.success().setData(p); return rb.success().setData(p);
} }
// public ResultBean updateIsItInvalid() {
// public ResultBean updateIsItInvalid() {
// ResultBean rb = new ResultBean(); // ResultBean rb = new ResultBean();
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>().lt("dateEnd", sdf.format(new Date()))); // List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>().lt("dateEnd", sdf.format(new Date())));
@@ -126,27 +127,27 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
public ResultBean updateIsItInvalid(String customerSid) { public ResultBean updateIsItInvalid(String customerSid) {
ResultBean rb = new ResultBean(); ResultBean rb = new ResultBean();
List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>()); List<LpkGiftBag> lpkGiftBags = lpkGiftBagService.list(new QueryWrapper<LpkGiftBag>());
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for(LpkGiftBag lpkGiftBag : lpkGiftBags){ for (LpkGiftBag lpkGiftBag : lpkGiftBags) {
int in= DateUtil.parse(sdf.format(lpkGiftBag.getDateEnd())).compareTo(DateUtil.parse(sdf.format(new Date()))); int in = DateUtil.parse(sdf.format(lpkGiftBag.getDateEnd())).compareTo(DateUtil.parse(sdf.format(new Date())));
if(String.valueOf(in).equals("-1")){ if (String.valueOf(in).equals("-1")) {
Integer i = baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5")); Integer i = baseMapper.selectCount(new QueryWrapper<LpkGiftCard>().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5"));
if (i != 0) { if (i != 0) {
baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5"); baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5");
} }
}else{ } else {
List<LpkGiftCard>list= baseMapper.selectList(new QueryWrapper<LpkGiftCard>().eq("customerSid",customerSid).eq("giftbagSid",lpkGiftBag.getSid())); List<LpkGiftCard> list = baseMapper.selectList(new QueryWrapper<LpkGiftCard>().eq("customerSid", customerSid).eq("giftbagSid", lpkGiftBag.getSid()));
for (LpkGiftCard card:list){ for (LpkGiftCard card : list) {
LpkReserveOrderVo LpkReserveOrderVo=lpkReserveOrderService.selByCardSid(card.getSid()).getData(); LpkReserveOrderVo LpkReserveOrderVo = lpkReserveOrderService.selByCardSid(card.getSid()).getData();
if(null!=LpkReserveOrderVo){ if (null != LpkReserveOrderVo) {
int c= DateUtil.parse(sdf.format(LpkReserveOrderVo.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date()))); int c = DateUtil.parse(sdf.format(LpkReserveOrderVo.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date())));
LpkGiftCard card1= baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",card.getSid())); LpkGiftCard card1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", card.getSid()));
if(String.valueOf(c).equals("-1")){ if (String.valueOf(c).equals("-1")) {
card1.setIsReservation("1"); card1.setIsReservation("1");
baseMapper.updateById(card1); baseMapper.updateById(card1);
} }
} }
} }
} }
} }
@@ -173,6 +174,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goodsVo.setNum(s.getGoodsNumber()); goodsVo.setNum(s.getGoodsNumber());
goodsVo.setGoodsSid(s.getGoodsSid()); goodsVo.setGoodsSid(s.getGoodsSid());
goodsVo.setRemarks(s.getRemarks()); goodsVo.setRemarks(s.getRemarks());
goodsVo.setUnitName(s.getUnitName());
goodsVo.setPic(urlPrefix + s.getPicUrl()); goodsVo.setPic(urlPrefix + s.getPicUrl());
if (vo.getState().equals("已过期")) { if (vo.getState().equals("已过期")) {
goodsVo.setLNum(0); goodsVo.setLNum(0);
@@ -193,18 +195,26 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
goodsVos.add(goodsVo); goodsVos.add(goodsVo);
} }
}); });
List<LpkReserveOrderCardVo>lpkReserveOrderCardVos=lpkReserveOrderService.selOrderByCardSid(sid).getData(); List<LpkReserveOrderCardVo> lpkReserveOrderCardVos = lpkReserveOrderService.selOrderByCardSid(sid).getData();
for(LpkReserveOrderCardVo vo2:lpkReserveOrderCardVos){ for (LpkReserveOrderCardVo vo2 : lpkReserveOrderCardVos) {
List<LpkReserveOrderGoods> goods =lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid()); List<LpkReserveOrderGoods> goods = lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
for(LpkReserveOrderGoods goods1:goods){ for (LpkReserveOrderGoods goods1 : goods) {
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid())); LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
if(StringUtils.isBlank(vo2.getGoods())){ if (StringUtils.isBlank(vo2.getGoods())) {
vo2.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName()); vo2.setGoods(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
}else{ } else {
vo2.setGoods(vo2.getGoods()+" "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName()); vo2.setGoods(vo2.getGoods() + " " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
} }
} }
} }
LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
if (null != vo1) {
LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
if (null != vo2) {
vo.setAddressName(vo2.getName());
vo.setValue(vo2.getSid());
}
}
vo.setOrderCardVoList(lpkReserveOrderCardVos); vo.setOrderCardVoList(lpkReserveOrderCardVos);
vo.setGoodsVos(goodsVos); vo.setGoodsVos(goodsVos);
return rb.success().setData(vo); return rb.success().setData(vo);
@@ -246,12 +256,25 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
vo.setSelect(l); vo.setSelect(l);
LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData(); LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
if (null != vo1) { if (null != vo1) {
LpkStoreDetailsVo vo2= lpkStoreService.storeInit(vo1.getStoreSid()).getData(); LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
if(null!=vo2){ if (null != vo2) {
vo.setAddressName(vo2.getName()); vo.setAddressName(vo2.getName());
vo.setValue(vo2.getSid()); vo.setValue(vo2.getSid());
} }
} }
List<LpkReserveOrderCardVo> lpkReserveOrderCardVos = lpkReserveOrderService.selOrderByCardSid(sid).getData();
for (LpkReserveOrderCardVo vo2 : lpkReserveOrderCardVos) {
List<LpkReserveOrderGoods> goods = lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
for (LpkReserveOrderGoods goods1 : goods) {
LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
if (StringUtils.isBlank(vo2.getGoods())) {
vo2.setGoods(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
} else {
vo2.setGoods(vo2.getGoods() + " " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
}
}
}
vo.setOrderCardVoList(lpkReserveOrderCardVos);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@@ -418,7 +441,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
for (LpkGiftCardExport lpkGiftCardExport : exportList) { for (LpkGiftCardExport lpkGiftCardExport : exportList) {
if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) { if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) {
lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode()); lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode());
lpkGiftCardExport.setCode1(lpkGiftCardExport.getCode().substring(0,10)); lpkGiftCardExport.setCode1(lpkGiftCardExport.getCode().substring(0, 10));
lpkGiftCardExport.setCode2(lpkGiftCardExport.getCode().substring(lpkGiftCardExport.getCode().length() - 10)); lpkGiftCardExport.setCode2(lpkGiftCardExport.getCode().substring(lpkGiftCardExport.getCode().length() - 10));
} }
} }