Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java

@@ -29,4 +29,6 @@ public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
     List<Map<String, String>> getCountries();
 
     int insertIgnore(@Param("paymentInfo")PaymentInfo paymentInfo);
+
+    List<PaymentInfo> selectPaidPaymentsByAccountAndPromotion(Long accountId, String promotionCode);
 }

src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java

@@ -47,4 +47,6 @@ public class PaymentInfo extends BaseEntity{
     private String country;
 
     private String city;
+
+    private String promotionCode;
 }

src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java

@@ -17,7 +17,7 @@ public class ProductCoupons extends BaseEntity{
     // 对应的推广码
     private String promotionCode;
     // 最大兑换次数
-    private Integer maxRedemptions;
+    private Long maxRedemptions;
     // 优惠券的折扣
     private float percentOff;
     // 佣金比例
@@ -38,11 +38,12 @@ public class ProductCoupons extends BaseEntity{
     public ProductCoupons() {
     }
 
-    public ProductCoupons(String couponId, Long redeemBy, String promotionCodeId, String promotionCode, float percentOff, float commissionRate) {
+    public ProductCoupons(String couponId, Long redeemBy, String promotionCodeId, String promotionCode, Long maxRedemptions, float percentOff, float commissionRate) {
         this.couponId = couponId;
         this.redeemBy = redeemBy;
         this.promotionCodeId = promotionCodeId;
         this.promotionCode = promotionCode;
+        this.maxRedemptions = maxRedemptions;
         this.percentOff = percentOff;
         this.commissionRate = commissionRate;
     }