From 9662e2951ca3aaf6ca0caf91ea528e966748c8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Thu, 31 Oct 2024 11:17:58 +0800
Subject: [PATCH] 1

---
 .../views/EventMarketing/SaveBlock/index.vue  |  5 ++-
 .../reconciliation/tab/trading.vue            | 32 +++++++++++++------
 .../business/order/entity/AllOrderInfo.java   |  3 ++
 .../order/mapper/xml/AllOrderInfoMapper.xml   | 13 ++++++--
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index f48888dec..de28da6ca 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -112,7 +112,10 @@
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始日期"
-                end-placeholder="结束日期">
+                end-placeholder="结束日期"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              >
               </el-date-picker>
             </div>
             <el-button type="primary" icon="el-icon-search" @click="RecordList()" >搜索</el-button>
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index 811a8c338..eac034f4f 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -8,18 +8,19 @@
         </el-form-item>
         <el-form-item label="" prop="payChannel">
           <el-select
-            v-model="queryParams.type"
+            v-model="queryParams.payChannel"
             clearable
             placeholder="请选择订单类型啊"
           >
             <el-option label="小程序" value="applet"/>
             <el-option label="收银台" value="cashier"/>
             <el-option label="POS端" value="POS"/>
+            <el-option label="PC端" value="PC"/>
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="payChannel">
           <el-select
-            v-model="queryParams.payChannel"
+            v-model="queryParams.type"
             clearable
             placeholder="请选择订单分类"
           >
@@ -65,6 +66,8 @@
             <el-option label="已支付" value="paid"/>
             <el-option label="未支付" value="unpaid"/>
             <el-option label="已退款" value="refund"/>
+            <el-option label="支付失败" value="payFail"/>
+            <el-option label="退款中" value="refunding"/>
           </el-select>
         </el-form-item>
 <!--        <el-form-item label="" prop="payType">-->
@@ -88,32 +91,38 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="paymentChannel">
-          <el-select v-model="queryParams.status" placeholder="请选择员工" clearable>
+        <el-form-item label="" prop="staffId">
+          <el-select v-model="queryParams.staffId" placeholder="请选择员工" clearable>
             <el-option
               v-for="dicts in this.staffList"
-              :key="dicts.userId"
+              :key="dicts.id"
               :label="dicts.realName"
-              :value="dicts.userId"
+              :value="dicts.id"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="status">
-          <el-input v-model="queryParams.userId" placeholder="请输入付款用户"></el-input>
+        <el-form-item label="" prop="userName">
+          <el-input v-model="queryParams.userName" placeholder="请输入付款用户"></el-input>
         </el-form-item>
         <el-form-item label="">
           <el-date-picker
             v-model="beginTime"
             style="width: 140px"
             type="date"
-            placeholder="交易开始日期">
+            placeholder="交易开始日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
           至
           <el-date-picker
             v-model="endTime"
             style="width: 140px"
             type="date"
-            placeholder="交易结束日期">
+            placeholder="交易结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item style="float: right; margin-right: 0px ">
@@ -355,6 +364,8 @@ export default {
         deptType: "3",
         storeId: "",
         deptId: "",
+        userName:"",
+        staffId:"",
       },
       orderStatistics: {
         CASH: "0",
@@ -419,6 +430,7 @@ export default {
 
     // 获取数据列表
     async getList(val) {
+      console.log(111111)
       let dateRange = []
       if (this.beginTime && this.endTime) {
         dateRange.push(this.beginTime.toLocaleDateString())
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
index a75077ae3..5bbe681a1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
@@ -124,5 +124,8 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
     private Long deptId;
     @TableField(exist = false)
     private List<Long> storeIds;
+
+    @TableField(exist = false)
+    private String userName;
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index 37d6227db..1df95d489 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -876,8 +876,8 @@
             <if test="obj.storeId != null and obj.storeId != ''">
                 and ai.store_id = #{obj.storeId}
             </if>
-            <if test="obj.storeId != null and obj.storeId != ''">
-                and ai.store_id = #{obj.storeId}
+            <if test="obj.paymentChannel != null and obj.paymentChannel != ''">
+                and ai.payment_channel = #{obj.paymentChannel}
             </if>
             <if test="obj.orderNo != null and obj.orderNo != ''">
                 and ai.order_no like concat('%', #{obj.orderNo}, '%')
@@ -891,6 +891,15 @@
             <if test="obj.payChannel != null and obj.payChannel != ''">
                 and ai.pay_channel = #{obj.payChannel}
             </if>
+            <if test="obj.userName != null and obj.userName != ''">
+                and mu.name like concat('%', #{obj.userName}, '%')
+            </if>
+            <if test="obj.status != null and obj.status != ''">
+                and ai.status = #{obj.status}
+            </if>
+            <if test="obj.staffId != null and obj.staffId != ''">
+                and ai.create_by = #{obj.staffId}
+            </if>
         ORDER BY ai.create_time DESC
     </select>
     <select id="orderStatistics" resultType="java.util.Map">