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 @@ + 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