优化pdd确认订单

docs/qihang-erp.sql

@@ -3466,7 +3466,7 @@ INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2116, '商品出库管理', 7, 20, 'stock_out', 'stock/stockOut/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-09-21 20:44:46', 'admin', '2025-03-24 13:46:42', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2117, '仓位管理', 7, 91, 'position', 'stock/warehouse/position', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 11:52:18', 'admin', '2025-03-24 13:47:04', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2118, '新建商品入库单', 7, 11, 'stock_in/create', 'stock/stockIn/create.vue', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 14:49:40', 'admin', '2025-03-24 13:35:30', '');
-INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2129, '订单发货', 6, 0, 'manual_shipment', 'shipping/shipment/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-10-02 00:15:02', '');
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2129, '手动发货', 6, 0, 'manual_shipment', 'shipping/manual/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-10-02 00:15:02', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2134, '店铺任务设置', 3, 30, 'task', 'shop/task/index', NULL, 1, 0, 'C', '0', '0', NULL, 'bug', 'admin', '2026-01-21 00:39:27', '', NULL, '');
 COMMIT;
 

model/src/main/java/cn/qihangerp/model/request/OrderSearchRequest.java

@@ -11,7 +11,7 @@ public class OrderSearchRequest {
     private String orderStatus;
     private String startTime;
     private String endTime;
-    private Integer erpPushStatus;
+    private Integer shipStatus;
     private String receiverName;
     private String receiverMobile;
     private String shippingNumber;

service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java

@@ -121,7 +121,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
                 .eq(bo.getOrderStatus()!=null,OOrder::getOrderStatus,bo.getOrderStatus())
                 .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderCreateTime,bo.getStartTime()+" 00:00:00")
                 .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderCreateTime,bo.getEndTime()+" 23:59:59")
-
+                .eq(bo.getShipStatus()!=null,OOrder::getShipStatus,bo.getShipStatus())
                 .eq(org.springframework.util.StringUtils.hasText(bo.getReceiverName()),OOrder::getReceiverName,bo.getReceiverName())
                 .like(org.springframework.util.StringUtils.hasText(bo.getReceiverMobile()),OOrder::getReceiverMobile,bo.getReceiverMobile())
                 ;

service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java

@@ -343,6 +343,11 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
         // 更新自己
         PddOrder douOrderUpdate = new PddOrder();
         douOrderUpdate.setId(pddOrder.getId());
+        douOrderUpdate.setReceiverNameMask(confirmBo.getReceiver());
+        douOrderUpdate.setReceiverAddressMask(confirmBo.getAddress());
+        douOrderUpdate.setProvince(confirmBo.getProvince());
+        douOrderUpdate.setCity(confirmBo.getCity());
+        douOrderUpdate.setTown(confirmBo.getTown());
         douOrderUpdate.setAuditStatus(1);
         douOrderUpdate.setAuditTime(new Date());
         mapper.updateById(douOrderUpdate);

vue/src/views/order/order_list.vue

@@ -35,30 +35,14 @@
             end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="订单状态" prop="orderStatus">
+      <el-form-item label="发货状态" prop="shipStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable @change="handleQuery">
+        <el-select v-model="queryParams.shipStatus" placeholder="请选择状态" clearable @change="handleQuery">
-          <el-option label="待发货" value="1" ></el-option>
+          <el-option label="待发货" value="0" ></el-option>
-          <el-option label="已发货" value="2"></el-option>
+          <el-option label="已分配供应商发货" value="1"></el-option>
-          <el-option label="已完成" value="3"> </el-option>
+          <el-option label="已发货" value="2"> </el-option>
           <el-option label="已取消" value="11"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="退款状态" prop="refundStatus">
