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 18:19:10 +08:00
parent d9e3af5763
commit 2517637a12
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
View File

@@ -40,6 +40,7 @@ public class AppletVo {
private String isReservation;//是否超过预约时间 0 否 1是
private boolean notRese=true; //是否能预约
private List<LpkReserveOrderCardVo> orderCardVoList;
private String value;
public String getStart() {
@@ -105,10 +106,6 @@ public class AppletVo {
this.state="待提货";
}
}
// if(states.equals("5")){
// this.state="失效";
// showBtn=false;
// }
}
}else{
state="待提货";

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

@@ -195,22 +195,15 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
});
List<LpkReserveOrderCardVo>lpkReserveOrderCardVos=lpkReserveOrderService.selOrderByCardSid(sid).getData();
for(LpkReserveOrderCardVo vo2:lpkReserveOrderCardVos){
List<GoodsVo> goodsVos1=new ArrayList<>();
List<LpkReserveOrderGoods> goods =lpkReserveOrderGoodsService.selByOrderSid(vo2.getSid());
List<LpkReserveOrderGoods> goods =lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid());
for(LpkReserveOrderGoods goods1:goods){
GoodsVo goodsVo=new GoodsVo();
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
goodsVo.setNum(goods1.getGoodsNumber());
goodsVo.setGoods(lpkGoods.getName());
goodsVo.setRemarks(lpkGoods.getRemarks());
goodsVos1.add(goodsVo);
// if(StringUtils.isBlank(vo.getGoods())){
// vo.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
// }else{
// vo.setGoods(vo.getGoods()+" "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
// }
if(StringUtils.isBlank(vo2.getGoods())){
vo2.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
}else{
vo2.setGoods(vo2.getGoods()+" "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
}
}
vo2.setGoodsVos(goodsVos1);
}
vo.setOrderCardVoList(lpkReserveOrderCardVos);
vo.setGoodsVos(goodsVos);
@@ -256,6 +249,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
LpkStoreDetailsVo vo2= lpkStoreService.storeInit(vo1.getStoreSid()).getData();
if(null!=vo2){
vo.setAddressName(vo2.getName());
vo.setValue(vo2.getSid());
}
}
return rb.success().setData(vo);