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

完善生成绑卡流水记录

Browse Source
This commit is contained in:
fanzongzhe
2024-01-21 14:51:45 +08:00
parent 4921547c04
commit b6d2055d48
5 changed files with 120 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml
View File

@@ -98,7 +98,7 @@
bag.NAME AS pname, bag.NAME AS pname,
card.state AS states, card.state AS states,
card.serialNumber AS serialNumber, card.serialNumber AS serialNumber,
card.isTransfer as isTransfer card.isTransfer as isTransfer
FROM emp_card card FROM emp_card card
LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
where card.sid = #{sid} where card.sid = #{sid}
@@ -119,7 +119,7 @@
bag.NAME AS pname, bag.NAME AS pname,
card.state AS states, card.state AS states,
card.serialNumber AS serialNumber, card.serialNumber AS serialNumber,
card.isTransfer as isTransfer card.isTransfer as isTransfer
FROM emp_card card FROM emp_card card
LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
where card.sid = #{sid} where card.sid = #{sid}
@@ -154,12 +154,13 @@
</select> </select>
<select id="getBagGoods" resultType="com.yxt.yythmall.api.empcard.EmpCardVo"> <select id="getBagGoods" resultType="com.yxt.yythmall.api.empcard.EmpCardVo">
SELECT card.*, SELECT card.*,
s.sid as goodsSid, s.sid as goodsSid,
s.goodsNumber as goodsNumber s.goodsNumber as goodsNumber
FROM emp_card card FROM emp_card card
LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
left join lpk_giftbag_goods s on bag.sid = s.giftbagSid left join lpk_giftbag_goods s on bag.sid = s.giftbagSid
where card.sid = #{sid} and s.goodsSid=#{goodsSid} where card.sid = #{sid}
and s.goodsSid = #{goodsSid}
</select> </select>
<select id="cardStatisticsList" resultType="com.yxt.yythmall.api.empcard.EmpCardVo"> <select id="cardStatisticsList" resultType="com.yxt.yythmall.api.empcard.EmpCardVo">
SELECT SELECT
@@ -232,16 +233,14 @@
</where> </where>
</select> </select>
<select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo"> <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
SELECT SELECT e.sid AS goodsSid,
e.sid as goodsSid, e.NAME AS goodsName,
e.name as goodsName, d.goodsNumber AS goodsNumber,
d.goodsNumber as goodsNumber, e.brandId AS brandId,
e.brandId as e.brandId, e.categoryId AS categoryId
e.cetegoryId as cetegoryId FROM emp_card gi
FROM left join lpk_giftbag_goods d on d.giftbagSid = gi.giftbagSid
emp_card gi left join lpk_goods e on e.sid = d.goodsSid
left join lpk_giftbag_goods d on d.giftbagSid=gi.giftbagSid where gi.sid = #{sid}
left join lpk_goods e on e.sid =d.goodsSid
where gi.sid=#{sid}
</select> </select>
</mapper> </mapper>

4
src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml
View File

@@ -244,8 +244,8 @@
e.sid as goodsSid, e.sid as goodsSid,
e.name as goodsName, e.name as goodsName,
d.goodsNumber as goodsNumber, d.goodsNumber as goodsNumber,
e.brandId as e.brandId, e.brandId as brandId,
e.cetegoryId as cetegoryId e.categoryId as categoryId
FROM FROM
emp_card_gift gi emp_card_gift gi
left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid

185
src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml
View File

