diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PlanSearchItemVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PlanSearchItemVO.java index 4a3fdb4e..c7246d98 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PlanSearchItemVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PlanSearchItemVO.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.common.pojo.vo; +import com.nflg.mobilebroken.common.util.NumberUtil; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -54,9 +55,6 @@ public class PlanSearchItemVO { private BigDecimal salePrice; public BigDecimal getSalePrice() { - if (Objects.nonNull(standardPrice)) { - return standardPrice.multiply(ratio); - } - return null; + return NumberUtil.multiply(standardPrice,ratio); } } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationProductModelSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationProductModelSearchVO.java index 001e878e..796a0d7d 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationProductModelSearchVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/QuotationProductModelSearchVO.java @@ -14,7 +14,7 @@ public class QuotationProductModelSearchVO { /** * 模块名称 */ - private Integer moduleName; + private String moduleName; /** * 系列名称 diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java index 11697597..eb003bad 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/AppRatioAgentConfigController.java @@ -131,10 +131,13 @@ public class AppRatioAgentConfigController extends ControllerBase { && it.getUserId().equals(user.getId())) .findFirst() .orElse(null); - QuotationModelRatioAgentItem mitem = ratioAgentItemService.getEffectiveForUser(data.getBatchNumber(), AppUserUtil.getUserId()); - BigDecimal basePrice = Objects.nonNull(modelPrice) ? NumberUtil.multiply(modelPrice.getAmount(), Optional.ofNullable(mitem) - .map(QuotationModelRatioAgentItem::getStandardRatio) - .orElse(null)) : null; + BigDecimal basePrice = Optional.ofNullable(modelPrice).map(ModelPriceVO::getAmount).orElse(null); + if (Objects.nonNull(basePrice)) { + QuotationModelRatioAgentItem mitem = ratioAgentItemService.getEffectiveForUser(data.getBatchNumber(), AppUserUtil.getUserId()); + if (Objects.nonNull(mitem)) { + basePrice = NumberUtil.multiply(basePrice, mitem.getStandardRatio()); + } + } BigDecimal standardRatio = Objects.nonNull(item) ? item.getStandardRatio() : null; map.put(user.getId().toString() + "-standardPrice", NumberUtil.format(basePrice)); map.put(user.getId().toString() + "-standardRatio", NumberUtil.format(standardRatio)); @@ -239,7 +242,7 @@ public class AppRatioAgentConfigController extends ControllerBase { } /** - * 获取方案列表 + * 查看下级数据 */ @PostMapping("list/search") public ApiResult> search(@Valid @RequestBody ModelRatioUserSearchRequest request) { diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml index c4fb6bde..e718f699 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml @@ -137,9 +137,9 @@ AND dis.model_id is not null - - AND pm.`no` like concat('%', #{request.no}, '%') - + + + ORDER BY pm.sort,pm.id DESC