From 21b339c49bae86254d7390a5c67a1a88cf62f2d9 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sat, 27 Jul 2024 14:52:13 +0800
Subject: [PATCH] bug

---
 fuintAdmin_zt/src/api/store.js                |  8 +++
 .../src/layout/components/Navbar.vue          |  4 +-
 .../src/views/components/Service/allOrder.vue | 62 +++++++++++--------
 .../src/views/components/Service/staff.vue    |  5 +-
 .../business/member/mapper/LJStaffMapper.java |  1 +
 .../member/mapper/xml/LJStaffMapper.xml       |  8 ++-
 .../member/service/ILJStaffService.java       |  2 +-
 .../service/impl/LJStaffServiceImpl.java      | 11 ++--
 .../service/impl/LJStoreServiceImpl.java      |  2 +-
 9 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/fuintAdmin_zt/src/api/store.js b/fuintAdmin_zt/src/api/store.js
index 8f7b51c85..1f1441908 100644
--- a/fuintAdmin_zt/src/api/store.js
+++ b/fuintAdmin_zt/src/api/store.js
@@ -47,3 +47,11 @@ export function saveStore(data) {
     data: data
   })
 }
+
+// 保存店铺
+export function getStoreListByDeptId(deptId) {
+  return request({
+    url: 'backendApi/store/getStoreByDeptId/'+deptId,
+    method: 'get',
+  })
+}
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index fe66ef9a2..8b245b691 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -109,8 +109,7 @@ export default {
           done();
         })
         .catch(_ => {});
-    }
-  },
+    },
     prsswrod(){
       console.log('方法')
       this.dialogVisible = false
@@ -130,6 +129,7 @@ export default {
         })
       }).catch(() => {});
     }
+  },
 
 }
 </script>
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
index 3378f1f25..5126b6f0d 100644
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -4,6 +4,15 @@
     <div class="bai-box" style="margin-top: 20px" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
+        <el-form-item label="" prop="orderNo">
+          <el-input
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="" prop="type">
           <el-select
             v-model="queryParams.type"
@@ -20,15 +29,6 @@
           </el-select>
 
 
-        </el-form-item>
-        <el-form-item label="" prop="orderNo">
-          <el-input
-            v-model="queryParams.orderNo"
-            placeholder="请输入订单号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="" prop="payChannel">
           <el-select
@@ -83,47 +83,59 @@
         </el-form-item>
       </el-form>
       <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="订单号" align="center" prop="orderNo" />
         <el-table-column label="订单类型" align="center" prop="type" width="100">
           <template slot-scope="scope">
             {{ getType(scope.row.type) }}
           </template>
           </el-table-column>
-        <el-table-column label="渠道订单号" align="center" prop="transactionId"/>
         <el-table-column :label="sumPayMoney" align="center" prop="payMoney">
 
         </el-table-column>
-        <el-table-column label="支付时间" align="center" prop="payTime" width="150">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.payTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="付款方式" align="center" prop="payType">
+        <el-table-column label="支付方式" align="center" prop="payType">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.payment_type" :value="scope.row.payType"/>
           </template>
 
         </el-table-column>
 
-
-        <el-table-column label="创建时间" align="center" prop="createTime" width="150">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="支付渠道" align="center" prop="createTime" width="150">
+        <el-table-column label="订单类型" align="center" prop="createTime" width="150">
           <template slot-scope="scope">
             <span>{{ scope.row.payChannel==='applet'?'小程序': '收银台'}}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="付款用户手机号" align="center" prop="userMobile" width="150">
+        <el-table-column label="付款用户/手机号" align="center" prop="userMobile" width="150">
           <template slot-scope="scope">
             <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
           </template>
         </el-table-column>
 
