rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(quotation): 修正调价逻辑及接口数据字段 

- 修正ProductModelParamsDataMapper中remark字段对应product_model_params_data_language表的value字段
- 移除QuotationPriceUpdateRequest中actualFee和reason字段的非空校验注解
- 修改ShoppingController判断条件，将isAgent替换为createByType == 1
- 在订单调价时设置折扣为总价与实际调价后总价的差值
- 修复订单更新时折扣字段赋值，改为使用order中的折扣值
This commit is contained in:
曹鹏飞 2026-05-22 15:46:39 +08:00
parent fa252a23d4
commit c51f9c3aa8
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java
View File

@ -738,7 +738,7 @@ public class ShoppingController extends ControllerBase {
DictionaryItem currency = dictionaryItemService.getByIdAndLanguage(vo.getCurrency(), MultilingualUtil.getLanguage());
vo.setCurrencyName(currency.getName());
vo.setDeliveryMethods(shoppingOrderDeliveryMethodService.getList(order.getId()));
if (AppUserUtil.isAgent()) {
if (order.getCreateByType() == 1) {
TBaseCustomer customer = customerService.lambdaQuery()
.eq(TBaseCustomer::getId, vo.getTargetId())
.one();
@ -1008,6 +1008,7 @@ public class ShoppingController extends ControllerBase {
.setReason(request.getReason())
.setCreateTime(LocalDateTime.now());
order.setActualFee(request.getActualFee());
order.setDiscount(order.getTotalFee().subtract(request.getActualFee()));
List<QuotationShoppingOrderAdjustItem> adjustItems = new ArrayList<>();
request.getItems().forEach(item -> {
if (Objects.nonNull(item.getNewStandardFee())) {
@ -1040,7 +1041,7 @@ public class ShoppingController extends ControllerBase {
}
shoppingOrderService.lambdaUpdate()
.set(Objects.nonNull(request.getActualFee()), QuotationShoppingOrder::getActualFee, request.getActualFee())
.set(Objects.nonNull(request.getActualFee()), QuotationShoppingOrder::getDiscount, order.getTotalFee().subtract(request.getActualFee()))
.set(Objects.nonNull(request.getActualFee()), QuotationShoppingOrder::getDiscount, order.getDiscount())
.set(QuotationShoppingOrder::getEffectiveEndTime, DateTimeUtil.format(request.getEffectiveEndTime(), "yyyy-MM-dd"))
.set(StrUtil.isNotBlank(request.getAddress()), QuotationShoppingOrder::getAddress, request.getAddress())
.set(QuotationShoppingOrder::getUpdateTime, LocalDateTime.now())

2
nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/QuotationPriceUpdateRequest.java
View File

@ -19,13 +19,11 @@ public class QuotationPriceUpdateRequest {
/**
* 调价后实际总价
*/
@NotNull(message = "调价后实际总价不能为空")
private BigDecimal actualFee;
/**
* 调价原因
*/
@NotBlank(message = "调价原因不能为空")
private String reason;
/**

2
nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsDataMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.nflg.mobilebroken.repository.mapper.ProductModelParamsDataMapper">
<select id="getEffectives" resultType="com.nflg.mobilebroken.common.pojo.dto.ModelConfigEffectiveDTO">
SELECT pmpd.id,pmpd.parent_id,pmpd.name as part_name,pmpd.remark as part_remark,pmpd.image_url,pp.amount,pmpd.type
SELECT pmpd.id,pmpd.parent_id,pmpd.name as part_name,pmpdl.value as part_remark,pmpd.image_url,pp.amount,pmpd.type
,pmpd.optional_type,pmpd.group_name
FROM product_model_params_data pmpd
LEFT JOIN product_model_params_data_language pmpdl ON pmpdl.params_data_id=pmpd.id