diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java index b77a16d7..e9eaefdc 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java @@ -132,6 +132,9 @@ public class ShoppingController extends ControllerBase { @Resource private IDictionaryItemTranslateService dictionaryItemTranslateService; + @Resource + private IDictionaryItemService dictionaryItemService; + @Resource private ITBaseAreaService areaService; @@ -728,6 +731,9 @@ public class ShoppingController extends ControllerBase { QuotationShoppingOrder order = shoppingOrderService.getById(id); VUtils.trueThrowBusinessError(Objects.isNull(order)).throwMessage("未找到报价单"); QuotationOrderInfoVO vo = Convert.convert(QuotationOrderInfoVO.class, order); + DictionaryItem currency = dictionaryItemService.getByIdAndLanguage(vo.getCurrency(), MultilingualUtil.getLanguage()); + vo.setCurrencyName(currency.getName()); + vo.setDeliveryMethods(shoppingOrderDeliveryMethodService.getList(order.getId())); List orderItems = shoppingOrderItemService.lambdaQuery() .eq(QuotationShoppingOrderItem::getOrderId, id) .list(); diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java index 268102c1..c2471328 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/QuotationOrderInfoVO.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.quotation.pojo.vo; +import com.nflg.mobilebroken.common.pojo.dto.OrderDeliveryMethodDTO; import lombok.Data; import java.math.BigDecimal; @@ -91,4 +92,64 @@ public class QuotationOrderInfoVO { * 购物车列表 */ private List items=new ArrayList<>(); + + /** + * 付款方式 + */ + private String paymentMethod; + + /** + * 付款方式产生的费用 + */ + private BigDecimal paymentFee; + + /** + * 币种,字典id + */ + private Long currency; + + /** + * 币种名称 + */ + private String currencyName; + + /** + * 汇率 + */ + private BigDecimal exchangeRate; + + /** + * 补充说明 + */ + private String additionalNotes; + + /** + * 备注 + */ + private String remark; + + /** + * 联系人 + */ + private String contactPerson; + + /** + * 联系方式 + */ + private String contactInformation; + + /** + * 联系邮箱 + */ + private String contactEmail; + + /** + * 国家/地区 + */ + private String contactCountry; + + /** + * 交付方式列表 + */ + private List deliveryMethods; } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationShoppingOrderMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationShoppingOrderMapper.xml index 12915e4e..0cbe45b0 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationShoppingOrderMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationShoppingOrderMapper.xml @@ -94,12 +94,6 @@ and qso.target_id = #{request.targetId} - - and qso.create_time>=#{request.createTimeStart} - - - and qso.create_time <= #{request.createTimeEnd} - order by qso.id desc