From 0d886694047e81db21a6b266ddb001ce2ebce0d3 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 5 Aug 2025 11:25:57 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0=E7=9B=92=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/BdWaresController.java | 23 +------------------ .../com/hzs/sale/wares/param/WaresParams.java | 10 ++++---- .../service/impl/BdWaresServiceImpl.java | 20 ---------------- .../java/com/hzs/sale/wares/vo/WaresVo.java | 15 ------------ .../mapper/sale/order/SaOrderMapper.xml | 2 -- .../mapper/sale/wares/BdWaresMapper.xml | 2 +- .../hzs/common/domain/sale/wares/BdWares.java | 6 +++++ 7 files changed, 13 insertions(+), 65 deletions(-) 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 f66165d3..a440eb81 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 @@ -36,8 +36,6 @@ import com.hzs.sale.wares.param.WaresDetailParams; import com.hzs.sale.wares.param.*; import com.hzs.sale.wares.service.*; import com.hzs.sale.wares.vo.*; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IRangeServiceApi; import com.hzs.system.sys.dto.LoginUser; import lombok.extern.slf4j.Slf4j; @@ -57,8 +55,6 @@ import java.util.stream.Collectors; @RequestMapping("/manage/wares") public class BdWaresController extends BaseController { - @DubboReference - ICurrencyServiceApi iCurrencyServiceApi; @DubboReference IRangeServiceApi iRangeServiceApi; @@ -116,8 +112,6 @@ public class BdWaresController extends BaseController { startPage(); List resultList = iBdWaresService.selectByWaresInfo(waresParams); if (CollectionUtil.isNotEmpty(resultList)) { - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - resultList.parallelStream().forEach(waresVo -> { WaresAuthorityVo waresAuthorityVo = iBdWaresService.getWaresAuthorityFirst(waresVo.getPkWares()); if (waresAuthorityVo != null) { @@ -131,10 +125,6 @@ public class BdWaresController extends BaseController { if (waresVo.getIsMakerGift() != null) { waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel()); } - if (null != waresVo.getMakerIncome()) { - // 处理发起人收益 - waresVo.setMakerIncome(waresVo.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate())); - } }); } return getDataTable(resultList); @@ -151,7 +141,6 @@ public class BdWaresController extends BaseController { List resultList = iBdWaresService.selectByWaresInfo(waresParams); if (CollectionUtil.isNotEmpty(resultList)) { - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); // 获取需要翻译的枚举翻译 Map transactionMap = iTransactionCommonService.exportEnumTransaction(ESpecialArea.values(), EYesNo.values(), ESupplyWay.values(), EPresaleStatus.values()); @@ -188,10 +177,6 @@ public class BdWaresController extends BaseController { waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel()); } } - if (null != waresVo.getMakerIncome()) { - // 处理发起人收益 - waresVo.setMakerIncome(waresVo.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate())); - } }); } ExcelUtil util = new ExcelUtil<>(WaresVo.class); @@ -320,7 +305,6 @@ public class BdWaresController extends BaseController { if (!isPutOn) { return AjaxResult.error("产品规格至少有一个上架"); } -// wares.setSort(0); iBdWaresService.saveWares(wares, userTokenService.getLoginUser()); return AjaxResult.success(wares.getWaresCode()); } @@ -450,8 +434,6 @@ public class BdWaresController extends BaseController { return AjaxResult.error("规格图片必传"); } } - -// waresParams.setSort(0); iBdWaresService.updateWares(waresParams, userTokenService.getLoginUser()); return AjaxResult.success(waresParams.getWaresCode()); } @@ -535,10 +517,7 @@ public class BdWaresController extends BaseController { waresParams.setSortStatus(wares.getSortStatus()); waresParams.setSystemType(waresExtend.getSystemType()); waresParams.setAreaIncome(wares.getAreaIncome()); - if (waresExtend.getMakerIncome() != null) { - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate())); - } + waresParams.setBoxNum(wares.getBoxNum()); BdAreaClassify parentAreaClassify = areaClassifyService.getAreaClassify(wares.getPkAreaClassify()); if (parentAreaClassify != null) { 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 810cb34e..64b4e14a 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 @@ -394,11 +394,6 @@ public class WaresParams implements Serializable { */ private Integer sortStatus; - /** - * 发起人收益（目前复购使用） - */ - private BigDecimal makerIncome; - /** * 系统类型（2=新零售，3=美业） */ @@ -414,4 +409,9 @@ public class WaresParams implements Serializable { */ private BigDecimal areaIncome; + /** + * 商品上传盒数 + */ + private BigDecimal boxNum; + } 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 aa40b32b..89bb7bb5 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 @@ -111,9 +111,7 @@ public class BdWaresServiceImpl extends ServiceImpl impl // 设置 wares 对象的值 BdWares wares = BeanUtil.copyProperties(waresParams, BdWares.class); wares.setPkId(waresParams.getWaresId()); - R transaction = transactionServiceApi.createTransaction(user.getDataCountry(), ETransactionKey.SPEC, waresParams.getWaresName(), EYesNo.NO, EYesNo.NO); wares.setWaresCode(waresParams.getWaresCode()); - wares.setPkTransaction(transaction.getData()); wares.setPkCreator(user.getUserId()); wares.setPkCountry(user.getDataCountry()); wares.setSystemType(user.getSystemType()); @@ -127,14 +125,6 @@ public class BdWaresServiceImpl extends ServiceImpl impl this.save(wares); // 商品拓展表 BdWaresExtend waresExtend = BeanUtil.copyProperties(waresParams, BdWaresExtend.class); - // 存入要转化美金 - if (!waresParams.getSpecialArea().equals(ESpecialArea.REPURCHASE_AREA.getValue())) { - waresParams.setMakerIncome(BigDecimal.ZERO); - } - if (null != waresParams.getMakerIncome()) { - R currencyDto = currencyServiceApi.getCurrency(user.getDataCountry()); - waresExtend.setMakerIncome(waresParams.getMakerIncome().divide(currencyDto.getData().getInExchangeRate(), 6, BigDecimal.ROUND_HALF_UP)); - } // 处理系统类型 waresExtend.setSystemType(user.getSystemType()); waresExtend.setPkWares(wares.getPkId()); @@ -539,8 +529,6 @@ public class BdWaresServiceImpl extends ServiceImpl impl public void updateWares(WaresParams waresParams, LoginUser user) { BdWares wares = BeanUtil.copyProperties(waresParams, BdWares.class); wares.setPkId(waresParams.getWaresId()); - R transaction = transactionServiceApi.createTransaction(user.getDataCountry(), ETransactionKey.SPEC, waresParams.getWaresName(), EYesNo.NO, EYesNo.NO); - wares.setPkTransaction(transaction.getData()); if (waresParams.getIsPutOn().equals(EYesNo.YES.getIntValue())) { wares.setListingTime(DateUtils.currentDateTime()); } @@ -554,14 +542,6 @@ public class BdWaresServiceImpl extends ServiceImpl impl // 商品拓展表 BdWaresExtend waresExtend = BeanUtil.copyProperties(waresParams, BdWaresExtend.class); - // 存入要转化美金 - if (!waresParams.getSpecialArea().equals(ESpecialArea.REPURCHASE_AREA.getValue())) { - waresParams.setMakerIncome(BigDecimal.ZERO); - } - if (null != waresParams.getMakerIncome()) { - R currencyDto = currencyServiceApi.getCurrency(user.getDataCountry()); - waresExtend.setMakerIncome(waresParams.getMakerIncome().divide(currencyDto.getData().getInExchangeRate(), 6, BigDecimal.ROUND_HALF_UP)); - } // 处理系统类型 waresExtend.setSystemType(user.getSystemType()); waresExtend.setPkWares(wares.getPkId()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java index 51284b39..877ebcc4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java @@ -11,13 +11,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/9 11:02 - * @Classname: WaresVo - * @PackageName: com.hzs.sale.wares.vo - */ @Data public class WaresVo { @@ -65,14 +58,6 @@ public class WaresVo { @BigDecimalFormat("#0.0000") private BigDecimal waresAchieve; - - /** - * 发起人收益（目前复购使用） - */ - @Excel(name = "发起人收益(￥)", scale = 2) - @BigDecimalFormat - private BigDecimal makerIncome; - /** * 支付比例名称 */ diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index 1843aaa2..75d981c9 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -114,7 +114,6 @@ - @@ -125,7 +124,6 @@ - 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 12191f58..75a27aa6 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 @@ -49,6 +49,7 @@ + @@ -81,7 +82,6 @@ - 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 dd038016..92a0521f 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 @@ -222,4 +222,10 @@ public class BdWares extends BaseEntity { @TableField("AREA_INCOME") private BigDecimal areaIncome; + /** + * 商品上传盒数 + */ + @TableField("BOX_NUM") + private BigDecimal boxNum; + }