Browse Source

转赠记录

master
wangpengfei 1 year ago
parent
commit
50584ff739
  1. 2
      src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml
  2. 2
      src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
  3. 2
      src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

2
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml

@ -201,7 +201,7 @@
gi.*,gi.isShare as share gi.*,gi.isShare as share
FROM emp_card_gift gi FROM emp_card_gift gi
where gi.empCardSid=#{empCardSid} where gi.empCardSid=#{empCardSid}
order by createTime desc
</select> </select>
<select id="getEmpCardGiftByGiftbagSid" resultType="com.yxt.yyth.api.empcardgift.EmpCardGiftVo"> <select id="getEmpCardGiftByGiftbagSid" resultType="com.yxt.yyth.api.empcardgift.EmpCardGiftVo">
SELECT SELECT

2
src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

@ -298,7 +298,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
vo.setValue(vo2.getSid()); vo.setValue(vo2.getSid());
} }
} }
List<EmpCardGift> empCardGift =baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2")); List<EmpCardGift> empCardGift =baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2").orderByDesc("createTime"));
empCardGift.forEach(s->{ empCardGift.forEach(s->{
List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid())); List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
list1.forEach(l->{ list1.forEach(l->{

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

@ -348,7 +348,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
vo.setValue(vo2.getSid()); vo.setValue(vo2.getSid());
} }
} }
List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3")); List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3").orderByDesc("createTime"));
empCardGift.forEach(s->{ empCardGift.forEach(s->{
List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid())); List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
list1.forEach(l->{ list1.forEach(l->{

Loading…
Cancel
Save