czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 优惠券返回店铺id

Browse Source
This commit is contained in:
张松
2024-11-09 09:31:30 +08:00
parent 08348159f7
commit 9e95bde5da
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java
View File

@@ -8,6 +8,7 @@ import java.util.Date;
@Data @Data
public class TbUserCouponVo { public class TbUserCouponVo {
private Integer id; private Integer id;
private Integer shopId;
private BigDecimal fullAmount; private BigDecimal fullAmount;
private BigDecimal discountAmount; private BigDecimal discountAmount;
private Integer couponId; private Integer couponId;

3
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1261,7 +1261,8 @@ public class PayService {
log.info("更新购物车:{}", cartCount); log.info("更新购物车:{}", cartCount);
//更新子单状态 //更新子单状态
mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getOrderId, orderInfo.getId()) mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
.eq(TbOrderDetail::getOrderId, orderInfo.getId())
.eq(TbOrderDetail::getUseType, orderInfo.getUseType()) .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
.in(TbOrderDetail::getStatus, "unpaid") .in(TbOrderDetail::getStatus, "unpaid")
.set(TbOrderDetail::getStatus, "closed")); .set(TbOrderDetail::getStatus, "closed"));

2
src/main/resources/mapper/TbActivateInRecordMapper.xml
View File

@@ -38,6 +38,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
<select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo"> <select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
SELECT SELECT
inRecord.shop_id as shopId,
inRecord.id as id, inRecord.id as id,
inRecord.full_amount as fullAmount, inRecord.full_amount as fullAmount,
inRecord.discount_amount as discountAmount, inRecord.discount_amount as discountAmount,
@@ -72,6 +73,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
<select id="queryByVipIdAndShopIdExpire" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo"> <select id="queryByVipIdAndShopIdExpire" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
SELECT SELECT
inRecord.shop_id as shopId,
CASE CASE
WHEN inRecord.type = 1 THEN inRecord.NAME WHEN inRecord.type = 1 THEN inRecord.NAME
WHEN inRecord.type = 2 THEN pro.NAME WHEN inRecord.type = 2 THEN pro.NAME