From 47f0262a25012cc48eff548df800f866a4208aae Mon Sep 17 00:00:00 2001
From: yovinchen <gzh298255@gmail.com>
Date: Tue, 30 Jan 2024 16:07:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/order/orderInfo/deliverList.vue      |  6 +++---
 xlcs-admin/src/views/order/orderInfo/list.vue      |  7 +++----
 xlcs-admin/src/views/order/orderInfo/show.vue      |  4 ++--
 xlcs-admin/src/views/user/leader/checkList.vue     |  6 +++---
 xlcs-admin/src/views/user/leader/list.vue          | 14 +++++++-------
 .../xlcs/client/user/UserFeignClient.java          |  2 +-
 .../xlcs/product/controller/SkuInfoController.java |  5 ++---
 .../xlcs/user/api/LeaderAddressController.java     |  2 +-
 .../xlcs/user/service/LoginWxService.java          |  4 ++--
 .../yovinchen/xlcs/user/service/UserService.java   |  2 +-
 10 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/xlcs-admin/src/views/order/orderInfo/deliverList.vue b/xlcs-admin/src/views/order/orderInfo/deliverList.vue
index 1d7bf13..3235d31 100644
--- a/xlcs-admin/src/views/order/orderInfo/deliverList.vue
+++ b/xlcs-admin/src/views/order/orderInfo/deliverList.vue
@@ -52,9 +52,9 @@
         align="center"
       />
 
-      <el-table-column prop="leaderName" label="团长" width="90" />
-      <el-table-column prop="leaderPhone" label="团长电话" width="100" />
-      <el-table-column prop="takeName" label="提货点" width="130" />
+      <el-table-column label="配送员" prop="leaderName" width="90"/>
+      <el-table-column label="配送员电话" prop="leaderPhone" width="100"/>
+      <el-table-column label="配送点" prop="takeName" width="130"/>
       <el-table-column prop="skuNum" label="商品数量" width="80" />
       <el-table-column prop="driverName" label="司机" width="90" />
       <el-table-column prop="driverPhone" label="司机电话" width="100" />
diff --git a/xlcs-admin/src/views/order/orderInfo/list.vue b/xlcs-admin/src/views/order/orderInfo/list.vue
index 725ae41..e9639fd 100644
--- a/xlcs-admin/src/views/order/orderInfo/list.vue
+++ b/xlcs-admin/src/views/order/orderInfo/list.vue
@@ -4,7 +4,7 @@
     <el-card class="operate-container" shadow="never">
       <el-form inline>
         <el-form-item label="订单号">
-          <el-input v-model="searchObj.outTradeNo" type="text" width="100" placeholder="订单号" clearable />
+          <el-input v-model="searchObj.orderNo" clearable placeholder="订单号" type="text" width="100"/>
         </el-form-item>
 
         <el-form-item label="订单状态">
