yxt_product
/
yxt-yythmall-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善生成绑卡流水记录

master
fanzongzhe 1 year ago
parent
4921547c04
commit
b6d2055d48
5 changed files with 120 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml
  2. 4
      src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml
  3. 185
      src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml
  4. 5
      src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
  5. 12
      src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java

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

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

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

@ -244,8 +244,8 @@
e.sid as goodsSid,
e.name as goodsName,
d.goodsNumber as goodsNumber,
e.brandId as e.brandId,
e.cetegoryId as cetegoryId
e.brandId as brandId,
e.categoryId as categoryId
FROM
emp_card_gift gi
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
card.sid as sid,
card.state AS state,
CASE
card.state
WHEN 3 THEN '未提货'
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '1'
END logo,
CASE
WHEN card.sid IS NOT NULL THEN '1'
END type,
CASE
WHEN card.sid IS NOT NULL THEN '家庭菜窖'
END pName,
bag.dateStart AS dateStart,
bag.dateEnd AS dateEnd,
card.state AS states,
card.serialNumber AS serialNumber,
card.isItInvalid,
card.bindDate,
card.isTransfer,
card.isEnable,
card.`code`,
card.isReservation
SELECT card.sid as sid,
card.state AS state,
CASE
card.state
WHEN 3 THEN '未提货'
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '1'
END logo,
CASE
WHEN card.sid IS NOT NULL THEN '1'
END type,
CASE
WHEN card.sid IS NOT NULL THEN '家庭菜窖'
END pName,
bag.dateStart AS dateStart,
bag.dateEnd AS dateEnd,
card.state AS states,
card.serialNumber AS serialNumber,
card.isItInvalid,
card.bindDate,
card.isTransfer,
card.isEnable,
card.`code`,
card.isReservation
FROM lpk_giftcard card
LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
WHERE card.customerSid = #{customerSid}
UNION
SELECT
card.sid as sid,
card.state AS state,
CASE card.state
WHEN 3 THEN '未提货'
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '2'
END logo,
CASE
when card.sid IS NOT NULL THEN '2'
END type,
CASE card.isSenior
WHEN 1 THEN '家庭菜窖'
WHEN 2 THEN '亲情菜窖'
END pName,
card.startDate AS dateStart,
card.endDate AS dateEnd,
card.state AS states,
card.serialNumber AS serialNumber,
card.isItInvalid,
card.bindDate,
card.isTransfer,
card.isEnable,
card.`code`,
card.isReservation
SELECT card.sid as sid,
card.state AS state,
CASE card.state
WHEN 3 THEN '未提货'
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '2'
END logo,
CASE
when card.sid IS NOT NULL THEN '2'
END type,
CASE card.isSenior
WHEN 1 THEN '家庭菜窖'
WHEN 2 THEN '亲情菜窖'
END pName,
card.startDate AS dateStart,
card.endDate AS dateEnd,
card.state AS states,
card.serialNumber AS serialNumber,
card.isItInvalid,
card.bindDate,
card.isTransfer,
card.isEnable,
card.`code`,
card.isReservation
FROM emp_card_gift card
LEFT JOIN emp_card emp ON emp.sid = card.empCardSid
LEFT JOIN lpk_giftbag gif ON gif.sid = emp.giftbagSid
WHERE card.customerSid = #{customerSid}
UNION
SELECT
card.sid as sid,
card.state AS state,
CASE
card.state
WHEN 3 THEN '未提货'
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '3'
END logo,
CASE
WHEN card.sid IS NOT NULL THEN '3'
END type,
CASE
WHEN card.sid IS NOT NULL THEN '企业菜窖'
END pName,
bag.dateStart AS dateStart,
bag.dateEnd AS dateEnd,
card.state AS states,
card.serialNumber AS serialNumber,
card.isItInvalid,
card.bindDate,
card.isTransfer,
card.isEnable,
card.`code`,
card.isReservation
SELECT card.sid as sid,
card.state AS state,
CASE
card.state
WHEN 3 THEN '未提货'
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '3'
END logo,
CASE
WHEN card.sid IS NOT NULL THEN '3'
END type,
CASE
WHEN card.sid IS NOT NULL THEN '企业菜窖'
END pName,
bag.dateStart AS dateStart,
bag.dateEnd AS dateEnd,
card.state AS states,
card.serialNumber AS serialNumber,
card.isItInvalid,
card.bindDate,
card.isTransfer,
card.isEnable,
card.`code`,
card.isReservation
FROM emp_card card
LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
WHERE card.customerSid = #{customerSid}
@ -325,16 +322,14 @@
</where>
</select>
<select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
SELECT
e.sid as goodsSid,
e.name as goodsName,
d.goodsNumber as goodsNumber,
e.brandId as e.brandId,
e.cetegoryId as cetegoryId
FROM
lpk_giftcard gi
left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
left join lpk_goods e on e.sid =d.goodsSid
where gi.sid=#{sid}
SELECT e.sid as goodsSid,
e.name as goodsName,
d.goodsNumber as goodsNumber,
e.brandId as brandId,
e.categoryId as categoryId
FROM lpk_giftcard gi
left join lpk_giftbag_goods d on d.giftbagSid = gi.giftbagSid
left join lpk_goods e on e.sid = d.goodsSid
where gi.sid = #{sid}
</select>
</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);
List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
VegetableCellarDto dto = new VegetableCellarDto();
//生成绑卡流水
//加入菜窖
dto.setCustomerSid(dto.getCustomerSid());
dto.setCustomerSid(bindCardDto.getCustomerSid());
dto.setVos(k);
vegetableCellarService.save1Goods(dto);
//生成绑卡流水
vegeReplenishService.saveBindRecord(bindCardDto, "0");
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;
@Autowired
private EmpCardGiftGoodsService empCardGiftGoodsService;
@Autowired
private LpkGoodsService lpkGoodsService;
@Transactional(rollbackFor = Exception.class)
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.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime());
if (StringUtils.isNotBlank(g.getName())) {
detail.setGoodsName(g.getName());
}
vegeReplenishDetailService.insert(detail);
});
}
@ -102,6 +107,9 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber()));
detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime());
if (StringUtils.isNotBlank(g.getName())) {
detail.setGoodsName(g.getName());
}
vegeReplenishDetailService.insert(detail);
});
}
@ -116,6 +124,10 @@ public class VegeReplenishService extends MybatisBaseService<VegeReplenishMapper
goods.stream().forEach(g -> {
VegeReplenishDetail detail = new VegeReplenishDetail();
detail.setGoodsSid(g.getGoodsSid());
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(g.getGoodsSid());
if (null != lpkGoods) {
detail.setGoodsName(lpkGoods.getName());
}
detail.setGoodsNumber(g.getGoodsNumber());
detail.setOrderSid(entity.getSid());
detail.setCreateTime(new DateTime());

Write Preview
Loading…
Cancel
Save