联调问题处理

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

@@ -341,7 +341,7 @@ public class DrmSharerConfig {
                 .filter(item -> item.getOpenId().equals(openId))
                 .filter(item -> null == productId || item.getProductId().equals(String.valueOf(productId)))
                 .findFirst();
-        if(sharerProductCommissionOpt.isPresent()){
+        if (sharerProductCommissionOpt.isPresent()) {
             // 返回推客商品分佣
             return sharerProductCommissionOpt.get().getCommissionRatio();
         }
@@ -350,7 +350,7 @@ public class DrmSharerConfig {
                 .stream()
                 .filter(item -> item.getOpenId().equals(openId))
                 .findFirst();
-        if(sharerCommissionOpt.isPresent()){
+        if (sharerCommissionOpt.isPresent()) {
             // 返回推客分佣
             return sharerCommissionOpt.get().getCommissionRatio();
         }
@@ -464,20 +464,17 @@ public class DrmSharerConfig {
         if (null == sharerProductCommission) {
             sharerProductCommission = new SharerProductCommission();
             sharerProductCommission.setOpenId(openId);
-            sharerProductCommission.setSharerAppid(sharerAppid);
             sharerProductCommission.setProductId(productId);
-            sharerProductCommission.setCommissionRatio(commissionRatio);
-            sharerProductCommission.setCommissionType(CommissionTypeEnum.PLATFORM.getCode());
-            sharerProductCommission.setUnset(unsetEnum.getCode());
             sharerProductCommission.setCreateTime(now);
-            sharerProductCommission.setUpdateTime(now);
+        }
+        sharerProductCommission.setSharerAppid(sharerAppid);
+        sharerProductCommission.setCommissionRatio(commissionRatio);
+        sharerProductCommission.setCommissionType(CommissionTypeEnum.PLATFORM.getCode().toString());
+        sharerProductCommission.setUnset(unsetEnum.getCode());
+        sharerProductCommission.setUpdateTime(now);
+        if (null == sharerProductCommission.getId()) {
             sharerProductCommissionMapper.insert(sharerProductCommission);
         } else {
-            sharerProductCommission.setSharerAppid(sharerAppid);
-            sharerProductCommission.setCommissionRatio(commissionRatio);
-            sharerProductCommission.setCommissionType(CommissionTypeEnum.PLATFORM.getCode());
-            sharerProductCommission.setUnset(unsetEnum.getCode());
-            sharerProductCommission.setUpdateTime(now);
             sharerProductCommissionMapper.updateById(sharerProductCommission);
         }
     }

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

@@ -112,7 +112,7 @@ public class UserServiceImpl implements IUserService {
                             .divide(wechatMultiplier)
                             .setScale(2, RoundingMode.HALF_UP);
                     sharerInfo.setCommissionRatio(commissionRatio);
-                    String commissionType = null != sharerInfoVO.getCommission_type() ? sharerInfoVO.getCommission_type().toString() : CommissionTypeEnum.PLATFORM.getCode();
+                    Integer commissionType = null != sharerInfoVO.getCommission_type() ? sharerInfoVO.getCommission_type() : CommissionTypeEnum.PLATFORM.getCode();
                     sharerInfo.setCommissionType(commissionType);
                     // 刷新缓存
                     loginUserHelper.setLoginUserInfo(loginUserInfo.getAccessToken(), sharerInfoVO.getSharer_appid());

yanxuan-wx-store-sharer-dal/src/main/java/com/netease/yanxuan/wx/store/sharer/dal/meta/model/po/SharerInfo.java

@@ -44,7 +44,7 @@ public class SharerInfo implements Serializable {
     /**
      * 分佣类型【0：平台分佣 1：机构分佣】
      */
-    private String commissionType;
+    private Integer commissionType;
     /**
      * 创建时间
      */

yanxuan-wx-store-sharer-integration/src/main/java/com/netease/yanxuan/wx/store/sharer/integration/meta/enums/CommissionTypeEnum.java

@@ -11,9 +11,9 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum CommissionTypeEnum {
-    PLATFORM("0", "平台分佣"),
-    AGENCY("1", "机构分佣");
+    PLATFORM(0, "平台分佣"),
+    AGENCY(1, "机构分佣");
 
-    private final String code;
+    private final Integer code;
     private final String desc;
 }
\ No newline at end of file

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

@@ -22,7 +22,7 @@ public class WeChatSetSharerCommissionBO implements Serializable {
     /**
      * 分佣类型【 0：平台分佣， 1:机构自己分佣】
      */
-    private String commission_type;
+    private Integer commission_type;
     /**
      * 平台分佣时的分佣比例，范围为【100000 - 900000】，代表【10%-90%】
      */