推客分佣单入库

yanxuan-wx-store-sharer-biz/src/main/java/com/netease/yanxuan/wx/store/sharer/biz/service/impl/CommissionOrderServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.netease.yanxuan.wx.store.sharer.biz.service.ICommissionOrderService;
 import com.netease.yanxuan.wx.store.sharer.dal.mapper.*;
 import com.netease.yanxuan.wx.store.sharer.dal.meta.model.po.*;
-import com.netease.yanxuan.wx.store.sharer.integration.config.WeChatConfig;
 import com.netease.yanxuan.wx.store.sharer.integration.handler.impl.WeChatCommissionOrderDetailRequest;
 import com.netease.yanxuan.wx.store.sharer.integration.handler.impl.WeChatCommissionOrderListRequest;
 import com.netease.yanxuan.wx.store.sharer.integration.meta.model.vo.WeChatCommissionOrderDetailVO;
@@ -43,7 +42,6 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
     private final SharerOrderCommissionFinderMapper sharerOrderCommissionFinderMapper;
     private final SharerOrderCommissionTalentMapper sharerOrderCommissionTalentMapper;
     private final SharerOrderBuyerMapper sharerOrderBuyerMapper;
-    private final WeChatConfig weChatConfig;
     private final WeChatCommissionOrderListRequest weChatCommissionOrderListRequest;
     private final WeChatCommissionOrderDetailRequest weChatCommissionOrderDetailRequest;
 
@@ -61,7 +59,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
         orderLqw.last("LIMIT 1");
         SharerOrder sharerOrder = sharerOrderMapper.selectOne(orderLqw);
         long maxTimeStamp = 0L;
