Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml

@@ -287,5 +287,7 @@
       join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0'
     where t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
     and t1.create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+    order by
+     t1.trade_date desc
   </select>
 </mapper>

jsowell-ui/src/assets/json/bank_code.json

@@ -1,5 +1,5 @@
 {
-    "cityList":[
+    "bankList":[
         {
             "bankCode": "31379104",
             "bankName": "长安银行股份有限公司"

jsowell-ui/src/views/financial/financeDetail.vue

@@ -4,7 +4,7 @@
       <div class="header-txt">运营汇总</div>
       <el-button type="primary" @click="goAccount">开户信息</el-button>
     </div>
-    <div class="header">
+    <div class="header" v-loading="loading">
       <template v-if="operationStatus == null">
         <div class="foot1">
           <div style="margin: 12px 0">没有查询到结算账户</div>
@@ -317,7 +317,7 @@
       :visible.sync="dialogTableVisible"
       :before-close="orderClose"
     >
-      <el-table :data="orderList">
+      <el-table :data="orderList" v-loading="loading">
         <el-table-column property="orderCode" label="订单编号" />
         <el-table-column property="settleAmount" label="结算金额(元)" />
         <el-table-column property="clearingStatus" label="清分状态">
@@ -356,6 +356,7 @@ export default {
   dicts: ["bill_status"],
   data() {
     return {
+      loading: true,
       operationStatus: null,
       adapayMember: {},
       // 开启
@@ -388,6 +389,7 @@ export default {
         startTime: "",
         endTime: "",
       },
+      bankName: "",
       merchantOrderReport: {},
       adapayCorpMember: {},
       settleAccountList: [],
@@ -399,27 +401,35 @@ export default {
   methods: {
     // 银行编码
     cityBankCode(code) {
+      if (code == null) {
+        return "";
+      }
       // if (code === undefined) return;
-      const cityList = text.cityList;
-      let arr = cityList.find((item) => item.bankCode === code);
+      const bankList = text.bankList;
+      let arr = bankList.find((item) => item.bankCode === code);
       // console.log("银行编码对应的银行名称 arr", arr);
-      return arr.bankName;
+      if (arr.bankName != null) {
+        this.bankName = arr.bankName
+      }
+      return this.bankName;
     },
     selectAdapayMember() {
       console.log("this.merchantId", this.merchantId);
+      // this.loading = true;
       let param = {
         merchantId: this.merchantId,
       };
       selectAdapayMember(param).then((response) => {
         console.log("查询结算账户", response);
         this.operationStatus = response.data;
+        this.loading = false;
         // console.log("this.operationStatus", this.operationStatus.bankAcctType);
         // 商家性质：
         if (response.data != null) {
           // 对公返回的结果 商家性质：
           this.merchantNature = this.operationStatus.bankAcctType;
           console.log("对公信息", this.adapayCorpMember);
-          if (response.data.settleAccountList !== null) {
+          if (response.data.settleAccountList != null) {
             // 个人账户
             this.adapayCorpMember = response.data.adapayMember;
             this.settleAccountList = response.data.settleAccountList;
@@ -429,6 +439,7 @@ export default {
           if (response.data.adapayCorpMember != null)
             return (this.adapayCorpMember = response.data.adapayCorpMember);
         }
+        this.loading = false;
       });
     },
     getAdapayBalance() {
@@ -440,12 +451,15 @@ export default {
         this.adapayMember = response.data;
       });
     },
+    // 订单流水请求
     getOrderList() {
+      this.loading = true;
       console.log("this.getOrderParams", this.getOrderParams);
       getOrderReportDetail(this.getOrderParams).then((res) => {
         console.log("获取订单列表res", res);
         this.orderList = res.rows;
         this.orderTotal = res.total;
+        this.loading = false;
         // console.log("this.orderTotal", this.orderTotal);
       });
     },
@@ -531,7 +545,6 @@ export default {
       this.reportQueryParams.pageNum = 1;
       this.reportTotal = 0;
       this.getList();
-      // this.getOrderList();
     },
     defaultDate() {
       //字符串拼接，开始时间，结束时间

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -243,7 +243,7 @@
                             placeholder="请选择"
                         >
                             <el-option
-                                v-for="item in cityList"
+                                v-for="item in bankList"
                                 :key="item.bankCode"
                                 :label="item.bankName"
                                 :value="item.bankCode"
@@ -406,7 +406,7 @@
                     </el-form-item>
                 </el-form>
             </template>
-            <template v-if="adapayCorpMember.auditState === 'E'">
+            <template v-if="adapayCorpMember.auditState === 'E' || adapayCorpMember.auditState === 'D'">
                 <div class="status-card">
                     <div class="status-i">
                         <i class="el-icon-success"></i>
@@ -756,7 +756,7 @@ export default {
             legalCertIdChecked: false, // 身份证长期
             areaList: [],
             bankValue: "",
-            cityList: [], // 银行代码JSON数据
+            bankList: [], // 银行代码JSON数据
             showAdapayCorp: null,
             updateDialog: false,
             adapayCorpRules: {
@@ -1520,7 +1520,7 @@ export default {
     created() {
         this.selectAdapayMember();
         this.jsonHttp();
-        this.cityList = text.cityList;
+        this.bankList = text.bankList;
     },
 };
 </script>

jsowell-ui/src/views/pile/merchant/index.vue

@@ -329,8 +329,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>