@@ -17,99 +17,96 @@
<select id="getGifCardsByCustomerSid" resultType="com.yxt.yythmall.api.lpkgiftcard.AppletVo"> <select id="getGifCardsByCustomerSid" resultType="com.yxt.yythmall.api.lpkgiftcard.AppletVo">
SELECT SELECT card.sid as sid,
card.sid as sid, card.state AS state,
card.state AS state, CASE
CASE card.state
card.state WHEN 3 THEN '未提货'
WHEN 3 THEN '未提货' WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 4 THEN '已经预约提货(预约部分提货)' WHEN 5 THEN '已经提取完成'
WHEN 5 THEN '已经提取完成' END stateValue,
END stateValue, CASE
CASE WHEN card.sid IS NOT NULL THEN '1'
WHEN card.sid IS NOT NULL THEN '1' END logo,
END logo, CASE
CASE WHEN card.sid IS NOT NULL THEN '1'
WHEN card.sid IS NOT NULL THEN '1' END type,
END type, CASE
CASE WHEN card.sid IS NOT NULL THEN '家庭菜窖'
WHEN card.sid IS NOT NULL THEN '家庭菜窖' END pName,
END pName, bag.dateStart AS dateStart,
bag.dateStart AS dateStart, bag.dateEnd AS dateEnd,
bag.dateEnd AS dateEnd, card.state AS states,
card.state AS states, card.serialNumber AS serialNumber,
card.serialNumber AS serialNumber, card.isItInvalid,
card.isItInvalid, card.bindDate,
card.bindDate, card.isTransfer,
card.isTransfer, card.isEnable,
card.isEnable, card.`code`,
card.`code`, card.isReservation
card.isReservation
FROM lpk_giftcard card FROM lpk_giftcard card
LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
WHERE card.customerSid = #{customerSid} WHERE card.customerSid = #{customerSid}
UNION UNION
SELECT SELECT card.sid as sid,
card.sid as sid, card.state AS state,
card.state AS state, CASE card.state
CASE card.state WHEN 3 THEN '未提货'
WHEN 3 THEN '未提货' WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 4 THEN '已经预约提货(预约部分提货)' WHEN 5 THEN '已经提取完成'
WHEN 5 THEN '已经提取完成' END stateValue,
END stateValue, CASE
CASE WHEN card.sid IS NOT NULL THEN '2'
WHEN card.sid IS NOT NULL THEN '2' END logo,
END logo, CASE
CASE when card.sid IS NOT NULL THEN '2'
when card.sid IS NOT NULL THEN '2' END type,
END type, CASE card.isSenior
CASE card.isSenior WHEN 1 THEN '家庭菜窖'
WHEN 1 THEN '家庭菜窖' WHEN 2 THEN '亲情菜窖'
WHEN 2 THEN '亲情菜窖' END pName,
END pName, card.startDate AS dateStart,
card.startDate AS dateStart, card.endDate AS dateEnd,
card.endDate AS dateEnd, card.state AS states,
card.state AS states, card.serialNumber AS serialNumber,
card.serialNumber AS serialNumber, card.isItInvalid,
card.isItInvalid, card.bindDate,
card.bindDate, card.isTransfer,
card.isTransfer, card.isEnable,
card.isEnable, card.`code`,
card.`code`, card.isReservation
card.isReservation
FROM emp_card_gift card FROM emp_card_gift card
LEFT JOIN emp_card emp ON emp.sid = card.empCardSid LEFT JOIN emp_card emp ON emp.sid = card.empCardSid
LEFT JOIN lpk_giftbag gif ON gif.sid = emp.giftbagSid LEFT JOIN lpk_giftbag gif ON gif.sid = emp.giftbagSid
WHERE card.customerSid = #{customerSid} WHERE card.customerSid = #{customerSid}
UNION UNION
SELECT SELECT card.sid as sid,
card.sid as sid, card.state AS state,
card.state AS state, CASE
CASE card.state
card.state WHEN 3 THEN '未提货'
WHEN 3 THEN '未提货' WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 4 THEN '已经预约提货(预约部分提货)' WHEN 5 THEN '已经提取完成'
WHEN 5 THEN '已经提取完成' END stateValue,
END stateValue, CASE
CASE WHEN card.sid IS NOT NULL THEN '3'
WHEN card.sid IS NOT NULL THEN '3' END logo,
END logo, CASE
CASE WHEN card.sid IS NOT NULL THEN '3'
WHEN card.sid IS NOT NULL THEN '3' END type,
END type, CASE
CASE WHEN card.sid IS NOT NULL THEN '企业菜窖'
WHEN card.sid IS NOT NULL THEN '企业菜窖' END pName,
END pName, bag.dateStart AS dateStart,
bag.dateStart AS dateStart, bag.dateEnd AS dateEnd,
bag.dateEnd AS dateEnd, card.state AS states,
card.state AS states, card.serialNumber AS serialNumber,
card.serialNumber AS serialNumber, card.isItInvalid,
card.isItInvalid, card.bindDate,
card.bindDate, card.isTransfer,
card.isTransfer, card.isEnable,
card.isEnable, card.`code`,
card.`code`, card.isReservation
card.isReservation
FROM emp_card card FROM emp_card card
LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
WHERE card.customerSid = #{customerSid} WHERE card.customerSid = #{customerSid}
@@ -325,16 +322,14 @@
</where> </where>
</select> </select>
<select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo"> <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
SELECT SELECT e.sid as goodsSid,
e.sid as goodsSid, e.name as goodsName,
e.name as goodsName, d.goodsNumber as goodsNumber,
d.goodsNumber as goodsNumber, e.brandId as brandId,
e.brandId as e.brandId, e.categoryId as categoryId
e.cetegoryId as cetegoryId FROM lpk_giftcard gi
FROM left join lpk_giftbag_goods d on d.giftbagSid = gi.giftbagSid
lpk_giftcard gi left join lpk_goods e on e.sid = d.goodsSid
left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid where gi.sid = #{sid}
left join lpk_goods e on e.sid =d.goodsSid
where gi.sid=#{sid}
</select> </select>
</mapper> </mapper>

