From 698e6b47082646bd68db77abfeb88b43ceae6bce Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 9 Jan 2024 18:16:36 +0800 Subject: [PATCH] 1/9 --- .../api/appletgiftbag/AppletGiftBagVo.java | 2 ++ .../yyth/api/appletgiftbag/GiftBagGoods.java | 2 ++ .../yyth/api/empcardgift/EmpGiftAppletVo.java | 1 + .../appletgiftbag/AppletGiftBagService.java | 11 +++++++++-- .../AppletGiftBagGoodsMapper.java | 3 +++ .../AppletGiftBagGoodsService.java | 4 ++++ .../yxt/yyth/biz/empcard/EmpCardService.java | 11 +++++++---- .../yyth/biz/empcardgift/EmpCardGiftMapper.xml | 1 + .../biz/empcardgift/EmpCardGiftService.java | 18 ++++++++++++------ .../biz/lpkgiftcard/LpkGiftCardService.java | 11 +++++++---- 10 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java index be0199a..c192798 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.text.DecimalFormat; +import java.util.List; /** * @author wangpengfei @@ -26,6 +27,7 @@ public class AppletGiftBagVo implements Vo { private String isRecommend;//是否推荐 1 推荐 0 默认 private String remarks; private String count;// + private List giftBagGoods; public String getPrice() { DecimalFormat decimalFormat = new DecimalFormat("#0.00"); diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java index 0e7d497..4f1f930 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java @@ -24,6 +24,8 @@ public class GiftBagGoods { private String jPrice; //每斤单价 private String specificationUnit; //规格单位 private String totalValue; //总价值 + private String spec; //总价值 + private String count; //总价值 public String getJPrice() { diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java index 7690470..2714e0d 100644 --- a/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java @@ -53,6 +53,7 @@ public class EmpGiftAppletVo { private String serialNumber; private String isEnable; private String isTransfer;//是否转增 0 未转赠 1 转赠 + private String isSenior;//是否是最高级的卡 1 是 2不是 diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java index 170d00a..0f03d6d 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -206,9 +206,16 @@ public class AppletGiftBagService extends MybatisBaseService list=baseMapper.giftBagList(); list.forEach(s->{ // s.setPrice(Double.valueOf(aa(s.getPrice()))); - List appletGiftBagGoods=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",s.getSid())); - s.setCount(appletGiftBagGoods.size()+"种蔬菜"); + List list1=appletGiftBagGoodsService.getGoodsByBagSidB(s.getSid()); + list1.forEach(l->{ + l.setCount("共"+Integer.valueOf(l.getGoodsNumber())+l.getUnitName()); + l.setSpec(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName()); + + }); +// List appletGiftBagGoods=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",s.getSid())); + s.setCount(list1.size()+"种蔬菜"); s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl()); + s.setGiftBagGoods(list1); }); return rb.success().setData(list); diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java index c7990fa..0f64d2d 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java @@ -27,6 +27,9 @@ public interface AppletGiftBagGoodsMapper extends BaseMapper @Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " + " ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSidA(String sid); + @Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " + + " ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") + List getGoodsByBagSidB(String sid); List getRecordsByBagSid(@Param("sid") String sid); int saveBagGoods(@Param("bagGoods") List bagGoods); diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java index f92ab91..b16e45f 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java @@ -29,8 +29,12 @@ public class AppletGiftBagGoodsService extends MybatisBaseService getGoodsByBagSidA(String sid) { return baseMapper.getGoodsByBagSidA(sid); } + public List getGoodsByBagSidB(String sid) { + return baseMapper.getGoodsByBagSidB(sid); + } public int saveBagGoods(List bagGoods) { return baseMapper.saveBagGoods(bagGoods); } + } diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java index 52e9228..6bec090 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java @@ -353,10 +353,13 @@ public class EmpCardService extends MybatisBaseService { }else{ goodsVo.setLNum(s.getGoodsNumber()); } - g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); - g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); - g.setGoodsName(s.getGoodsName()); - list1.add(g); + if(goodsVo.getLNum()!=0){ + // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); + g.setContent("共"+(int)goodsVo.getLNum()+"份"); + g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); + g.setGoodsName(s.getGoodsName()); + list1.add(g); + } } }); return rb.success().setData(list1); diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml index e96c185..61dd013 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml @@ -37,6 +37,7 @@ gi.serialNumber AS serialNumber, gi.startDate as dateStart, gi.endDate as dateEnd, + gi.isSenior, CASE gi.state WHEN 3 THEN diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java index 90bf655..c9e7b5b 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java @@ -193,7 +193,6 @@ public class EmpCardGiftService extends MybatisBaseService list=empCardGiftGoodsService.getGoodsByGiftSid(sid).getData(); List list1=new ArrayList<>(); - List goodsVos = new ArrayList<>(); list.forEach(s -> { LpkGifGoodsVo g=new LpkGifGoodsVo(); LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); @@ -219,10 +218,13 @@ public class EmpCardGiftService extends MybatisBaseService> recordList(String empCardSid) { diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java index 3183d94..0e969de 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -270,10 +270,13 @@ public class LpkGiftCardService extends MybatisBaseService