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

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

@@ -111,6 +111,7 @@ 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");
@@ -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);
@@ -205,6 +207,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
} }
} }
} }
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);
@@ -252,6 +262,19 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
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);
} }