product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1/9

Browse Source
This commit is contained in:
wangpengfei
2024-01-09 18:16:36 +08:00
parent 2c76fe47dd
commit 698e6b4708
10 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java
View File

@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.List;
/** /**
* @author wangpengfei * @author wangpengfei
@@ -26,6 +27,7 @@ public class AppletGiftBagVo implements Vo {
private String isRecommend;//是否推荐 1 推荐 0 默认 private String isRecommend;//是否推荐 1 推荐 0 默认
private String remarks; private String remarks;
private String count;// private String count;//
private List<GiftBagGoods> giftBagGoods;
public String getPrice() { public String getPrice() {
DecimalFormat decimalFormat = new DecimalFormat("#0.00"); DecimalFormat decimalFormat = new DecimalFormat("#0.00");

2
src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java
View File

@@ -24,6 +24,8 @@ public class GiftBagGoods {
private String jPrice; //每斤单价 private String jPrice; //每斤单价
private String specificationUnit; //规格单位 private String specificationUnit; //规格单位
private String totalValue; //总价值 private String totalValue; //总价值
private String spec; //总价值
private String count; //总价值
public String getJPrice() { public String getJPrice() {

1
src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java
View File

@@ -53,6 +53,7 @@ public class EmpGiftAppletVo {
private String serialNumber; private String serialNumber;
private String isEnable; private String isEnable;
private String isTransfer;//是否转增 0 未转赠 1 转赠 private String isTransfer;//是否转增 0 未转赠 1 转赠
private String isSenior;//是否是最高级的卡 1 是 2不是

11
src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java
View File

@@ -206,9 +206,16 @@ public class AppletGiftBagService extends MybatisBaseService<AppletGiftBagMapper
List<AppletGiftBagVo> list=baseMapper.giftBagList(); List<AppletGiftBagVo> list=baseMapper.giftBagList();
list.forEach(s->{ list.forEach(s->{
// s.setPrice(Double.valueOf(aa(s.getPrice()))); // s.setPrice(Double.valueOf(aa(s.getPrice())));
List<AppletGiftBagGoods> appletGiftBagGoods=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",s.getSid())); List<GiftBagGoods> list1=appletGiftBagGoodsService.getGoodsByBagSidB(s.getSid());
s.setCount(appletGiftBagGoods.size()+"种蔬菜"); list1.forEach(l->{
l.setCount("共"+Integer.valueOf(l.getGoodsNumber())+l.getUnitName());
l.setSpec(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName());
});
// List<AppletGiftBagGoods> appletGiftBagGoods=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",s.getSid()));
s.setCount(list1.size()+"种蔬菜");
s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl()); s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl());
s.setGiftBagGoods(list1);
}); });
return rb.success().setData(list); return rb.success().setData(list);

3
src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java
View File

@@ -27,6 +27,9 @@ public interface AppletGiftBagGoodsMapper extends BaseMapper<AppletGiftBagGoods>
@Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " + @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}") " ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<GiftBagGoods> getGoodsByBagSidA(String sid); List<GiftBagGoods> 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<GiftBagGoods> getGoodsByBagSidB(String sid);
List<AppletGiftBagGoods> getRecordsByBagSid(@Param("sid") String sid); List<AppletGiftBagGoods> getRecordsByBagSid(@Param("sid") String sid);
int saveBagGoods(@Param("bagGoods") List<AppletGiftBagGoods> bagGoods); int saveBagGoods(@Param("bagGoods") List<AppletGiftBagGoods> bagGoods);

4
src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java
View File

@@ -29,8 +29,12 @@ public class AppletGiftBagGoodsService extends MybatisBaseService<AppletGiftBagG
public List<GiftBagGoods> getGoodsByBagSidA(String sid) { public List<GiftBagGoods> getGoodsByBagSidA(String sid) {
return baseMapper.getGoodsByBagSidA(sid); return baseMapper.getGoodsByBagSidA(sid);
} }
public List<GiftBagGoods> getGoodsByBagSidB(String sid) {
return baseMapper.getGoodsByBagSidB(sid);
}
public int saveBagGoods(List<AppletGiftBagGoods> bagGoods) { public int saveBagGoods(List<AppletGiftBagGoods> bagGoods) {
return baseMapper.saveBagGoods(bagGoods); return baseMapper.saveBagGoods(bagGoods);
} }
} }

11
src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java
View File

@@ -353,10 +353,13 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
}else{ }else{
goodsVo.setLNum(s.getGoodsNumber()); goodsVo.setLNum(s.getGoodsNumber());
} }
g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); if(goodsVo.getLNum()!=0){
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
g.setGoodsName(s.getGoodsName()); g.setContent("共"+(int)goodsVo.getLNum()+"份");
list1.add(g); g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
g.setGoodsName(s.getGoodsName());
list1.add(g);
}
} }
}); });
return rb.success().setData(list1); return rb.success().setData(list1);

1
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml
View File

@@ -37,6 +37,7 @@
gi.serialNumber AS serialNumber, gi.serialNumber AS serialNumber,
gi.startDate as dateStart, gi.startDate as dateStart,
gi.endDate as dateEnd, gi.endDate as dateEnd,
gi.isSenior,
CASE CASE
gi.state gi.state
WHEN 3 THEN WHEN 3 THEN

18
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
View File

@@ -193,7 +193,6 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
EmpGiftAppletNVo vo = baseMapper.getGifCardsBySid(sid); EmpGiftAppletNVo vo = baseMapper.getGifCardsBySid(sid);
List<LpkGifGoodsVo> list=empCardGiftGoodsService.getGoodsByGiftSid(sid).getData(); List<LpkGifGoodsVo> list=empCardGiftGoodsService.getGoodsByGiftSid(sid).getData();
List<LpkGifGoodsVo> list1=new ArrayList<>(); List<LpkGifGoodsVo> list1=new ArrayList<>();
List<GoodsVo> goodsVos = new ArrayList<>();
list.forEach(s -> { list.forEach(s -> {
LpkGifGoodsVo g=new LpkGifGoodsVo(); LpkGifGoodsVo g=new LpkGifGoodsVo();
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
@@ -219,10 +218,13 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
} else { } else {
goodsVo.setLNum(s.getGoodsNumber()); goodsVo.setLNum(s.getGoodsNumber());
} }
g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); if(goodsVo.getLNum()!=0){
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
g.setGoodsName(s.getGoodsName()); g.setContent("共"+(int)goodsVo.getLNum()+"份");
list1.add(g); g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
g.setGoodsName(s.getGoodsName());
list1.add(g);
}
} }
}); });
return rb.success().setData(list1); return rb.success().setData(list1);
@@ -311,7 +313,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
vo.setEmpCardGifts(empCardGift); vo.setEmpCardGifts(empCardGift);
vo.setOrderCardVoList(empReserveOrderCardVos); vo.setOrderCardVoList(empReserveOrderCardVos);
vo.setGoodsVos(goodsVos); vo.setGoodsVos(goodsVos);
vo.setPName("亲情菜窖"); if(vo.getIsSenior().equals("1")){
vo.setPName("家庭菜窖");
}else{
vo.setPName("亲情菜窖");
}
return rb.success().setData(vo); return rb.success().setData(vo);
} }
public ResultBean<List<EmpCardGiftVo>> recordList(String empCardSid) { public ResultBean<List<EmpCardGiftVo>> recordList(String empCardSid) {

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

@@ -270,10 +270,13 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
}else { }else {
goodsVo.setLNum(s.getGoodsNumber()); goodsVo.setLNum(s.getGoodsNumber());
} }
g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); if(goodsVo.getLNum()!=0){
g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份");
g.setGoodsName(s.getGoodsName()); g.setContent("共"+(int)goodsVo.getLNum()+"份");
list1.add(g); g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName());
g.setGoodsName(s.getGoodsName());
list1.add(g);
}
} }
// goodsVos.add(goodsVo); // goodsVos.add(goodsVo);
}); });