瀏覽代碼

Merge remote-tracking branch 'origin/master'

yumeng 6 月之前
父節點
當前提交
0ed148e3fa

+ 2 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -2243,7 +2243,7 @@ public class SupplyChainController extends BaseController {
         try {
         try {
             String events = PlatformEventSecurityUtil.decode(eventsEncoded, "xjX0jX828wWrnnwt26UYDA==");
             String events = PlatformEventSecurityUtil.decode(eventsEncoded, "xjX0jX828wWrnnwt26UYDA==");
             JSONObject eventJSon = JSONObject.parseObject(events);
             JSONObject eventJSon = JSONObject.parseObject(events);
-            logger.info("-KWaiShop-订单-消息-订阅-报文内容\n{}", eventJSon);
+            logger.info("-KWaiShop-消息订阅-");
             orderNewsService.submit(new Runnable() {
             orderNewsService.submit(new Runnable() {
                 @Override
                 @Override
                 public void run() {
                 public void run() {
@@ -2262,6 +2262,7 @@ public class SupplyChainController extends BaseController {
                             }
                             }
                         }
                         }
                     } catch (Exception e) {
                     } catch (Exception e) {
+                        logger.error("-KWaiShop-消息报文内容\n{}", eventJSon);
                         e.printStackTrace();
                         e.printStackTrace();
                     }
                     }
                 }
                 }

+ 8 - 4
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java

@@ -1991,10 +1991,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             for (int i = 0; i < result.size(); i++) {
             for (int i = 0; i < result.size(); i++) {
                 JSONObject info = result.getJSONObject(i);
                 JSONObject info = result.getJSONObject(i);
                 //商品活动审核状态:1-待审核,2-审核通过,3-审核拒绝,5-已失效
                 //商品活动审核状态:1-待审核,2-审核通过,3-审核拒绝,5-已失效
-                if (info.getLong("itemAuditStatus") == 1 || info.getLong("itemAuditStatus") == 2) {
-                    KuaiShouActivityOpenItemList activityInfo = new KuaiShouActivityOpenItemList(info);
-                    list.add(activityInfo);
-                }
+//                if (info.getLong("itemAuditStatus") == 1 || info.getLong("itemAuditStatus") == 2) {
+                KuaiShouActivityOpenItemList activityInfo = new KuaiShouActivityOpenItemList(info);
+                list.add(activityInfo);
+//                }
                 //2-审核通过
                 //2-审核通过
                 if (info.getLong("itemAuditStatus") == 2) {
                 if (info.getLong("itemAuditStatus") == 2) {
                     itemIds.add(info.getLong("itemId"));
                     itemIds.add(info.getLong("itemId"));
@@ -2031,6 +2031,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
         }
         }
     }
     }
 
 
+    /**
+     * open.distribution.investment.activity.item.detail
+     * 招商活动商品详情接口
+     */
     private void getActivityItemDetail(KuaishouAccessToken accessToken, String url, Long activityId, List<Long> itemIds, String dbtype) {
     private void getActivityItemDetail(KuaishouAccessToken accessToken, String url, Long activityId, List<Long> itemIds, String dbtype) {
         List<KuaiShouActivityOpenItemList> list = new ArrayList<>();
         List<KuaiShouActivityOpenItemList> list = new ArrayList<>();
         String appKey = accessToken.getAppKey();
         String appKey = accessToken.getAppKey();

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

@@ -3741,7 +3741,8 @@
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
         investment_promotion_rate,
         investment_promotion_rate,
-        shop_id
+        shop_id,
+        ccr_value
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3753,7 +3754,8 @@
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
             #{li.investmentPromotionRate},
             #{li.investmentPromotionRate},
-            #{li.shopId}
+            #{li.shopId},
+            #{li.ccrValue}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3767,7 +3769,8 @@
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
         investment_promotion_rate,
         investment_promotion_rate,
-        shop_id
+        shop_id,
+        ccr_value
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3779,7 +3782,8 @@
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
             #{li.investmentPromotionRate},
             #{li.investmentPromotionRate},
-            #{li.shopId}
+            #{li.shopId},
+            #{li.ccrValue}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3794,7 +3798,8 @@
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
         investment_promotion_rate,
         investment_promotion_rate,
-        shop_id
+        shop_id,
+        ccr_value
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3806,7 +3811,8 @@
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
             #{li.investmentPromotionRate},
             #{li.investmentPromotionRate},
-            #{li.shopId}
+            #{li.shopId},
+            #{li.ccrValue}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3821,7 +3827,8 @@
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
         investment_promotion_rate,
         investment_promotion_rate,
-        shop_id
+        shop_id,
+        ccr_value
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3833,7 +3840,8 @@
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
             #{li.investmentPromotionRate},
             #{li.investmentPromotionRate},
-            #{li.shopId}
+            #{li.shopId},
+            #{li.ccrValue}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3847,7 +3855,8 @@
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
         investment_promotion_rate,
         investment_promotion_rate,
-        shop_id
+        shop_id,
+        ccr_value
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3859,7 +3868,8 @@
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
             #{li.investmentPromotionRate},
             #{li.investmentPromotionRate},
-            #{li.shopId}
+            #{li.shopId},
+            #{li.ccrValue}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -3873,7 +3883,8 @@
         item_leaf_category_id,
         item_leaf_category_id,
         item_commission_rate,
         item_commission_rate,
         investment_promotion_rate,
         investment_promotion_rate,
-        shop_id
+        shop_id,
+        ccr_value
         )
         )
         values
         values
         <foreach collection="list" item="li" separator=",">
         <foreach collection="list" item="li" separator=",">
@@ -3885,7 +3896,8 @@
             #{li.itemLeafCategoryId},
             #{li.itemLeafCategoryId},
             #{li.itemCommissionRate},
             #{li.itemCommissionRate},
             #{li.investmentPromotionRate},
             #{li.investmentPromotionRate},
-            #{li.shopId}
+            #{li.shopId},
+            #{li.ccrValue}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>