分佣配置结构调整

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

@@ -282,8 +282,19 @@ public class DrmSharerConfig {
      */
     private void sharerProductCommissionRatioChange(ConfigChange change) {
         log.info("ProductCommissionConfig:sharerProductCommissionRatioChange, change = {}", JSON.toJSONString(change));
-        List<CommissionSharerProductListBO> oldCommissionSharerList = JSON.parseArray(change.getOldValue(), CommissionSharerProductListBO.class);
-        List<CommissionSharerProductListBO> newCommissionSharerList = JSON.parseArray(change.getNewValue(), CommissionSharerProductListBO.class);
+        boolean isOldBlank = StringUtils.isBlank(change.getOldValue());
+        boolean isNewBlank = StringUtils.isBlank(change.getNewValue());
+        if (isOldBlank && isNewBlank) {
+            return;
+        }
+        List<CommissionSharerProductListBO> oldCommissionSharerList = new ArrayList<>(0);
+        if (!isOldBlank) {
+            oldCommissionSharerList = JSON.parseArray(change.getOldValue(), CommissionSharerProductListBO.class);
+        }
+        List<CommissionSharerProductListBO> newCommissionSharerList = new ArrayList<>(0);
+        if (!isNewBlank) {
+            newCommissionSharerList = JSON.parseArray(change.getNewValue(), CommissionSharerProductListBO.class);
+        }
         // 过滤禁用，转换成Map
         Map<String, CommissionSharerProductBO> oldCommissionMap = convertCommissionSharerProductBO(oldCommissionSharerList);
         Map<String, CommissionSharerProductBO> newCommissionMap = convertCommissionSharerProductBO(newCommissionSharerList);
@@ -405,7 +416,7 @@ public class DrmSharerConfig {
             return;
         }
         SharerInfo sharerInfo = getSharerInfoByOpenId(oldBo.getOpenId());
-        if(null == sharerInfo){
+        if (null == sharerInfo) {
             return;
         }
         // 设置推客分佣比例
@@ -541,9 +552,12 @@ public class DrmSharerConfig {
 
     private Map<String, CommissionSharerProductBO> convertCommissionSharerProductBO(List<CommissionSharerProductListBO> list) {
         // 过滤禁用，转换成Map
-        return Optional.ofNullable(list)
+        Map<String, CommissionSharerProductBO> resultMap = Optional.ofNullable(list)
                 .orElseGet(ArrayList::new).stream()
                 .filter(CommissionSharerProductListBO::getEnable)
+                .filter(item -> StringUtils.isNotBlank(item.getOpenId()))
+                .filter(item -> StringUtils.isNotBlank(item.getProductId()))
+                .filter(item -> null != item.getCommissionRatio())
                 .flatMap(item -> Arrays.stream(item.getProductId().split(","))
                         .map(productId -> {
                             CommissionSharerProductBO result = new CommissionSharerProductBO();
@@ -554,5 +568,6 @@ public class DrmSharerConfig {
                             return result;
                         }))
                 .collect(Collectors.toMap(this::getSharerProductCommissionMapKey, Function.identity()));
+        return CollectionUtils.isEmpty(resultMap) ? new HashMap<>(0) : resultMap;
     }
 }
\ No newline at end of file