Merge branch 'dev/dev_xp' into dev/dev

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

@@ -14,6 +14,8 @@ public class Affiliate extends BaseEntity{
     // Active（活跃） || Inactive（过期） || Pending（待审批） || Refused(拒绝)
     private String status;
 
+    private Float commissionPercent;
+
     private Float totalEarnings = 0.00F;
 
     private Float monthlyEarnings = 0.00F;

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

@@ -22,6 +22,8 @@ public class PaymentInfo extends BaseEntity{
      *  paid and liquidated means the refund request has been executed.
      *  expired means the request has been rejected.
      *  wait means the request is still under processing.
+     * -------------------------------------------------
+     *  退款：Partial refund 部分退款; Refunded 全部退款
      */
     private String tradeState;//交易状态
 

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

@@ -1,5 +1,7 @@
 package com.ai.da.mapper.primary.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,6 +39,9 @@ public class ProductCoupons extends BaseEntity{
     // 备注
     private String remark;
 
+    @TableLogic
+    private Integer isDeleted;
+
     public ProductCoupons(String couponId, Long redeemBy, String promotionCodeId, String promotionCode, Long maxRedemptions, float percentOff, float commissionRate, String cooperator, String remark) {
         this.couponId = couponId;
         this.redeemBy = redeemBy;

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

@@ -13,11 +13,14 @@ public class RefundInfo extends BaseEntity{
 
     private String refundId;//支付系统退款单号(微信)
 
+    // 退款必定对应一次具体的收费款项
+    private String chargeId;
+
 //    private Integer totalFee;//原订单金额(分)
     private Float totalFee;//原订单金额(分)
 
 //    private Integer refund;//退款金额(分)
-    private Float refund;//退款金额(分)
+    private Float refund;//退款金额(元)
 
     private String reason;//退款原因