12/4

src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java

@@ -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="待提货";

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -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.selByOrderSids(vo2.getSid());
-            List<LpkReserveOrderGoods> goods =lpkReserveOrderGoodsService.selByOrderSid(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());
+                if(StringUtils.isBlank(vo2.getGoods())){
-                goodsVo.setGoods(lpkGoods.getName());
+                    vo2.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
-                goodsVo.setRemarks(lpkGoods.getRemarks());
+                }else{
-                goodsVos1.add(goodsVo);
+                    vo2.setGoods(vo2.getGoods()+"    "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
-//                if(StringUtils.isBlank(vo.getGoods())){
+                }
-//                    vo.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
-//                }else{
-//                    vo.setGoods(vo.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);