-        if(null != sharerOrder && null != sharerOrder.getOrderCreateTime()){
+        if (null != sharerOrder && null != sharerOrder.getOrderCreateTime()) {
             maxTimeStamp = Math.max(maxTimeStamp, sharerOrder.getOrderCreateTime().getTime() / 1000);
         }
         return maxTimeStamp;
@@ -71,10 +69,9 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
     public void doCommissionOrderSync(Long startTime, Long endTime) {
         WeChatCommissionOrderListVO listVO;
         String nextKey = null;
-        while (true){
-            listVO = weChatCommissionOrderListRequest.handle(weChatConfig.getShopAppid(),
-                    startTime, endTime, nextKey, COMMISSION_ORDER_SYNC_PAGE_SIZE);
-            if(null == listVO || CollectionUtils.isEmpty(listVO.getList())){
+        while (true) {
+            listVO = weChatCommissionOrderListRequest.handle(startTime, endTime, nextKey, COMMISSION_ORDER_SYNC_PAGE_SIZE);
+            if (null == listVO || CollectionUtils.isEmpty(listVO.getList())) {
                 return;
             }
             nextKey = listVO.getNext_key();
@@ -103,7 +100,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
                 orderLqw.eq(SharerOrder::getOrderId, fail.getOrderId());
                 orderLqw.eq(SharerOrder::getSkuId, fail.getSkuId());
                 Long count = sharerOrderMapper.selectCount(orderLqw);
-                if(null != count && count > 0){
+                if (null != count && count > 0) {
                     // 已经同步，溢出失败记录
                     sharerOrderSyncFailMapper.deleteById(fail.getId());
                     continue;
@@ -128,7 +125,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
             return;
         }
         try {
-            if(null == detailVO){
+            if (null == detailVO) {
                 log.info("[op:doSyncCommissionOrder] 推客分佣单不存在");
                 return;
             }
@@ -151,7 +148,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
             failLqw.last("LIMIT 1");
             SharerOrderSyncFail sharerOrderSyncFail = sharerOrderSyncFailMapper.selectOne(failLqw);
             Date date = new Date();
-            if(null == sharerOrderSyncFail){
+            if (null == sharerOrderSyncFail) {
                 sharerOrderSyncFail = new SharerOrderSyncFail();
                 sharerOrderSyncFail.setOrderId(orderId);
                 sharerOrderSyncFail.setSkuId(skuId);
@@ -160,7 +157,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
                 sharerOrderSyncFail.setCreateTime(date);
                 sharerOrderSyncFail.setUpdateTime(date);
                 sharerOrderSyncFailMapper.insert(sharerOrderSyncFail);
-            }else{
+            } else {
                 LambdaUpdateWrapper<SharerOrderSyncFail> failLuw = Wrappers.lambdaUpdate();
                 failLuw.setSql("retry_count = retry_count + 1");
                 failLuw.set(SharerOrderSyncFail::getFailMsg, failMsg);
@@ -176,8 +173,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
     /**
      * 保存分佣单
      */
-    private void doSaveCommissionOrder(WeChatCommissionOrderDetailVO detailVO){
-        if(null == detailVO){
+    private void doSaveCommissionOrder(WeChatCommissionOrderDetailVO detailVO) {
+        if (null == detailVO) {
             return;
         }
         SharerOrder sharerOrder = new SharerOrder();
@@ -187,7 +184,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
         String orderStatus = null;
         try {
             orderStatus = String.valueOf(detailVO.getOrder_detail().getOrder_info().getStatus());
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("[op:doSaveCommissionOrder] 分佣单状态转换异常", e);
         }
         sharerOrder.setOrderStatus(orderStatus);
@@ -196,7 +193,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
         sharerOrder.setCreateTime(new Date());
         sharerOrderMapper.insert(sharerOrder);
         WeChatCommissionOrderDetailVO.OrderDetailVO orderDetail = detailVO.getOrder_detail();
-        if(null == orderDetail){
+        if (null == orderDetail) {
             log.info("[op:doSaveCommissionOrder] orderDetail is null");
             return;
         }
@@ -212,9 +209,9 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 商品信息
      */
     private void doSaveCommissionOrderProduct(WeChatCommissionOrderDetailVO.OrderDetailVO detailVO,
-                                              Long sharerOrderId){
+                                              Long sharerOrderId) {
         WeChatCommissionOrderDetailVO.ProductInfoVO productInfo = detailVO.getProduct_info();
-        if(null == productInfo){
+        if (null == productInfo) {
             log.info("[op:doSaveCommissionOrderProduct] productInfo is null");
             return;
         }
@@ -232,8 +229,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 分佣信息
      */
     private void doSaveCommissionOrderCommission(WeChatCommissionOrderDetailVO.CommissionInfoVO commissionInfo,
-                                                Long sharerOrderId){
-        if(null == commissionInfo){
+                                                 Long sharerOrderId) {
+        if (null == commissionInfo) {
             log.info("[op:doSaveCommissionOrderCommission] commissionInfo is null");
             return;
         }
@@ -261,8 +258,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 分佣推客
      */
     private void doSaveCommissionOrderCommissionSharer(WeChatCommissionOrderDetailVO.SharerInfoVO sharerInfo,
-                                                      Long sharerOrderId, Long sharerOrderCommissionId){
-        if(null == sharerInfo){
+                                                       Long sharerOrderId, Long sharerOrderCommissionId) {
+        if (null == sharerInfo) {
             log.info("[op:doSaveCommissionOrderCommissionSharer] sharerInfo is null");
             return;
         }
@@ -281,8 +278,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 分佣带货机构
      */
     private void doSaveCommissionOrderCommissionSubAgency(WeChatCommissionOrderDetailVO.AgencyInfoVO agencyInfo,
-                                                         Long sharerOrderId, Long sharerOrderCommissionId){
-        if(null == agencyInfo){
+                                                          Long sharerOrderId, Long sharerOrderCommissionId) {
+        if (null == agencyInfo) {
             log.info("[op:doSaveCommissionOrderCommissionSubAgency] agencyInfo is null");
             return;
         }
@@ -301,8 +298,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 分佣推客机构
      */
     private void doSaveCommissionOrderCommissionPromoterAgency(WeChatCommissionOrderDetailVO.AgencyInfoVO agencyInfo,
-                                                              Long sharerOrderId, Long sharerOrderCommissionId){
-        if(null == agencyInfo){
+                                                               Long sharerOrderId, Long sharerOrderCommissionId) {
+        if (null == agencyInfo) {
             log.info("[op:doSaveCommissionOrderCommissionPromoterAgency] agencyInfo is null");
             return;
         }
@@ -321,8 +318,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 分佣视频号达人信息
      */
     private void doSaveCommissionOrderCommissionFinder(WeChatCommissionOrderDetailVO.FinderInfoVO finderInfo,
-                                                      Long sharerOrderId, Long sharerOrderCommissionId){
-        if(null == finderInfo){
+                                                       Long sharerOrderId, Long sharerOrderCommissionId) {
+        if (null == finderInfo) {
             log.info("[op:doSaveCommissionOrderCommissionFinder] finderInfo is null");
             return;
         }
@@ -340,8 +337,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 分佣新带货达人信息
      */
     private void doSaveCommissionOrderCommissionTalent(WeChatCommissionOrderDetailVO.TalentInfoVO talentInfo,
-                                                      Long sharerOrderId, Long sharerOrderCommissionId){
-        if(null == talentInfo){
+                                                       Long sharerOrderId, Long sharerOrderCommissionId) {
+        if (null == talentInfo) {
             log.info("[op:doSaveCommissionOrderCommissionTalent] talentInfo is null");
             return;
         }
@@ -360,8 +357,8 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
      * 买家信息
      */
     private void doSaveCommissionOrderBuyer(WeChatCommissionOrderDetailVO.BuyerInfoVO buyerInfo,
-                                            Long sharerOrderId){
-        if(null == buyerInfo){
+                                            Long sharerOrderId) {
+        if (null == buyerInfo) {
             log.info("[op:doSaveCommissionOrderBuyer] buyerInfo is null");
             return;
         }
@@ -372,7 +369,7 @@ public class CommissionOrderServiceImpl implements ICommissionOrderService {
         sharerOrderBuyerMapper.insert(buyerInfoPO);
     }
 
-    private Date getDate(Long wechatTime){
+    private Date getDate(Long wechatTime) {
         return new Date(wechatTime * 1000);
     }
 }

yanxuan-wx-store-sharer-integration/src/main/java/com/netease/yanxuan/wx/store/sharer/integration/handler/impl/WeChatCommissionOrderListRequest.java

@@ -43,9 +43,8 @@ public class WeChatCommissionOrderListRequest implements IWeChatRequest {
     /**
      * 处理
      */
-    public WeChatCommissionOrderListVO handle(String shopAppid, Long startTime, Long endTime, String nextKey, Integer pageSize) {
+    public WeChatCommissionOrderListVO handle(Long startTime, Long endTime, String nextKey, Integer pageSize) {
         WeChatCommissionOrderListBO params = WeChatCommissionOrderListBO.builder()
-                .appid(shopAppid)
                 .create_time_range(WeChatTimeRangeBO.builder().start_time(startTime).end_time(endTime).build())
                 .next_key(nextKey)
                 .page_size(pageSize)

yanxuan-wx-store-sharer-integration/src/main/java/com/netease/yanxuan/wx/store/sharer/integration/meta/model/bo/WeChatCommissionOrderListBO.java

@@ -16,11 +16,6 @@ public class WeChatCommissionOrderListBO implements Serializable {
     private static final long serialVersionUID = 1996751915518651231L;
 
     /**
-     * 佣金单所属小店appid
-     */
-    private String appid;
-
-    /**
      * 创建时间范围
      */
     private WeChatTimeRangeBO create_time_range;
@@ -29,6 +24,7 @@ public class WeChatCommissionOrderListBO implements Serializable {
      * 分页参数，第一页为空，后面返回前面一页返回的数据
      */
     private String next_key;
+
     /**
      * 一页获取多少个推客，最大 30
      */