-        <el-select v-model="queryParams.refundStatus" placeholder="请选择状态" clearable @change="handleQuery">
-          <el-option label="无售后或售后关闭" value="1" ></el-option>
-          <el-option label="售后处理中" value="2"></el-option>
-          <el-option label="退款中" value="3"> </el-option>
-          <el-option label="退款成功" value="4"></el-option>
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="推送ERP状态" prop="hasLink">-->
-<!--        <el-select v-model="queryParams.erpPushStatus" placeholder="推送ERP状态" clearable @change="handleQuery">-->
-<!--          <el-option label="订单推送成功" value="200"></el-option>-->
-<!--          <el-option label="订单取消成功" value="100"></el-option>-->
-<!--          <el-option label="推送失败" value="500"></el-option>-->
-<!--          <el-option label="未推送" value="0"></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -217,32 +201,16 @@
 
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="orderStatus" >
+      <el-table-column label="订单状态" align="center" prop="orderStatusText" ></el-table-column>
+      <el-table-column label="发货状态" align="center" prop="orderStatusText" >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.orderStatus === 0" style="margin-bottom: 6px;">新订单</el-tag>
+          <el-tag v-if="scope.row.shipStatus === 0" style="margin-bottom: 6px;">待发货</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 1" style="margin-bottom: 6px;">待发货</el-tag>
+          <el-tag v-if="scope.row.shipStatus === 1" style="margin-bottom: 6px;">已分配供应商发货</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
+          <el-tag v-if="scope.row.shipStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 3" style="margin-bottom: 6px;">已完成</el-tag>
+          <el-tag v-if="scope.row.shipStatus === 11" style="margin-bottom: 6px;">已取消</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 21" style="margin-bottom: 6px;">待付款</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 22" style="margin-bottom: 6px;">锁定</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 29" style="margin-bottom: 6px;">删除</el-tag>
-          <el-tag v-if="scope.row.orderStatus === 11" style="margin-bottom: 6px;">已取消</el-tag>
-          <br />
-<!--          <el-tag style="margin-bottom: 6px;" v-if="scope.row.erpPushStatus === 200">订单推送成功</el-tag>-->
-<!--          <el-tag style="margin-bottom: 6px;" v-if="scope.row.erpPushStatus === 100">订单取消推送成功</el-tag>-->
-<!--          <el-tag type="danger" style="margin-bottom: 6px;" v-if="!scope.row.erpPushStatus || scope.row.erpPushStatus === 0">待推送到ERP</el-tag>-->
-<!--          <el-tag type="danger" style="margin-bottom: 6px;" v-if="scope.row.erpPushStatus > 200">推送错误</el-tag>-->
-<!--          <div style="margin-bottom: 6px;color:red" v-if="scope.row.erpPushStatus > 200">{{scope.row.erpPushResult}}</div>-->
-<!--          <br />-->
-<!--           &lt;!&ndash; 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 &ndash;&gt;-->
-<!--           <el-tag v-if="scope.row.refundStatus === 1">无售后或售后关闭</el-tag>-->
-<!--           <el-tag v-if="scope.row.refundStatus === 2">售后处理中</el-tag>-->
-<!--           <el-tag v-if="scope.row.refundStatus === 3">退款中</el-tag>-->
-<!--           <el-tag v-if="scope.row.refundStatus === 4">退款成功</el-tag>-->
         </template>
       </el-table-column>
 
-
 <!--      <el-table-column label="发货信息" align="center" prop="shippingNumber" >-->
 <!--        <template slot-scope="scope">-->
 <!--          {{scope.row.shippingNumber}}&nbsp; {{scope.row.shippingCompany}}<br />-->
@@ -251,7 +219,7 @@
 <!--      </el-table-column>-->
       <el-table-column label="下单时间" align="center" prop="orderTime" >
         <template slot-scope="scope">
-          {{ parseTime(scope.row.orderTime) }}
+          {{ parseTime(scope.row.orderCreateTime) }}
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

vue/src/views/pdd/order/index.vue

@@ -154,6 +154,15 @@
       </el-table-column>
       <el-table-column label="买家留言" align="center" prop="buyerMemo" />
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="收件人" align="left" prop="userName" >
+        <template slot-scope="scope">
+          <span>{{scope.row.receiverNameMask}}</span>
+          <span>{{scope.row.receiverPhoneMask}}</span>
+          <br />
+          <span> {{scope.row.province}} {{scope.row.city}} {{scope.row.town}}</span>
+          {{scope.row.receiverAddressMask}}
+        </template>
+      </el-table-column>
       <el-table-column label="订单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <el-tag size="small" v-if="scope.row.orderStatus === 1"> 待发货</el-tag>