5
src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
View File

@@ -201,12 +201,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
baseMapper.updateById(lpkGiftCard); baseMapper.updateById(lpkGiftCard);
List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid()); List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
VegetableCellarDto dto = new VegetableCellarDto(); VegetableCellarDto dto = new VegetableCellarDto();
//生成绑卡流水
//加入菜窖 //加入菜窖
dto.setCustomerSid(dto.getCustomerSid()); dto.setCustomerSid(bindCardDto.getCustomerSid());
dto.setVos(k); dto.setVos(k);
vegetableCellarService.save1Goods(dto); vegetableCellarService.save1Goods(dto);
//生成绑卡流水
vegeReplenishService.saveBindRecord(bindCardDto, "0"); vegeReplenishService.saveBindRecord(bindCardDto, "0");
return rb.success().setMsg("绑定成功"); return rb.success().setMsg("绑定成功");
} }

12
src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java
View File

@@ -55,6 +55,8 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
private EmpCardGiftService empCardGiftService; private EmpCardGiftService empCardGiftService;
@Autowired @Autowired
private EmpCardGiftGoodsService empCardGiftGoodsService; private EmpCardGiftGoodsService empCardGiftGoodsService;
@Autowired
private LpkGoodsService lpkGoodsService;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ResultBean<String> saveBindRecord(BindCardDto dto, String type) { public ResultBean<String> saveBindRecord(BindCardDto dto, String type) {
@@ -83,6 +85,9 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber())); detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
detail.setOrderSid(entity.getSid()); detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime()); detail.setCreateTime(new DateTime());
if (StringUtils.isNotBlank(g.getName())) {
detail.setGoodsName(g.getName());
}
vegeReplenishDetailService.insert(detail); vegeReplenishDetailService.insert(detail);
}); });
} }
@@ -102,6 +107,9 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber())); detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
detail.setOrderSid(entity.getSid()); detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime()); detail.setCreateTime(new DateTime());
if (StringUtils.isNotBlank(g.getName())) {
detail.setGoodsName(g.getName());
}
vegeReplenishDetailService.insert(detail); vegeReplenishDetailService.insert(detail);
}); });
} }
@@ -116,6 +124,10 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
goods.stream().forEach(g -> { goods.stream().forEach(g -> {
VegeReplenishDetail detail = new VegeReplenishDetail(); VegeReplenishDetail detail = new VegeReplenishDetail();
detail.setGoodsSid(g.getGoodsSid()); detail.setGoodsSid(g.getGoodsSid());
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(g.getGoodsSid());
if (null != lpkGoods) {
detail.setGoodsName(lpkGoods.getName());
}
detail.setGoodsNumber(g.getGoodsNumber()); detail.setGoodsNumber(g.getGoodsNumber());
detail.setOrderSid(entity.getSid()); detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime()); detail.setCreateTime(new DateTime());