From c0d929e390c41809e9c37ced4dba327d6c43883d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com>
Date: Sun, 20 Apr 2025 12:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java  | 4 ++++
 .../cloud/warehouse/service/impl/WarehouseServiceImpl.java  | 6 +++---
 tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml | 3 ++-
 .../tmerclub/cloud/coupon/feign/CouponFeignController.java  | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
index e65b1a4..7a202d1 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
@@ -142,6 +142,10 @@ public class CueOrderVO extends BaseVO implements Serializable {
      * 寄出单号
      */
     private String sendNumber;
+    /**
+     * 寄出时候选定的仓库id
+     */
+    private Long warehouseId;
 
     /**
      * 用户退款地址id
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/warehouse/service/impl/WarehouseServiceImpl.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/warehouse/service/impl/WarehouseServiceImpl.java
index 0056c1e..576ceec 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/warehouse/service/impl/WarehouseServiceImpl.java
@@ -73,7 +73,7 @@ public class WarehouseServiceImpl implements WarehouseService {
         if (ObjectUtil.isNull(orderVO)) {
             throw new LuckException("暂无订单信息");
         }
-        if (ObjectUtil.isNull(orderVO.getMallOrderId())) {
+        if (ObjectUtil.isNull(orderVO.getWarehouseId())) {
             WarehouseVO nearbyWarehouse = warehouseMapper.getNearbyWarehouse(lat, lng);
             if (ObjectUtil.isNull(nearbyWarehouse)) {
                 throw new LuckException("暂无仓库信息");
@@ -81,11 +81,11 @@ public class WarehouseServiceImpl implements WarehouseService {
             // 将仓库id与订单绑定
             CueOrder cueOrder = new CueOrder();
             cueOrder.setOrderId(orderId);
-            cueOrder.setMallOrderId(nearbyWarehouse.getWarehouseId());
+            cueOrder.setWarehouseId(nearbyWarehouse.getWarehouseId());
             cueOrderMapper.update(cueOrder);
             return nearbyWarehouse;
         } else {
-            return warehouseMapper.getById(orderVO.getMallOrderId());
+            return warehouseMapper.getById(orderVO.getWarehouseId());
         }
 
     }
diff --git a/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml b/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
index d5ffbdb..bab8ff3 100644
--- a/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
+++ b/tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
@@ -31,12 +31,13 @@
         <result property="mallOrderId" column="mall_order_id"/>
         <result property="sendNumber" column="send_number"/>
         <result property="productImages" column="product_images"/>
+        <result property="warehouseId" column="warehouse_id"/>
     </resultMap>
 
     <sql id="Vo_Column_List">
         order_id,product_id,product_name,product_images,product_price,user_id,user_name,user_phone,cue_order_type,
         order_status,flaw_img_url,evidence_of_payment,order_remark,estimated_amount,actual_amount,voucher_amount,deleted,
-        create_time,update_time,is_payed,pay_type,pay_time,delivery_time,finally_time,mall_order_id,send_number,order_addr_id
+        create_time,update_time,is_payed,pay_type,pay_time,delivery_time,finally_time,mall_order_id,send_number,order_addr_id,warehouse_id
     </sql>
 
     <select id="list" resultMap="cueOrderVOMap">
diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/feign/CouponFeignController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/feign/CouponFeignController.java
index dd0d886..5afb4dc 100644
--- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/feign/CouponFeignController.java
+++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/feign/CouponFeignController.java
@@ -140,7 +140,7 @@ public class CouponFeignController implements CouponFeignClient {
         couponDTO.setReduceAmount(reduceAmount);
         couponDTO.setPutonStatus(PutOnStatus.PUT_ON.value());
         couponDTO.setGetWay(1);
-        couponDTO.setValidTimeType(1);
+        couponDTO.setValidTimeType(2);
         couponDTO.setAfterReceiveDays(0);
         couponDTO.setValidDays(3652);
         couponDTO.setTotalStock(1);