diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java index ee2c289..f7d97ac 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java @@ -8,6 +8,7 @@ import java.util.Date; @Data public class TbUserCouponVo { private Integer id; + private Integer shopId; private BigDecimal fullAmount; private BigDecimal discountAmount; private Integer couponId; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 2158e13..3bcf84b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1261,7 +1261,8 @@ public class PayService { log.info("更新购物车:{}", cartCount); //更新子单状态 - mpOrderDetailMapper.update(null, new LambdaUpdateWrapper().eq(TbOrderDetail::getOrderId, orderInfo.getId()) + mpOrderDetailMapper.update(null, new LambdaUpdateWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) .in(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed")); diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index c5eafbf..67fd5c0 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -38,6 +38,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu SELECT + inRecord.shop_id as shopId, CASE WHEN inRecord.type = 1 THEN inRecord.NAME WHEN inRecord.type = 2 THEN pro.NAME