From a46be04e40625fe562f7b9efe077d5b48eece63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 21 May 2026 18:17:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(quotation):=20=E6=89=A9=E5=B1=95=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E5=8D=95=E4=BF=A1=E6=81=AF=E5=92=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增付款方式及对应费用字段
- 添加币种、币种名称及汇率字段
- 增加补充说明、备注、联系人及联系方式等字段
- 新增国家/地区和交付方式列表字段
- 修改购物控制器，完善币种名称赋值及交付方式列表获取
- 移除报价单查询中过滤创建时间的条件，提高查询灵活性
---
 .../controller/app/ShoppingController.java    |  6 ++
 .../pojo/vo/QuotationOrderInfoVO.java         | 61 +++++++++++++++++++
 .../mapper/QuotationShoppingOrderMapper.xml   |  6 --
 3 files changed, 67 insertions(+), 6 deletions(-)

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<QuotationShoppingOrderItem> 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<ShoppingCartVO> 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<OrderDeliveryMethodDTO> 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 @@
         <if test="request.targetId!=null">
             and qso.target_id = #{request.targetId}
         </if>
-        <if test="request.createTimeStart!=null and request.createTimeStart!=''">
-            and qso.create_time>=#{request.createTimeStart}
-        </if>
-        <if test="request.createTimeEnd!=null and request.createTimeEnd!=''">
-            and qso.create_time &lt;= #{request.createTimeEnd}
-        </if>
         order by qso.id desc
     </select>