Ver código fonte

Merge remote-tracking branch 'origin/master'

yumeng 11 meses atrás
pai
commit
78630f765d

+ 11 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaiShouActivityOpenItemList.java

@@ -71,6 +71,15 @@ public class KuaiShouActivityOpenItemList {
      */
      */
     private Long ccrValue;
     private Long ccrValue;
     /**
     /**
+     * 店铺ID
+     */
+    private Long shopId;
+
+    /**
+     * 	店铺名称
+     */
+    private String shopTitle;
+    /**
      * 新版店铺体验分
      * 新版店铺体验分
      */
      */
     private String storeScore;
     private String storeScore;
@@ -103,6 +112,8 @@ public class KuaiShouActivityOpenItemList {
         this.setBaseOrderStatus(info.getString("baseOrderStatus"));
         this.setBaseOrderStatus(info.getString("baseOrderStatus"));
         this.setCcrValue(info.getLong("ccrValue"));
         this.setCcrValue(info.getLong("ccrValue"));
         this.setStoreScore(info.getString("storeScore"));
         this.setStoreScore(info.getString("storeScore"));
+        this.setShopTitle(info.getString("shopTitle"));
+        this.setShopId(info.getLong("shopId"));
     }
     }
 
 
 }
 }

+ 30 - 12
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -3740,7 +3740,8 @@
         pre_activity_id,
         pre_activity_id,
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
-        investment_promotion_rate
+        investment_promotion_rate,
+        shop_id
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3751,7 +3752,8 @@
             #{li.preActivityId},
             #{li.preActivityId},
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
-            #{li.investmentPromotionRate}
+            #{li.investmentPromotionRate},
+            #{li.shopId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3764,7 +3766,8 @@
         pre_activity_id,
         pre_activity_id,
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
-        investment_promotion_rate
+        investment_promotion_rate,
+        shop_id
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3775,7 +3778,8 @@
             #{li.preActivityId},
             #{li.preActivityId},
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
-            #{li.investmentPromotionRate}
+            #{li.investmentPromotionRate},
+            #{li.shopId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3789,7 +3793,8 @@
         pre_activity_id,
         pre_activity_id,
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
-        investment_promotion_rate
+        investment_promotion_rate,
+        shop_id
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3800,7 +3805,8 @@
             #{li.preActivityId},
             #{li.preActivityId},
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
-            #{li.investmentPromotionRate}
+            #{li.investmentPromotionRate},
+            #{li.shopId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3814,7 +3820,8 @@
         pre_activity_id,
         pre_activity_id,
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
-        investment_promotion_rate
+        investment_promotion_rate,
+        shop_id
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3825,7 +3832,8 @@
             #{li.preActivityId},
             #{li.preActivityId},
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
-            #{li.investmentPromotionRate}
+            #{li.investmentPromotionRate},
+            #{li.shopId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3838,7 +3846,8 @@
         pre_activity_id,
         pre_activity_id,
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
-        investment_promotion_rate
+        investment_promotion_rate,
+        shop_id
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3849,7 +3858,8 @@
             #{li.preActivityId},
             #{li.preActivityId},
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
-            #{li.investmentPromotionRate}
+            #{li.investmentPromotionRate},
+            #{li.shopId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3862,7 +3872,8 @@
         pre_activity_id,
         pre_activity_id,
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
-        investment_promotion_rate
+        investment_promotion_rate,
+        shop_id
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3873,7 +3884,8 @@
             #{li.preActivityId},
             #{li.preActivityId},
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
-            #{li.investmentPromotionRate}
+            #{li.investmentPromotionRate},
+            #{li.shopId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -4078,6 +4090,7 @@
             mall_quality_score   = #{mallQualityScore},
             mall_quality_score   = #{mallQualityScore},
             base_order_status    = #{baseOrderStatus},
             base_order_status    = #{baseOrderStatus},
             ccr_value            = #{ccrValue},
             ccr_value            = #{ccrValue},
+            shop_title           = #{shopTitle},
             store_score          = #{storeScore}
             store_score          = #{storeScore}
         where item_id = #{itemId}
         where item_id = #{itemId}
     </update>
     </update>
@@ -4091,6 +4104,7 @@
             mall_quality_score   = #{mallQualityScore},
             mall_quality_score   = #{mallQualityScore},
             base_order_status    = #{baseOrderStatus},
             base_order_status    = #{baseOrderStatus},
             ccr_value            = #{ccrValue},
             ccr_value            = #{ccrValue},
+            shop_title           = #{shopTitle},
             store_score          = #{storeScore}
             store_score          = #{storeScore}
         where item_id = #{itemId}
         where item_id = #{itemId}
     </update>
     </update>
@@ -4104,6 +4118,7 @@
             mall_quality_score   = #{mallQualityScore},
             mall_quality_score   = #{mallQualityScore},
             base_order_status    = #{baseOrderStatus},
             base_order_status    = #{baseOrderStatus},
             ccr_value            = #{ccrValue},
             ccr_value            = #{ccrValue},
+            shop_title           = #{shopTitle},
             store_score          = #{storeScore}
             store_score          = #{storeScore}
         where item_id = #{itemId}
         where item_id = #{itemId}
     </update>
     </update>
@@ -4117,6 +4132,7 @@
             mall_quality_score   = #{mallQualityScore},
             mall_quality_score   = #{mallQualityScore},
             base_order_status    = #{baseOrderStatus},
             base_order_status    = #{baseOrderStatus},
             ccr_value            = #{ccrValue},
             ccr_value            = #{ccrValue},
+            shop_title           = #{shopTitle},
             store_score          = #{storeScore}
             store_score          = #{storeScore}
         where item_id = #{itemId}
         where item_id = #{itemId}
     </update>
     </update>
@@ -4130,6 +4146,7 @@
             mall_quality_score   = #{mallQualityScore},
             mall_quality_score   = #{mallQualityScore},
             base_order_status    = #{baseOrderStatus},
             base_order_status    = #{baseOrderStatus},
             ccr_value            = #{ccrValue},
             ccr_value            = #{ccrValue},
+            shop_title           = #{shopTitle},
             store_score          = #{storeScore}
             store_score          = #{storeScore}
         where item_id = #{itemId}
         where item_id = #{itemId}
     </update>
     </update>
@@ -4142,6 +4159,7 @@
             mall_quality_score   = #{mallQualityScore},
             mall_quality_score   = #{mallQualityScore},
             base_order_status    = #{baseOrderStatus},
             base_order_status    = #{baseOrderStatus},
             ccr_value            = #{ccrValue},
             ccr_value            = #{ccrValue},
+            shop_title           = #{shopTitle},
             store_score          = #{storeScore}
             store_score          = #{storeScore}
         where item_id = #{itemId}
         where item_id = #{itemId}
     </update>
     </update>