+        <el-table-column label="支付通道" align="center" prop="userMobile" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="商户号编号" align="center" prop="userMobile" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="订单创建时间" align="center" prop="createTime" width="150">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) || '--'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="订单完成时间" align="center" prop="payTime" width="150">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.payTime) || '--'}}</span>
+          </template>
+        </el-table-column>
+
 
       </el-table>
 
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
index 7fb12c512..8159ce57d 100644
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@@ -53,7 +53,7 @@
             <span>{{ scope.row.dutyName || "--" }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="登录账号" align="center" prop="mobile"/>
+        <el-table-column label="登录账号" align="center" prop="accountName"/>
         <el-table-column label="员工状态" align="center" width="80" prop="status">
           <template slot-scope="scope">
             <el-switch
@@ -138,7 +138,7 @@
           <el-input v-model="form.accountName" placeholder="请输入登录账号" maxlength="30" style="width: 270px"/>
         </el-form-item>
 
-        <el-form-item label="登录密码" prop="password">
+        <el-form-item label="登录密码" prop="password" v-if="!form.id">
           <el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="30" style="width: 270px"/>
         </el-form-item>
 
@@ -216,7 +216,6 @@
 import {getName} from "../../../utils/fuint";
 import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
 import {dutyList} from "@/api/duty/duty";
-import {searchStore} from "@/api/store";
 import {getStoreListByDeptId} from "../../../api/store";
 // import {getDuty, listDuty} from "@/api/staff/duty";
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJStaffMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJStaffMapper.java
index 88ef4d32d..272d0187c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJStaffMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJStaffMapper.java
@@ -41,4 +41,5 @@ public interface LJStaffMapper extends BaseMapper<LJStaff> {
     List<Map<String,String>> employeeSales(@Param("storeId") Integer storeId);
     List<Map<String,String>> employeeSalesMongth(@Param("storeId") Integer storeId);
 
+    LJStaff selectStaffById(@Param("id") Integer id);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
index 7a45dcc0b..9a62ea86a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
@@ -6,8 +6,9 @@
     </sql>
 <!--根据条件分页查询用户信息-->
     <select id="selectLJStaffList" resultType="com.fuint.business.member.entity.LJStaff">
-        SELECT ms.*,td.duty_name FROM mt_staff ms
+        SELECT ms.*,td.duty_name,ta.account_name FROM mt_staff ms
             left join t_duty td on ms.role_id = td.duty_id
+            LEFT JOIN t_account ta on ms.id = ta.staff_id
         <where>
             ms.store_id = #{staff.storeId} and ms.if_delete = 0
             <if test="staff.realName != null and staff.realName != ''">
@@ -104,4 +105,9 @@
         ORDER BY
             totalSum DESC
     </select>
+    <select id="selectStaffById" resultType="com.fuint.business.member.entity.LJStaff">
+        SELECT ms.*,ta.account_name FROM mt_staff ms
+            LEFT JOIN t_account ta on ms.id = ta.staff_id
+        where ms.id = #{id}
+    </select>
 </mapper>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
index 7f4eb13df..82ff0b1ae 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
@@ -47,7 +47,7 @@ public interface ILJStaffService extends IService<LJStaff> {
      * @param id
      * @return
      */
-    public LJStaff selectStaffById(int id);
+    public LJStaff selectStaffById(Integer id);
 
     /**
      * 根据手机号查询员工信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index ef6a70f0a..b31445391 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -142,11 +142,12 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
      * @return
      */
     @Override
-    public LJStaff selectStaffById(int id) {
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id",id);
-        queryWrapper.eq("if_delete","0");
-        return baseMapper.selectOne(queryWrapper);
+    public LJStaff selectStaffById(Integer id) {
+//        QueryWrapper queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("id",id);
+//        queryWrapper.eq("if_delete","0");
+//        return baseMapper.selectOne(queryWrapper);
+        return baseMapper.selectStaffById(id);
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
index 555e8ecf4..fc6f87221 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
@@ -339,7 +339,7 @@ public class LJStoreServiceImpl extends ServiceImpl<LJStoreMapper, LJStore> impl
                 LocalDate currentDate = LocalDate.now();
 
                 long daysBetween = ChronoUnit.DAYS.between(givenDate, currentDate);
-                record.setRemind("以免费使用系统"+daysBetween+"天");
+                record.setRemind("已免费使用系统"+daysBetween+"天");
             } else if (ObjectUtil.isNotEmpty(record.getTurnoverType()) && record.getTurnoverType().equals("2")) {
 //                时间限制
                 LocalDate givenDate = record.getTurnoverEndTime().toInstant()