@@ -89,10 +89,10 @@
           <p>电话：{{ scope.row.receiverPhone }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="团长信息">
+      <el-table-column label="配送员信息">
         <template slot-scope="scope">
           <p>姓名：{{ scope.row.leaderName }}</p>
-          <p>提货点：{{ scope.row.takeName }}</p>
+          <p>配送点：{{ scope.row.takeName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="操作时间" width="200px">
@@ -127,7 +127,6 @@
 
 <script>
 import api from '@/api/order/orderInfo'
-import leaderApi from '@/api/user/leader'
 import wareApi from '@/api/sys/ware'
 
 export default {
diff --git a/xlcs-admin/src/views/order/orderInfo/show.vue b/xlcs-admin/src/views/order/orderInfo/show.vue
index fbc3aa6..df5f71d 100644
--- a/xlcs-admin/src/views/order/orderInfo/show.vue
+++ b/xlcs-admin/src/views/order/orderInfo/show.vue
@@ -34,9 +34,9 @@
           <td width="35%">{{ orderInfo.receiverPhone }}</td>
         </tr>
         <tr>
-          <th>团长名称</th>
+          <th>配送员名称</th>
           <td>{{ orderInfo.leaderName }}</td>
-          <th>提货点</th>
+          <th>配送点</th>
           <td>{{ orderInfo.takeName }}</td>
         </tr>
         <tr>
diff --git a/xlcs-admin/src/views/user/leader/checkList.vue b/xlcs-admin/src/views/user/leader/checkList.vue
index feaee15..1a31a5e 100644
--- a/xlcs-admin/src/views/user/leader/checkList.vue
+++ b/xlcs-admin/src/views/user/leader/checkList.vue
@@ -35,7 +35,7 @@
 
       <el-table-column prop="name" label="姓名" width="100px" />
       <el-table-column prop="phone" label="手机号码" width="100px" />
-      <el-table-column prop="takeName" label="提货点名称" />
+      <el-table-column label="配送点名称" prop="takeName"/>
       <el-table-column prop="param.provinceName" label="省" width="70px" />
       <el-table-column prop="param.cityName" label="城市" width="70px" />
       <el-table-column prop="param.districtName" label="区/县" width="70px" />
@@ -68,7 +68,7 @@
 
     <el-dialog title="添加/修改" :visible.sync="dialogVisible" width="60%">
       <el-form ref="flashPromotionForm" label-width="150px" size="small" style="padding-right: 40px;">
-        <el-form-item label="团长名称">
+        <el-form-item label="配送员名称">
           <el-input v-model="leader.name" />
         </el-form-item>
         <el-form-item label="手机号码">
@@ -77,7 +77,7 @@
         <el-form-item label="身份证">
           <el-input v-model="leader.idNo" />
         </el-form-item>
-        <el-form-item label="提货点名称">
+        <el-form-item label="配送点名称">
           <el-input v-model="leader.takeName" />
         </el-form-item>
         <el-form-item label="选择地址">
diff --git a/xlcs-admin/src/views/user/leader/list.vue b/xlcs-admin/src/views/user/leader/list.vue
index fd5980a..8ab9c83 100644
--- a/xlcs-admin/src/views/user/leader/list.vue
+++ b/xlcs-admin/src/views/user/leader/list.vue
@@ -5,7 +5,7 @@
     <el-card class="operate-container" shadow="never">
       <el-form :inline="true">
         <el-form-item label="输入搜索：">
-          <el-input v-model="searchObj.keyword" style="width: 203px" placeholder="关键字" />
+          <el-input v-model="searchObj.keyword" placeholder="关键字" style="width: 203px"/>
         </el-form-item>
 
         <el-button type="primary" icon="el-icon-search" @click="fetchData()">查询</el-button>
@@ -32,17 +32,17 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="name" label="姓名" width="100px" />
-      <el-table-column prop="phone" label="手机号码" width="120px" />
-      <el-table-column prop="takeName" label="提货点名称" />
-      <el-table-column prop="param.regionName" label="所属区域" width="80px" />
+      <el-table-column label="姓名" prop="name" width="100px"/>
+      <el-table-column label="手机号码" prop="phone" width="120px"/>
+      <el-table-column label="配送点名称" prop="takeName"/>
+      <el-table-column label="所属区域" prop="param.regionName" width="80px"/>
       <el-table-column label="状态" width="100">
         <template slot-scope="scope">
           <p>{{ scope.row.checkStatus === 0 ? '待审核' : scope.row.checkStatus === 1 ? '通过' : '未通过' }}</p>
         </template>
       </el-table-column>
-      <el-table-column prop="checkTime" label="审核时间" width="150px" />
-      <el-table-column prop="createTime" label="申请时间" width="150px" />
+      <el-table-column label="审核时间" prop="checkTime" width="150px"/>
+      <el-table-column label="申请时间" prop="createTime" width="150px"/>
 
       <el-table-column label="操作" width="200" align="center">
         <template slot-scope="scope">
diff --git a/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java b/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java
index 38936b1..0ca0843 100644
--- a/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java
+++ b/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 public interface UserFeignClient {
 
     /**
-     * 提货点地址信息
+     * 配送点地址信息
      *
      * @param userId
      * @return
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/SkuInfoController.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/SkuInfoController.java
index 0fbc264..0738c8a 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/SkuInfoController.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/SkuInfoController.java
@@ -1,13 +1,13 @@
 package com.yovinchen.xlcs.product.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yovinchen.xlcs.common.result.Result;
 import com.yovinchen.xlcs.model.product.SkuInfo;
 import com.yovinchen.xlcs.product.service.SkuInfoService;
 import com.yovinchen.xlcs.vo.product.SkuInfoQueryVo;
 import com.yovinchen.xlcs.vo.product.SkuInfoVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,7 +26,6 @@ import java.util.List;
  */
 @Api(value = "SkuInfo管理", tags = "商品Sku管理")
 @RestController
-
 @RequestMapping(value = "/admin/product/skuInfo")
 public class SkuInfoController {
 
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
index 79c187e..d764829 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
@@ -26,7 +26,7 @@ public class LeaderAddressController {
     @Resource
     private UserService userService;
 
-    @ApiOperation("提货点地址信息")
+    @ApiOperation("配送点地址信息")
     @GetMapping("inner/getUserAddressByUserId/{userId}")
     public LeaderAddressVo getUserAddressByUserId(@PathVariable("userId") Long userId) {
         return userService.getLeaderAddressByUserId(userId);
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
index 65f6dc5..8de52f8 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
@@ -77,8 +77,8 @@ public class LoginWxService {
             userService.save(user);
         }
 
-        //5 根据userId查询提货点和配送员信息
-        ////提货点  user表  user_delivery表
+        //5 根据userId查询配送点和配送员信息
+        ////配送点  user表  user_delivery表
         ////配送员    leader表
         LeaderAddressVo leaderAddressVo = userService.getLeaderAddressByUserId(user.getId());
 
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
index 4f694b2..da9ac27 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
@@ -22,7 +22,7 @@ public interface UserService extends IService<User> {
     User getUserByOpenId(String openid);
 
     /**
-     * 根据userId查询提货点和配送员信息
+     * 根据userId查询配送点和配送员信息
      *
      * @param id
      * @return