feat(quotation): 扩展报价单信息和调整查询条件

- 新增付款方式及对应费用字段
- 添加币种、币种名称及汇率字段
- 增加补充说明、备注、联系人及联系方式等字段
- 新增国家/地区和交付方式列表字段
- 修改购物控制器，完善币种名称赋值及交付方式列表获取
- 移除报价单查询中过滤创建时间的条件，提高查询灵活性

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();

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;
 }

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>