czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-09-25 14:32:28 +08:00
parent 657eef3b8a f0fabd5d73
commit c9c5e37783
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/market/vo/UserCouponVO.java
View File

@@ -155,7 +155,7 @@ public class UserCouponVO implements Serializable {
*/ */
private String ruleDetails; private String ruleDetails;
private String deductNum; private Integer discountNum;
} }

2
cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
View File

@@ -53,7 +53,7 @@
coupon.discount_share as discountShare, coupon.discount_share as discountShare,
coupon.vip_price_share as vipPriceShare, coupon.vip_price_share as vipPriceShare,
coupon.rule_details as ruleDetails, coupon.rule_details as ruleDetails,
coupon.deduct_num as deductNum coupon.discount_num as discountNum
from mk_shop_coupon_record from mk_shop_coupon_record
left join mk_shop_coupon coupon on mk_shop_coupon_record.coupon_id = coupon.id left join mk_shop_coupon coupon on mk_shop_coupon_record.coupon_id = coupon.id
where mk_shop_coupon_record.shop_user_id in where mk_shop_coupon_record.shop_user_id in