cos地址修改

mp-admin/src/main/resources/application-8100.yml

@@ -116,9 +116,9 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: ygp-public-1307117429
+  public-bucket-name: mp-public-1307117429
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: ygp-auth-1307117429
+  private-bucket-name: mp-auth-1307117429
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-8200.yml

@@ -116,9 +116,9 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: ygp-public-1307117429
+  public-bucket-name: mp-public-1307117429
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: ygp-auth-1307117429
+  private-bucket-name: mp-auth-1307117429
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-dev.yml

@@ -109,9 +109,9 @@ client:
 # cloud
 cloud:
     # 存储对象公开可访问
-    public-bucket-name: ygp-public-test-1307117429
+    public-bucket-name: mp-public-test-1307117429
     # 存储对象公开不可访问，需要通过应用下载
-    private-bucket-name: ygp-auth-test-1307117429
+    private-bucket-name: mp-auth-test-1307117429
 
 # 小程序
 miniprogram:

mp-admin/src/main/resources/application-test.yml

@@ -114,9 +114,9 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: ygp-public-test-1307117429
+  public-bucket-name: mp-public-test-1307117429
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: ygp-auth-test-1307117429
+  private-bucket-name: mp-auth-test-1307117429
 
 # 小程序
 miniprogram:

mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwards.java

@@ -22,7 +22,7 @@ public class TicketAwards implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "awards_id" , type = IdType.INPUT)
+  @TableId(value = "awards_id" , type = IdType.AUTO)
   private String awardsId;
 
   /**

mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwardsPrize.java

@@ -22,8 +22,8 @@ public class TicketAwardsPrize implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "id" , type = IdType.AUTO)
-  private Long id;
+  @TableId(value = "prize_id" , type = IdType.INPUT)
+  private String prizeId;
 
   /**
    * 奖项ID
@@ -32,16 +32,16 @@ public class TicketAwardsPrize implements Serializable {
   private String awardsId;
 
   /**
-   * 奖品ID（GOODS_ID或TEMPL_ID)
+   * 奖品ID（GOODS_ID或COUPON_ID)
    */
-  @TableField("prize_id")
-  private String prizeId;
+  @TableField("ref_id")
+  private String refId;
 
   /**
-   * 奖品类型（GOODS或VOUCHER或COIN）
+   * 奖品类型（GOODS或COUPON或COIN）
    */
-  @TableField("prize_type")
-  private String prizeType;
+  @TableField("ref_type")
+  private String refType;
 
   /**
    * 奖品数

mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketAwardsPrize">
-        <id column="id" property="id" />
+        <id column="prize_id" property="prizeId" />
         <result column="awards_id" property="awardsId" />
-        <result column="prize_id" property="prizeId" />
-        <result column="prize_type" property="prizeType" />
+        <result column="ref_id" property="refId" />
+        <result column="prize_type" property="refType" />
         <result column="quantity" property="quantity" />
         <result column="cashed_qty" property="cashedQty" />
         <result column="created_time" property="createdTime" />
@@ -16,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, awards_id, prize_id, prize_type, quantity, cashed_qty, created_time, updated_time
+        prize_id, awards_id, ref_id, ref_type, quantity, cashed_qty, created_time, updated_time
     </sql>
 
 </mapper>