admin/tmerclub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

仓库

Browse Source
This commit is contained in:
杨旭 2025-04-20 12:44:12 +08:00
parent f0a269825f
commit c0d929e390
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
View File

@ -142,6 +142,10 @@ public class CueOrderVO extends BaseVO implements Serializable {
* 寄出单号 * 寄出单号
*/ */
private String sendNumber; private String sendNumber;
/**
* 寄出时候选定的仓库id
*/
private Long warehouseId;
/** /**
* 用户退款地址id * 用户退款地址id

6
tmerclub-local/src/main/java/com/tmerclub/cloud/warehouse/service/impl/WarehouseServiceImpl.java
View File

@ -73,7 +73,7 @@ public class WarehouseServiceImpl implements WarehouseService {
if (ObjectUtil.isNull(orderVO)) { if (ObjectUtil.isNull(orderVO)) {
throw new LuckException("暂无订单信息"); throw new LuckException("暂无订单信息");
} }
if (ObjectUtil.isNull(orderVO.getMallOrderId())) { if (ObjectUtil.isNull(orderVO.getWarehouseId())) {
WarehouseVO nearbyWarehouse = warehouseMapper.getNearbyWarehouse(lat, lng); WarehouseVO nearbyWarehouse = warehouseMapper.getNearbyWarehouse(lat, lng);
if (ObjectUtil.isNull(nearbyWarehouse)) { if (ObjectUtil.isNull(nearbyWarehouse)) {
throw new LuckException("暂无仓库信息"); throw new LuckException("暂无仓库信息");
@ -81,11 +81,11 @@ public class WarehouseServiceImpl implements WarehouseService {
// 将仓库id与订单绑定 // 将仓库id与订单绑定
CueOrder cueOrder = new CueOrder(); CueOrder cueOrder = new CueOrder();
cueOrder.setOrderId(orderId); cueOrder.setOrderId(orderId);
cueOrder.setMallOrderId(nearbyWarehouse.getWarehouseId()); cueOrder.setWarehouseId(nearbyWarehouse.getWarehouseId());
cueOrderMapper.update(cueOrder); cueOrderMapper.update(cueOrder);
return nearbyWarehouse; return nearbyWarehouse;
} else { } else {
return warehouseMapper.getById(orderVO.getMallOrderId()); return warehouseMapper.getById(orderVO.getWarehouseId());
} }
} }

3
tmerclub-local/src/main/resources/mapper/CueOrderMapper.xml
View File

@ -31,12 +31,13 @@
<result property="mallOrderId" column="mall_order_id"/> <result property="mallOrderId" column="mall_order_id"/>
<result property="sendNumber" column="send_number"/> <result property="sendNumber" column="send_number"/>
<result property="productImages" column="product_images"/> <result property="productImages" column="product_images"/>
<result property="warehouseId" column="warehouse_id"/>
</resultMap> </resultMap>
<sql id="Vo_Column_List"> <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_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, 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> </sql>
<select id="list" resultMap="cueOrderVOMap"> <select id="list" resultMap="cueOrderVOMap">

2
tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/feign/CouponFeignController.java
View File

@ -140,7 +140,7 @@ public class CouponFeignController implements CouponFeignClient {
couponDTO.setReduceAmount(reduceAmount); couponDTO.setReduceAmount(reduceAmount);
couponDTO.setPutonStatus(PutOnStatus.PUT_ON.value()); couponDTO.setPutonStatus(PutOnStatus.PUT_ON.value());
couponDTO.setGetWay(1); couponDTO.setGetWay(1);
couponDTO.setValidTimeType(1); couponDTO.setValidTimeType(2);
couponDTO.setAfterReceiveDays(0); couponDTO.setAfterReceiveDays(0);
couponDTO.setValidDays(3652); couponDTO.setValidDays(3652);
couponDTO.setTotalStock(1); couponDTO.setTotalStock(1);