yumeng 9 months ago
parent
commit
1e95364ad8

+ 6 - 0
ruixuan-admin/pom.xml

@@ -176,5 +176,11 @@
                 <activatedProperties>yufu</activatedProperties>
             </properties>
         </profile>
+        <profile>
+            <id>yuxiu</id>
+            <properties>
+                <activatedProperties>yuxiu</activatedProperties>
+            </properties>
+        </profile>
     </profiles>
 </project>

+ 1 - 0
ruixuan-admin/src/main/resources/application-dev.yml

@@ -230,6 +230,7 @@ accept:
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
+  yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
 
 ownership:
   id: ruixuan

+ 1 - 0
ruixuan-admin/src/main/resources/application-mgs.yml

@@ -216,6 +216,7 @@ accept:
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
+  yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
 
 ownership:
   id: miaogousi

+ 1 - 0
ruixuan-admin/src/main/resources/application-prod.yml

@@ -216,6 +216,7 @@ accept:
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
+  yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
 
 ownership:
   id: ruixuan

+ 1 - 0
ruixuan-admin/src/main/resources/application-rocket.yml

@@ -216,6 +216,7 @@ accept:
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
+  yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
 
 ownership:
   id: rocket

+ 1 - 0
ruixuan-admin/src/main/resources/application-yufu.yml

@@ -216,6 +216,7 @@ accept:
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
+  yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
 
 ownership:
   id: yufu

File diff suppressed because it is too large
+ 222 - 0
ruixuan-admin/src/main/resources/application-yuxiu.yml


