diff --git a/src/main/java/com/yxt/yyth/api/empcardgiftgoods/EmpCardGoodsVo.java b/src/main/java/com/yxt/yyth/api/empcardgiftgoods/EmpCardGoodsVo.java new file mode 100644 index 0000000..31da651 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/empcardgiftgoods/EmpCardGoodsVo.java @@ -0,0 +1,20 @@ +package com.yxt.yyth.api.empcardgiftgoods; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/1/9 11:42 + */ +@Data +public class EmpCardGoodsVo { + private String goodsName; + private String goodsSid; + private double goodsNumber; + private double residue; + private String unitName; + private String specificationUnit; + private String weight; + private String remarks; + private String content; +} 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 8090711..c0ca878 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java @@ -186,7 +186,57 @@ public class EmpCardGiftService extends MybatisBaseService getGifCardsBySid(String sid) { + ResultBean rb = new ResultBean().fail(); + EmpGiftAppletVo vo = baseMapper.getGifCardBySid(sid); + List list = empCardGiftGoodsService.getGoodsByEmpCardGiftSid(vo.getSid()).getData(); + List goodsVos = new ArrayList<>(); + list.forEach(s -> { +// EmpReserveOrderGoods goods = empReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); + LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); + EmpCardGiftVo vo1=baseMapper.getEmpCardGoods(vo.getSid(),s.getGoodsSid()); + GoodsVo goodsVo = new GoodsVo(); + goodsVo.setGoods(s.getName()); + goodsVo.setNum(s.getGoodsNumber()); + goodsVo.setGoodsSid(s.getGoodsSid()); + goodsVo.setRemarks(s.getRemarks()); + goodsVo.setUnitName(s.getUnitName()); + goodsVo.setPic(urlPrefix + s.getPicUrl()); + if (vo.getState().equals("已过期")) { + goodsVo.setLNum(0); + goodsVos.add(goodsVo); + } else if (!vo.isShowBtn()) { + goodsVo.setLNum(0); + goodsVos.add(goodsVo); + } else { + if (null != goods && null!=vo1) { + if (goods.getGoodsNumber() != s.getGoodsNumber()) { + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber()); +// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber()); + goodsVo.setSelect(0); + } + }else if(null != vo1){ + if (vo1.getGoodsNumber() != s.getGoodsNumber()) { + goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber()); + goodsVo.setSelect(0); + } + }else if(null != goods) { + if (goods.getGoodsNumber() != s.getGoodsNumber()) { + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); + goodsVo.setSelect(0); + } + } else { + goodsVo.setLNum(s.getGoodsNumber()); +// goodsVo.setSelect(s.getGoodsNumber()); + goodsVo.setSelect(0); + } + goodsVos.add(goodsVo); + } + }); + vo.setGoodsVos(goodsVos); + return rb.success().setData(vo); + } public ResultBean getGifCardBySid(String sid) { ResultBean rb = new ResultBean().fail(); EmpGiftAppletVo vo = baseMapper.getGifCardBySid(sid); diff --git a/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java index faff911..44d5917 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.yyth.api.empcardgift.*; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoods; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo; +import com.yxt.yyth.api.empcardgiftgoods.EmpCardGoodsVo; +import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -22,4 +24,18 @@ public interface EmpCardGiftGoodsMapper extends BaseMapper { List getGoodsByEmpCardGiftSid(@Param("empCardGiftSid")String empCardGiftSid ); List getGoodsBySid(@Param("empCardGiftSid")String empCardGiftSid ); EmpCardGiftGoodsVo recordListGoods( @Param("empCardSid")String empCardSid,@Param("goodsSid")String goodsSid); + @Select("SELECT\n" + + "\tl.NAME AS goodsName,\n" + + "\tl.sid AS goodsSid,\n" + + "\tl.weight,\n" + + "\tl.specificationUnit,\n" + + "\tl.unitName,\n" + + "\ts.goodsNumber \n" + + "FROM\n" + + "\temp_card_gift g\n" + + "\tLEFT JOIN emp_card_gift_goods s ON s.empCardGiftSid = g.sid\n" + + "\tLEFT JOIN lpk_goods l ON l.sid = s.goodsSid \n" + + "WHERE\n" + + "\tg.sid =#{sid}") + List getGoodsByGiftSid(String sid); } diff --git a/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsService.java b/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsService.java index a23f954..835c99f 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgiftgoods/EmpCardGiftGoodsService.java @@ -12,6 +12,7 @@ import com.yxt.yyth.api.empcardgift.EmpCardGiftDto; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoods; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsDto; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo; +import com.yxt.yyth.api.empcardgiftgoods.EmpCardGoodsVo; import com.yxt.yyth.api.empcardgrantlog.EmpCardGrantLog; import com.yxt.yyth.api.lpkbank.LpkBank; import com.yxt.yyth.biz.empcard.EmpCardService; @@ -58,4 +59,9 @@ public class EmpCardGiftGoodsService extends MybatisBaseService> getGoodsByGiftSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List list= baseMapper.getGoodsByGiftSid(sid); + return rb.success().setData(list); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java index 35936a2..4a2175c 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java @@ -24,7 +24,14 @@ public interface LpkGiftBagGoodsMapper extends BaseMapper { @Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl,goods.price,goods.unitName,goods.remarks " + " from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSid(String sid); - @Select("select * from lpk_giftcard card left JOIN lpk_giftbag_goods g on card.giftbagSid=g.giftbagSid where card.sid=#{sid}") + @Select("SELECT\n" + + "\tgs.name as goodsName ,gs.sid as goodsSid, gs.weight ,gs.specificationUnit ,gs.unitName,g.goodsNumber \n" + + "FROM\n" + + "\tlpk_giftcard card\n" + + "\tLEFT JOIN lpk_giftbag_goods g ON card.giftbagSid = g.giftbagSid\n" + + "\tLEFT JOIN lpk_goods gs ON g.goodsSid = gs.sid \n" + + "WHERE\n" + + "\tcard.sid =#{sid}") List getGoodsByGiftSid(String sid); List getRecordsByBagSid(@Param("sid") String sid); 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 81cc77c..0a0bb7d 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -30,8 +30,10 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.empcardgift.EmpCardGift; import com.yxt.yyth.api.empcardgift.EmpCardGiftDto; import com.yxt.yyth.api.empcardgift.EmpCardGiftVo; +import com.yxt.yyth.api.empcardgift.EmpGiftAppletVo; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoods; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo; +import com.yxt.yyth.api.empcardgiftgoods.EmpCardGoodsVo; import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto; import com.yxt.yyth.api.lpkcardqrcode.LpkCardQrcode; @@ -218,28 +220,39 @@ public class LpkGiftCardService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage list = baseMapper.getGifCardsByCustomerSid(page, query.getCustomerSid()); - list.getRecords().forEach(s->{ - if(s.getLogo().equals("1")){ - //家庭卡 - List list1=LpkGiftBagGoodsService.getGoodsByGiftSid(s.getSid()); - list1.forEach(l->{ - AppletVo vo= getGifCardsBySid(s.getSid()).getData(); - List vos=vo.getGoodsVos(); - vos.forEach(d->{ - if(l.getGoodsSid().equals(d.getGoodsSid())){ - l.setContent("剩余"+d.getLNum()+"份/"+"共"+l.getGoodsNumber()+"份"); - } - }); - l.setRemarks(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName()); - }); - }else if(s.getLogo().equals("2")){ - //亲情卡 - - } else if (s.getLogo().equals("3")) { - //企业卡 - - } - }); +// list.getRecords().forEach(s->{ +// if(s.getLogo().equals("1")){ +// //家庭卡 +// List list1=LpkGiftBagGoodsService.getGoodsByGiftSid(s.getSid()); +// list1.forEach(l->{ +// AppletVo vo= getGifCardsBySid(s.getSid()).getData(); +// List vos=vo.getGoodsVos(); +// vos.forEach(d->{ +// if(l.getGoodsSid().equals(d.getGoodsSid())){ +// l.setContent("剩余"+d.getLNum()+"份/"+"共"+l.getGoodsNumber()+"份"); +// } +// }); +// l.setRemarks(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName()); +// }); +// }else if(s.getLogo().equals("2")){ +// //亲情卡 +// List list1=empCardGiftGoodsService.getGoodsByGiftSid(s.getSid()).getData(); +// list1.forEach(l->{ +// EmpGiftAppletVo vo=empCardGiftService.getGifCardsBySid(s.getSid()).getData(); +// List vos=vo.getGoodsVos(); +// vos.forEach(d->{ +// if(l.getGoodsSid().equals(d.getGoodsSid())){ +// l.setContent("剩余"+d.getLNum()+"份/"+"共"+l.getGoodsNumber()+"份"); +// } +// }); +// l.setRemarks(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName()); +// }); +// EmpGiftAppletVo vo=empCardGiftService.getGifCardsBySid(s.getSid()).getData(); +// } else if (s.getLogo().equals("3")) { +// //企业卡 +// +// } +// }); PagerVo p = PagerUtil.pageToVo(list, null); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return rb.success().setData(p);