BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 50354462fef35505080cfc4194ac2d06036e9bd2

Authored by puhui999
1 parent 95d8be04

spu：分佣属性和分佣保持一致

Inline Side-by-side
Showing 5 changed files with 13 additions and 15 deletions
yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/ProductSkuRespDTO.java
  View file @5035446
... ... @@ -59,15 +59,13 @@ public class ProductSkuRespDTO {
59 59 * 商品体积，单位：m^3 平米
60 60 */
61 61 private Double volume;
62   -
63   - // TODO @puhui：这 2 字段，需要改下；firstBrokerageRecord、secondBrokerageRecord；和分佣保持一致；
64 62 /**
65 63 * 一级分销的佣金，单位：分
66 64 */
67   - private Integer subCommissionFirstPrice;
  65 + private Integer firstBrokerageRecord;
68 66 /**
69 67 * 二级分销的佣金，单位：分
70 68 */
71   - private Integer subCommissionSecondPrice;
  69 + private Integer secondBrokerageRecord;
72 70  
73 71 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
  View file @5035446
... ... @@ -51,10 +51,10 @@ public class ProductSkuBaseVO {
51 51 private Double volume;
52 52  
53 53 @Schema(description = "一级分销的佣金，单位：分", example = "199")
54   - private Integer subCommissionFirstPrice;
  54 + private Integer firstBrokerageRecord;
55 55  
56 56 @Schema(description = "二级分销的佣金，单位：分", example = "19")
57   - private Integer subCommissionSecondPrice;
  57 + private Integer secondBrokerageRecord;
58 58  
59 59 @Schema(description = "属性数组")
60 60 private List<Property> properties;
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
  View file @5035446
... ... @@ -81,11 +81,11 @@ public class ProductSkuDO extends BaseDO {
81 81 /**
82 82 * 一级分销的佣金，单位：分
83 83 */
84   - private Integer subCommissionFirstPrice;
  84 + private Integer firstBrokerageRecord;
85 85 /**
86 86 * 二级分销的佣金，单位：分
87 87 */
88   - private Integer subCommissionSecondPrice;
  88 + private Integer secondBrokerageRecord;
89 89  
90 90 // ========== 营销相关字段 =========
91 91  
... ...
yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
  View file @5035446
... ... @@ -92,8 +92,8 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
92 92 o.setMarketPrice(generaInt());
93 93 o.setStock(generaInt());
94 94 o.setWarnStock(10);
95   - o.setSubCommissionFirstPrice(generaInt());
96   - o.setSubCommissionSecondPrice(generaInt());
  95 + o.setFirstBrokerageRecord(generaInt());
  96 + o.setSecondBrokerageRecord(generaInt());
97 97 // 限制分数为两位数
98 98 o.setWeight(RandomUtil.randomDouble(10,2, RoundingMode.HALF_UP));
99 99 o.setVolume(RandomUtil.randomDouble(10,2, RoundingMode.HALF_UP));
... ... @@ -143,8 +143,8 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
143 143 o.setMarketPrice(generaInt());
144 144 o.setStock(generaInt());
145 145 o.setWarnStock(10);
146   - o.setSubCommissionFirstPrice(generaInt());
147   - o.setSubCommissionSecondPrice(generaInt());
  146 + o.setFirstBrokerageRecord(generaInt());
  147 + o.setSecondBrokerageRecord(generaInt());
148 148 // 限制分数为两位数
149 149 o.setWeight(RandomUtil.randomDouble(10,2, RoundingMode.HALF_UP));
150 150 o.setVolume(RandomUtil.randomDouble(10,2, RoundingMode.HALF_UP));
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @5035446
... ... @@ -7,7 +7,6 @@ import cn.iocoder.yudao.framework.common.util.string.StrUtils;
7 7 import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
8 8 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
9 9 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
10   -import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
11 10 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
12 11 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
13 12 import cn.iocoder.yudao.module.pay.enums.DictTypeConstants;
... ... @@ -31,6 +30,7 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
31 30 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
32 31 import cn.iocoder.yudao.module.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO;
33 32 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
  33 +import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
34 34 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
35 35 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
36 36 import org.mapstruct.Mapper;
... ... @@ -280,7 +280,7 @@ public interface TradeOrderConvert {
280 280 default BrokerageAddReqBO convert(TradeOrderItemDO item, ProductSkuRespDTO sku) {
281 281 return new BrokerageAddReqBO().setBizId(String.valueOf(item.getId()))
282 282 .setBasePrice(item.getPayPrice() * item.getCount())
283   - .setFirstFixedPrice(sku.getSubCommissionFirstPrice())
284   - .setSecondFixedPrice(sku.getSubCommissionSecondPrice());
  283 + .setFirstFixedPrice(sku.getFirstBrokerageRecord())
  284 + .setSecondFixedPrice(sku.getSecondBrokerageRecord());
285 285 }
286 286 }
... ...