分佣配置结构调整

yanxuan-wx-store-sharer-biz/src/main/java/com/netease/yanxuan/wx/store/sharer/biz/config/DrmSharerConfig.java

@@ -208,20 +208,11 @@ public class DrmSharerConfig {
         if (null == sharerInfo) {
             return;
         }
-        // 分佣比例为小数,  微信接口参数应当分佣比例*比例 为整数
-        BigDecimal commissionRatio = newCommissionSharer.getCommissionRatio()
-                .multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
-                .setScale(0, RoundingMode.DOWN);
         // 设置推客分佣比例
         boolean isSuccess = false;
         try {
-            if (StringUtils.isNotBlank(sharerInfo.getSharerAppid())) {
-                // 设置推客分佣比例
-                weChatShopSetSharerCommissionRequest.handle(sharerInfo.getSharerAppid(), commissionRatio.longValue());
-            }
-            // 更新推客分佣比例
-            updateSharerInfo(sharerInfo, newCommissionSharer.getCommissionRatio()
-                    .setScale(2, RoundingMode.HALF_UP).toPlainString());
+            // 更新分佣比例，同步微信
+            updateSharerOrProductCommissionRatio(sharerInfo, newCommissionSharer.getCommissionRatio());
             isSuccess = true;
         } catch (Exception e) {
             log.error("设置推客的的分佣类型和比例信息失败", e);
@@ -246,19 +237,12 @@ public class DrmSharerConfig {
             return;
         }
         // 分佣比例为小数,  微信接口参数应当分佣比例*倍数 为整数
-        BigDecimal sharerCommissionRatio = getSharerOrDefaultCommissionRatio(oldCommissionSharer.getOpenId());
-        BigDecimal commissionRatio = sharerCommissionRatio
-                .multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
-                .setScale(0, RoundingMode.DOWN);
+        BigDecimal sharerCommissionRatio = new BigDecimal(sharerInfo.getCommissionRatio());
         // 设置推客分佣比例
         boolean isSuccess = false;
         try {
-            if (StringUtils.isNotBlank(sharerInfo.getSharerAppid())) {
-                // 设置推客分佣比例
-                weChatShopSetSharerCommissionRequest.handle(sharerInfo.getSharerAppid(), commissionRatio.longValue());
-            }
-            // 更新推客分佣比例
-            updateSharerInfo(sharerInfo, sharerCommissionRatio.setScale(2, RoundingMode.HALF_UP).toPlainString());
+            // 更新分佣比例，同步微信
+            updateSharerOrProductCommissionRatio(sharerInfo, sharerCommissionRatio);
             isSuccess = true;
         } catch (Exception e) {
             log.error("设置推客的的分佣类型和比例信息失败", e);
@@ -270,6 +254,30 @@ public class DrmSharerConfig {
         }
     }
 
+    private void updateSharerOrProductCommissionRatio(SharerInfo sharerInfo, BigDecimal commissionRatio) {
+        if (StringUtils.isNotBlank(sharerInfo.getSharerAppid())) {
+            // 分佣比例为小数,  微信接口参数应当分佣比例*比例 为整数
+            BigDecimal weChatCommissionRatio = commissionRatio
+                    .multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
+                    .setScale(0, RoundingMode.DOWN);
+            // 设置推客分佣比例
+            weChatShopSetSharerCommissionRequest.handle(sharerInfo.getSharerAppid(), weChatCommissionRatio.longValue());
+            // 拿到未配置的商品，设置推客商品分佣比例
+            List<SharerProductCommission> unsetList = getSharerProductCommissionUnsetList(sharerInfo.getOpenId());
+            if (!CollectionUtils.isEmpty(unsetList)) {
+                for (SharerProductCommission sharerProductCommission : unsetList) {
+                    // 设置推客分佣比例
+                    weChatShopSetSharerProductCommissionRequest.handle(sharerInfo.getSharerAppid(),
+                            Long.valueOf(sharerProductCommission.getProductId()),
+                            weChatCommissionRatio.longValue());
+                }
+            }
+        }
+        // 更新推客分佣比例
+        updateSharerInfo(sharerInfo, commissionRatio
+                .setScale(2, RoundingMode.HALF_UP).toPlainString());
+    }
+
     /**
      * 用户商品分佣比例变更
      */
@@ -311,27 +319,21 @@ public class DrmSharerConfig {
      * 获取推客分佣比例
      */
     private BigDecimal getSharerCommissionRatio(String openId) {
-        Optional<CommissionSharerBO> sharerCommissionOpt = Optional.ofNullable(commissionSharerList)
-                .orElseGet(ArrayList::new)
-                .stream()
-                .filter(item -> StringUtils.isNotBlank(item.getOpenId()))
-                .filter(item -> item.getOpenId().equals(openId))
-                .findFirst();
+        Map<String, CommissionSharerBO> sharerCommissionMap = convertCommissionSharerMap(commissionSharerList);
+        CommissionSharerBO commissionSharerBO = sharerCommissionMap.get(openId);
         // 返回推客分佣
-        return sharerCommissionOpt.map(CommissionSharerBO::getCommissionRatio).orElse(null);
+        return null != commissionSharerBO ? commissionSharerBO.getCommissionRatio() : null;
     }
 
     /**
-     * 获取推客分佣比例
+     * 获取推客商品未配置的分佣比例集合
      */
-    private BigDecimal getSharerOrDefaultCommissionRatio(String openId) {
-        // 返回推客分佣
-        BigDecimal sharerCommissionRatio = getSharerCommissionRatio(openId);
-        if (null != sharerCommissionRatio) {
-            return sharerCommissionRatio;
-        }
-        // 返回默认分佣金
-        return defaultCommissionRatio;
+    private List<SharerProductCommission> getSharerProductCommissionUnsetList(String openId) {
+        // 返回推客商品分佣
+        LambdaQueryWrapper<SharerProductCommission> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SharerProductCommission::getOpenId, openId);
+        lqw.eq(SharerProductCommission::getUnset, SharerProductCommission.UnsetEnum.UNSET.getCode());
+        return sharerProductCommissionMapper.selectList(lqw);
     }
 
     /**
@@ -538,17 +540,21 @@ public class DrmSharerConfig {
                 .collect(Collectors.toMap(this::getSharerProductCommissionMapKey, item -> item, (key1, key2) -> key2));
     }
 
-
     private Map<String, CommissionSharerBO> convertCommissionSharerMap(String val) {
         if (StringUtils.isNotBlank(val)) {
             List<CommissionSharerBO> list = JSON.parseArray(val, CommissionSharerBO.class);
             // 过滤禁用，转换成Map
+            return convertCommissionSharerMap(list);
+        }
+        return new HashMap<>(0);
+    }
+
+    private Map<String, CommissionSharerBO> convertCommissionSharerMap(List<CommissionSharerBO> list) {
+        // 过滤禁用，转换成Map
         return Optional.ofNullable(list)
                 .orElseGet(ArrayList::new).stream()
                 .filter(item -> StringUtils.isNotBlank(item.getOpenId()))
                 .filter(item -> null != item.getCommissionRatio())
                 .collect(Collectors.toMap(CommissionSharerBO::getOpenId, item -> item, (key1, key2) -> key2));
     }
-        return new HashMap<>(0);
-    }
 }
\ No newline at end of file