+ 39 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -66,6 +66,9 @@ public class SupplyChainController extends BaseController {
     @Value("${accept.yufuPrivateKey}")
     private String yufuPrivateKey;
 
+    @Value("${accept.yuXiuPrivateKey}")
+    private String yuXiuPrivateKey;
+
 
     @Value("${ownership.id}")
     private String ownershipId;
@@ -2347,6 +2350,42 @@ public class SupplyChainController extends BaseController {
     }
 
 
+
+    @PostMapping(value = "/yuXiuAccept")
+    public Map<String, Object> yuXiuAccept(@RequestBody String eventsEncoded) {
+        try {
+            logger.info("毓秀优选消息订阅");
+            String events = PlatformEventSecurityUtil.decode(eventsEncoded, yuXiuPrivateKey);
+            JSONObject eventJSon = JSONObject.parseObject(events);
+            logger.info("毓秀优选返回信息:{}", eventJSon);
+            fxNowService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        if (!Check.isNull(eventJSon)) {
+                            String event = eventJSon.getString("event");
+                            if ("kwaishop_distribute_order_change_notify".equals(event)) {
+                                supplyChainService.updateOrder(eventJSon);
+                            } else if ("kwaishop_distribute_activity_item_change".equals(event)) {
+                                supplyChainService.updateItem(eventJSon);
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        } catch (KsMerchantApiException e) {
+            e.printStackTrace();
+        }
+        //返回成功
+        Map<String, Object> result = new HashMap<>();
+        result.put("result", 1);
+        return result;
+
+    }
+
+
     @GetMapping("/addListKuaishouActivityInfo")
     @ApiOperation(value = "团长查询招商活动列表")
     public void addListKuaishouActivityInfo() {

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemListMapper.java

@@ -94,5 +94,7 @@ public interface KuaishouItemListMapper {
     void batchRocketCategory(@Param("adds") List<KuaishouItemCategory> adds);
 
     void batchYufuCategory(@Param("adds") List<KuaishouItemCategory> adds);
+
+    void insertYuXiuItem(KuaishouItemList kuaishouItemList);
 }
 

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/SupplyChainMapper.java

@@ -240,4 +240,8 @@ public interface SupplyChainMapper {
     List<JSONObject> getBytedanceChannelGmvHourByDateRoi(@Param("userList") List<Long> userList, @Param("date") Long date);
 
     List<JSONObject> getBytedanceCourtshipGmvHourByDateRoi(@Param("userList") List<Long> userList, @Param("date") Long date);
+
+    int updateYuXiuOrder(@Param("oid") Long oid, @Param("cpsOrderStatus") Integer cpsOrderStatus);
+
+    int updateYuXiuOrderRegimentalSettleAmount(@Param("oid") Long oid, @Param("cpsOrderStatus") Integer cpsOrderStatus);
 }

+ 5 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -236,6 +236,11 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         if (targetOwnershipId.equals("yufu")) {
             kuaishouItemListMapper.insertYufuItem(kuaishouItemList);
         }
+        if (targetOwnershipId.equals("yuxiu")) {
+            kuaishouItemListMapper.insertYuXiuItem(kuaishouItemList);
+        }
+
+
         JSONObject mongoVo = new JSONObject();
         mongoVo.put("_id", kuaishouItemList.getItemId());
         mongoVo.put("ownership", targetOwnershipId);

+ 84 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java

@@ -454,6 +454,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrder(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
         }
         if ("miaogousi".equals(ownershipId)) {
             int mgs = supplyChainMapper.updateMgsOrder(oid, cpsOrderStatus);
@@ -472,6 +476,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrder(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
         }
         if ("rocket".equals(ownershipId)) {
             int rocket = supplyChainMapper.updateRocketOrder(oid, cpsOrderStatus);
@@ -490,12 +498,40 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrder(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
         }
         if ("yufu".equals(ownershipId)) {
+            int yufu = supplyChainMapper.updateYufuOrder(oid, cpsOrderStatus);
+            if (yufu > 0) {
+                return yufu;
+            }
+            int ruixuan = supplyChainMapper.updateRuixuanOrder(oid, cpsOrderStatus);
+            if (ruixuan > 0) {
+                return ruixuan;
+            }
+            int mgs = supplyChainMapper.updateMgsOrder(oid, cpsOrderStatus);
+            if (mgs > 0) {
+                return mgs;
+            }
             int rocket = supplyChainMapper.updateRocketOrder(oid, cpsOrderStatus);
             if (rocket > 0) {
                 return rocket;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrder(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
+        }
+
+        if ("yuxiu".equals(ownershipId)) {
+
+            int yuxiu = supplyChainMapper.updateYuXiuOrder(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
             int ruixuan = supplyChainMapper.updateRuixuanOrder(oid, cpsOrderStatus);
             if (ruixuan > 0) {
                 return ruixuan;
@@ -508,7 +544,13 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int rocket = supplyChainMapper.updateRocketOrder(oid, cpsOrderStatus);
+            if (rocket > 0) {
+                return rocket;
+            }
+
         }
+
         return 0;
     }
 
@@ -531,6 +573,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
         }
 
         if ("miaogousi".equals(ownershipId)) {
@@ -550,6 +596,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
         }
         if ("rocket".equals(ownershipId)) {
             int rocket = supplyChainMapper.updateRocketOrderRegimentalSettleAmount(oid, cpsOrderStatus);
@@ -568,6 +618,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
         }
 
         if ("yufu".equals(ownershipId)) {
@@ -587,7 +641,37 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int yuxiu = supplyChainMapper.updateYuXiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
+        }
+
+        if ("yuxiu".equals(ownershipId)) {
+
+            int yuxiu = supplyChainMapper.updateYuXiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
+            int ruixuan = supplyChainMapper.updateRuiXuanOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (ruixuan > 0) {
+                return ruixuan;
+            }
+            int mgs = supplyChainMapper.updateMgsOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (mgs > 0) {
+                return mgs;
+            }
+            int rocket = supplyChainMapper.updateRocketOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (rocket > 0) {
+                return rocket;
+            }
+            int yufu = supplyChainMapper.updateYufuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yufu > 0) {
+                return yufu;
+            }
         }
+
+
         return 0;
     }
 

+ 95 - 0
ruixuan-live/src/main/resources/mapper/isc/JiaoYangCallbackMapper.xml

@@ -861,6 +861,101 @@
             )
         </foreach>
     </insert>
+    <insert id="insertYuXiuItem" parameterType="com.ruixuan.isc.entity.KuaishouItemList">
+        insert into yuxiu.kuaishou_item_list
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="itemId != null">item_id,</if>
+            <if test="mediaId != null">media_id,</if>
+            <if test="itemTitle != null">item_title,</if>
+            <if test="itemPrice != null">item_price,</if>
+            <if test="itemDesc != null">item_desc,</if>
+            <if test="zkFinalPrice != null">zk_final_price,</if>
+            <if test="itemImgUrl != null">item_img_url,</if>
+            <if test="itemDescUrls != null">item_desc_urls,</if>
+            <if test="shopStar != null">shop_star,</if>
+            <if test="mallLogisticsScore != null">mall_logistics_score,</if>
+            <if test="activityItemStatus != null">activity_item_status,</if>
+            <if test="shopScore != null">shop_score,</if>
+            <if test="categoryId != null">category_id,</if>
+            <if test="categoryName != null">category_name,</if>
+            <if test="itemGalleryUrls != null">item_gallery_urls,</if>
+            <if test="identity != null">identity,</if>
+            <if test="activityId != null">activity_id,</if>
+            <if test="shopTitle != null">shop_title,</if>
+            <if test="commissionRate != null">commission_rate,</if>
+            <if test="mallServiceScore != null">mall_service_score,</if>
+            <if test="mallQualityScore != null">mall_quality_score,</if>
+            <if test="skuList != null">sku_list,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="examineId != null">examine_id,</if>
+            <if test="examineName != null">examine_name,</if>
+            <if test="examineStatus != null">examine_status,</if>
+            <if test="refuseDetail != null">refuse_detail,</if>
+            <if test="postArea != null">post_area,</if>
+            <if test="noPostArea != null">no_post_area,</if>
+            <if test="regimentalPromotionRate != null">regimental_promotion_rate,</if>
+            <if test="regimentalPromotion != null">regimental_promotion,</if>
+            <if test="sampleCount != null">sample_count,</if>
+            <if test="sampleRequirement != null">sample_requirement,</if>
+            <if test="deliveryRate != null">delivery_rate,</if>
+            <if test="partnerRecommendText != null">partner_recommend_text,</if>
+            <if test="detailUrl != null">detail_url,</if>
+            <if test="samplesReceived != null">samples_received,</if>
+            <if test="samplesPeoples != null">samples_peoples,</if>
+            <if test="relateId != null">relate_id,</if>
+            <if test="ruleId != null">rule_id,</if>
+            <if test="isPresale != null">is_presale,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="itemId != null">#{itemId},</if>
+            <if test="mediaId != null">#{mediaId},</if>
+            <if test="itemTitle != null">#{itemTitle},</if>
+            <if test="itemPrice != null">#{itemPrice},</if>
+            <if test="itemDesc != null">#{itemDesc},</if>
+            <if test="zkFinalPrice != null">#{zkFinalPrice},</if>
+            <if test="itemImgUrl != null">#{itemImgUrl},</if>
+            <if test="itemDescUrls != null">#{itemDescUrls},</if>
+            <if test="shopStar != null">#{shopStar},</if>
+            <if test="mallLogisticsScore != null">#{mallLogisticsScore},</if>
+            <if test="activityItemStatus != null">#{activityItemStatus},</if>
+            <if test="shopScore != null">#{shopScore},</if>
+            <if test="categoryId != null">#{categoryId},</if>
+            <if test="categoryName != null">#{categoryName},</if>
+            <if test="itemGalleryUrls != null">#{itemGalleryUrls},</if>
+            <if test="identity != null">#{identity},</if>
+            <if test="activityId != null">#{activityId},</if>
+            <if test="shopTitle != null">#{shopTitle},</if>
+            <if test="commissionRate != null">#{commissionRate},</if>
+            <if test="mallServiceScore != null">#{mallServiceScore},</if>
+            <if test="mallQualityScore != null">#{mallQualityScore},</if>
+            <if test="skuList != null">#{skuList},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="examineId != null">#{examineId},</if>
+            <if test="examineName != null">#{examineName},</if>
+            <if test="examineStatus != null">#{examineStatus},</if>
+            <if test="refuseDetail != null">#{refuseDetail},</if>
+            <if test="postArea != null">#{postArea},</if>
+            <if test="noPostArea != null">#{noPostArea},</if>
+            <if test="regimentalPromotionRate != null">#{regimentalPromotionRate},</if>
+            <if test="regimentalPromotion != null">#{regimentalPromotion},</if>
+            <if test="sampleCount != null">#{sampleCount},</if>
+            <if test="sampleRequirement != null">#{sampleRequirement},</if>
+            <if test="deliveryRate != null">#{deliveryRate},</if>
+            <if test="partnerRecommendText != null">#{partnerRecommendText},</if>
+            <if test="detailUrl != null">#{detailUrl},</if>
+            <if test="samplesReceived != null">#{samplesReceived},</if>
+            <if test="samplesPeoples != null">#{samplesPeoples},</if>
+            <if test="relateId != null">#{relateId},</if>
+            <if test="ruleId != null">#{ruleId},</if>
+            <if test="isPresale != null">#{isPresale},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
 
 
     <update id="updateKuaishouItemList" parameterType="com.ruixuan.isc.entity.KuaishouItemList">

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

@@ -3788,5 +3788,17 @@
             store_score          = #{storeScore}
         where item_id = #{itemId}
     </update>
+    <update id="updateYuXiuOrder">
+        UPDATE yuxiu.kuaishou_supply_chain
+        SET order_status = #{cpsOrderStatus}
+        WHERE oid = #{oid}
+    </update>
+    <update id="updateYuXiuOrderRegimentalSettleAmount">
+        UPDATE yuxiu.kuaishou_supply_chain
+        SET order_status                   = #{cpsOrderStatus},
+            total_regimental_settle_amount = regimental_promotion_amount
+        WHERE oid = #{oid}
+
+    </update>
 
 </mapper>