diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java index d1550472..33361086 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java @@ -541,6 +541,7 @@ public class BdWaresController extends BaseController { waresParams.setPkSpecialCurrency(waresExtend.getPkSpecialCurrency()); waresParams.setSortStatus(wares.getSortStatus()); waresParams.setSystemType(waresExtend.getSystemType()); + waresParams.setAreaIncome(wares.getAreaIncome()); if (waresExtend.getMakerIncome() != null) { R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate())); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java index a174c808..810cb34e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java @@ -9,13 +9,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/9 14:14 - * @Classname: WaresParams - * @PackageName: com.hzs.sale.wares.controller.manage.params - */ @Data public class WaresParams implements Serializable { /** @@ -416,4 +409,9 @@ public class WaresParams implements Serializable { */ private Integer waresStatus; + /** + * 复购区域分红 + */ + private BigDecimal areaIncome; + } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index da3e9700..64158386 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -46,9 +46,9 @@ - + diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java index c7882dd9..dd038016 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java @@ -216,4 +216,10 @@ public class BdWares extends BaseEntity { @TableField("SYSTEM_TYPE") private Integer systemType; + /** + * 复购区域分红 + */ + @TableField("AREA_INCOME") + private BigDecimal areaIncome; + }