Commit 614d6fc1 by fanjiaxin

分佣配置结构调整

parent 2235c787
Pipeline #71713 passed with stages
in 58 seconds
......@@ -17,7 +17,7 @@ import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableAutoUpdateApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ValueMapping;
import com.netease.yanxuan.wx.store.sharer.biz.meta.enums.CommissionChangeOptTypeEnum;
import com.netease.yanxuan.wx.store.sharer.biz.meta.model.bo.CommissionSharerProductsBO;
import com.netease.yanxuan.wx.store.sharer.biz.meta.model.bo.CommissionSharerProductListBO;
import com.netease.yanxuan.wx.store.sharer.biz.meta.model.bo.CommissionSharerBO;
import com.netease.yanxuan.wx.store.sharer.biz.meta.model.bo.CommissionSharerProductBO;
import com.netease.yanxuan.wx.store.sharer.dal.mapper.SharerInfoMapper;
......@@ -80,7 +80,7 @@ public class DrmSharerConfig {
* 用户商品分佣比例
*/
@ValueMapping("${commissionratio.sharerproduct:}")
private List<CommissionSharerProductsBO> commissionSharerProductList;
private List<CommissionSharerProductListBO> commissionSharerProductList;
/**
* 监听
......@@ -282,8 +282,8 @@ public class DrmSharerConfig {
*/
private void sharerProductCommissionRatioChange(ConfigChange change) {
log.info("ProductCommissionConfig:sharerProductCommissionRatioChange, change = {}", JSON.toJSONString(change));
List<CommissionSharerProductsBO> oldCommissionSharerList = JSON.parseArray(change.getOldValue(), CommissionSharerProductsBO.class);
List<CommissionSharerProductsBO> newCommissionSharerList = JSON.parseArray(change.getNewValue(), CommissionSharerProductsBO.class);
List<CommissionSharerProductListBO> oldCommissionSharerList = JSON.parseArray(change.getOldValue(), CommissionSharerProductListBO.class);
List<CommissionSharerProductListBO> newCommissionSharerList = JSON.parseArray(change.getNewValue(), CommissionSharerProductListBO.class);
// 过滤禁用,转换成Map
Map<String, CommissionSharerProductBO> oldCommissionMap = convertCommissionSharerProductBO(oldCommissionSharerList);
Map<String, CommissionSharerProductBO> newCommissionMap = convertCommissionSharerProductBO(newCommissionSharerList);
......@@ -532,12 +532,12 @@ public class DrmSharerConfig {
sharerInfoMapper.update(null, sharerInfoLuw);
}
private Map<String, CommissionSharerProductBO> convertCommissionSharerProductBO(List<CommissionSharerProductsBO> list) {
private Map<String, CommissionSharerProductBO> convertCommissionSharerProductBO(List<CommissionSharerProductListBO> list) {
// 过滤禁用,转换成Map
return Optional.ofNullable(list)
.orElseGet(ArrayList::new).stream()
.filter(CommissionSharerProductsBO::getEnable)
.flatMap(item -> Arrays.stream(item.getProductIds().split(","))
.filter(CommissionSharerProductListBO::getEnable)
.flatMap(item -> Arrays.stream(item.getProductId().split(","))
.map(productId -> {
CommissionSharerProductBO result = new CommissionSharerProductBO();
result.setOpenId(item.getOpenId());
......
......@@ -11,7 +11,7 @@ import java.math.BigDecimal;
* @Date 2025/3/9 13:44
*/
@Data
public class CommissionSharerProductsBO implements Serializable {
public class CommissionSharerProductListBO implements Serializable {
private static final long serialVersionUID = -6353220469962589464L;
/**
* 用户ID
......@@ -20,7 +20,7 @@ public class CommissionSharerProductsBO implements Serializable {
/**
* 商品ID
*/
private String productIds;
private String productId;
/**
* 分佣比例
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment