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

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

@@ -4,6 +4,7 @@ import com.ai.da.mapper.primary.entity.PaymentInfo;
 import com.ai.da.model.vo.OrderListVO;
 import com.ai.da.model.vo.PaymentInfoVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -26,4 +27,6 @@ public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
     List<Map<String, String>> getCities();
 
     List<Map<String, String>> getCountries();
+
+    int insertIgnore(@Param("paymentInfo")PaymentInfo paymentInfo);
 }

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

@@ -2,7 +2,8 @@ package com.ai.da.mapper.primary;
 
 import com.ai.da.mapper.primary.entity.SubscriptionInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 public interface SubscriptionInfoMapper extends BaseMapper<SubscriptionInfo> {
-
+    int insertIgnore(@Param("subscriptionInfo") SubscriptionInfo subscriptionInfo);
 }

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

@@ -41,7 +41,7 @@ public class DesignItemDetailPrint {
     /**
      * 印花缩放比例
      */
-    private Double scale;
+    private String scale;
     /**
      * 印花旋转角度
      */

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

@@ -19,7 +19,7 @@ public class SubscriptionInfo extends BaseEntity{
     // month || year
     private String type;
 
-    // active || expired
+    // active || canceled
     private String status = "active";
 
     private byte cancelNotified = (byte)0;