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 27503121..a4ab0b76 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 @@ -513,6 +513,7 @@ public class BdWaresController extends BaseController { waresParams.setSortStatus(wares.getSortStatus()); waresParams.setSystemType(waresExtend.getSystemType()); waresParams.setAreaIncome(wares.getAreaIncome()); + waresParams.setAreaIncomeType(wares.getAreaIncomeType()); waresParams.setBoxNum(wares.getBoxNum()); BdAreaClassify parentAreaClassify = iBdAreaClassifyService.getAreaClassify(wares.getPkAreaClassify()); 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 64b4e14a..41fab650 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 @@ -409,6 +409,11 @@ public class WaresParams implements Serializable { */ private BigDecimal areaIncome; + /** + * 复购区域分红方式(1=比率,2=比值) + */ + private BigDecimal areaIncomeType; + /** * 商品上传盒数 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java index 1311563f..440668e7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java @@ -27,9 +27,6 @@ import com.hzs.sale.wares.param.WaresDetailParams; import com.hzs.sale.wares.mapper.BdWaresMapper; import com.hzs.sale.wares.service.*; import com.hzs.sale.wares.vo.*; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.ITransactionServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAwardsServiceApi; import com.hzs.system.config.ILabelServiceApi; import com.hzs.system.config.IRangeServiceApi; @@ -87,13 +84,9 @@ public class BdWaresServiceImpl extends ServiceImpl impl @DubboReference IMemberServiceApi iMemberServiceApi; @DubboReference - ICurrencyServiceApi iCurrencyServiceApi; - @DubboReference IAwardsServiceApi iAwardsServiceApi; @DubboReference IRangeServiceApi iRangeServiceApi; - @DubboReference - ITransactionServiceApi iTransactionServiceApi; @Override @Transactional(rollbackFor = Exception.class) 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 50f93263..fcb01e90 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 @@ -50,6 +50,7 @@ + diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERatioType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERatioType.java index f4ab28a8..d744e579 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERatioType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERatioType.java @@ -5,13 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * * 比率类型 - * @Description: - * @Author: ljc - * @Time: 2023/5/8 11:23 - * @Classname: ERatioType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter 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 ffe5fd20..88179cdc 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 @@ -228,5 +228,10 @@ public class BdWares extends BaseEntity { @TableField("BOX_NUM") private BigDecimal boxNum; + /** + * 复购区域分红方式(1=比率,2=比值) + */ + @TableField("AREA_INCOME_TYPE") + private BigDecimal areaIncomeType; }