From cf21a9a237a550d5ca0d2ec558b0a15de499e6a7 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 26 Aug 2023 10:30:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderBasicInfoServiceImpl.java     | 13 ++++++++++---
 .../main/java/com/jsowell/pile/util/SnUtils.java    |  1 -
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 0ef017b25..a0c9dc756 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -735,8 +735,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      * 清分账单生成逻辑改为当天第一笔结算后就新建，后面的产生的订单，追加更新
      */
     private OrderSettleResult orderPaymentSettlement(OrderBasicInfo orderBasicInfo) {
-        String appId = "";
-        AdapayMemberAccount adapayMemberAccount = null;
+        // 获取一级运营商appId
+        String appId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId());
+        if (StringUtils.isBlank(appId)) {
+            return null;
+        }
+        // 获取结算账户信息
+        AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(orderBasicInfo.getMerchantId());
+        if (adapayMemberAccount == null) {
+            return null;
+        }
         OrderSettleResult orderSettleResult = null;
         try {
             if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
@@ -1195,7 +1203,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 
     /**
      * 余额支付订单，使用余额分账
-     *
      * @param orderBasicInfo
      * @param adapayMemberAccount
      * @return
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java
index 54f67961d..f1d3eb788 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java
@@ -50,7 +50,6 @@ public class SnUtils {
 				long pileSnNum = Long.parseLong(StringUtils.substring(pileSn, 4, pileSn.length()));
 				// 再将该值存入数据库
 				redisCache.setCacheObject(key, pileSnNum);
-
 			}
 			Long increNum = redisCache.increment(key, 1);
 			// 年份

From 1e094e4d0f507d6335b6cfb50b1fce26ddaa3478 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Sat, 26 Aug 2023 15:38:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/components/walletSummary.vue     | 141 +++++++++++-------
 1 file changed, 83 insertions(+), 58 deletions(-)

diff --git a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
index b8a22e926..20f94f700 100644
--- a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
@@ -3,30 +3,35 @@
         <div class="main">
             <div class="main-right">
                 <p class="center">账户余额(元)</p>
-                <p class="center number">{{adapayMember.acctBalance}}</p>
-                <p class="center">注:
+                <p class="center number">{{ adapayMember.acctBalance }}</p>
+                <p class="center">
+                    注:
                     <span class="text">账户余额 = 可用余额 + 冻结余额</span>
                 </p>
             </div>
             <div class="main-right">
                 <p class="center">可用余额(元)</p>
-                <p class="center number">{{adapayMember.avlBalance}}</p>
-                <el-button type="primary" style="display:block;margin:0 auto" v-if="adapayMember.avlBalance > withdrawalFee" @click="dialogVisible = true">提现申请</el-button>
-                <p class="center" v-else>注:
-                    <span class="text">该余额大于{{withdrawalFee}}元时，才可发起取现</span>
+                <p class="center number">{{ adapayMember.avlBalance }}</p>
+                <el-button type="primary" style="display: block; margin: 0 auto"
+                    v-if="adapayMember.avlBalance > withdrawalFee" @click="dialogVisible = true">提现申请</el-button>
+                <p class="center" v-else>
+                    注:
+                    <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
                 </p>
             </div>
             <div class="main-right">
                 <p class="center">冻结金额(元)</p>
-                <p class="center number">{{adapayMember.frzBalance}}</p>
-                <p class="center ">注:
+                <p class="center number">{{ adapayMember.frzBalance }}</p>
+                <p class="center">
+                    注:
                     <span class="text">当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span>
                 </p>
             </div>
             <div class="main-right">
                 <p class="center">昨日日终余额(元)</p>
-                <p class="center number">{{adapayMember.lastAvlBalance}}</p>
-                <p class="center">注:
+                <p class="center number">{{ adapayMember.lastAvlBalance }}</p>
+                <p class="center">
+                    注:
                     <span class="text">一</span>
                 </p>
             </div>
@@ -110,37 +115,38 @@
             </el-tab-pane>
             <el-tab-pane label="订单流水" name="second">订单流水</el-tab-pane>
         </el-tabs> -->
-        <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%" :before-close="handleClose">
+        <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
             温馨提示
-            <div style="font-size:12px;color:gray">
+            <div style="font-size: 12px; color: gray">
                 <p>1.提现将在3个工作日内审核到账,节假日审核顺延</p>
                 <p>2.部分流量方的充电订单存在账期,需要一定周期后才开始执行清分</p>
                 <p>3.提现为银行自动付款,根据银行要求会收取手续费,请知悉</p>
-                <p>4.订单收入包含了第三方的分成收入金额,已自动扣除万车充分成金额</p>
             </div>
-            <p>可提现（元）：
-                <span class="number">{{adapayMember.avlBalance}}</span>
+            <p>
+                可提现（元）：
+                <span class="number">{{ adapayMember.avlBalance }}</span>
             </p>
-            <p>手续费（元）：
-                <span class="number">{{withdrawalFee.toFixed(2)}}</span>
+            <p>
+                手续费（元）：
+                <span class="number">{{ withdrawalFee.toFixed(2) }}</span>
             </p>
-             <p>实际到账（元）：
-                <span class="number">{{adapayMember.avlBalance -withdrawalFee}}</span>
+            <p>
+                实际到账（元）：
+                <span class="number">{{ adapayMember.avlBalance - withdrawalFee }}</span>
             </p>
             <span slot="footer" class="dialog-footer">
-              <el-button @click="dialogVisible = false">取 消</el-button>
-               <el-button type="primary" @click="submit">提交</el-button>
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="submit">提交</el-button>
             </span>
         </el-dialog>
+        <!-- <button @click="handleClose">aaaaa</button> -->
     </div>
 </template>
 
 <script>
-import {
-    queryAdapayAccountBalance,withdraw
-} from "@/api/adapayMember/adapayMember";
+import { queryAdapayAccountBalance, withdraw } from "@/api/adapayMember/adapayMember";
 export default {
-  props:['merchantId'],
+    props: ["merchantId"],
     data() {
         return {
             activeName: "first",
@@ -148,19 +154,30 @@ export default {
             buttonBoolean: false,
             //图标，可根据自己的需求匹配
             icon: "el-icon-caret-bottom",
-            createTimeRange:'',
-            adapayMember:{},
+            createTimeRange: "",
+            adapayMember: {},
             dialogVisible: false,
-            withdrawalFee: 5
+            withdrawalFee: 5,
         };
     },
     methods: {
-        handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {});
+        handleClose() {
+            this.$confirm("确认提交？")
+                .then((_) => {
+                    let params = {
+                        merchantId: this.merchantId,
+                        cashAmt: this.adapayMember.avlBalance,
+                    };
+                    withdraw(params).then((response) => {
+                        console.log("res 提现金额", response);
+                        if (response.code !== 200) return this.$modal.msgError(response.msg);
+                        this.$modal.msgSuccess("操作成功");
+                        this.getList();
+                    });
+
+                    this.dialogVisible = false;
+                })
+                .catch((_) => { });
         },
         handleClick(tab, event) {
             console.log(tab, event);
@@ -177,18 +194,18 @@ export default {
             }
         },
         // 提现弹窗确定事件
-        submit(){
-            let params = {
-                merchantId: this.merchantId,
-                cashAmt:this.adapayMember.avlBalance
-            }
-            withdraw(params).then((response) =>{
-                console.log('res 提现金额',response);
-                if(response.code !== 200) return this.$modal.msgError(response.msg);
-                this.$modal.msgSuccess("操作成功");
-                this.getList()
-            })
-            this.dialogVisible = false
+        submit() {
+            // let params = {
+            //     merchantId: this.merchantId,
+            //     cashAmt: this.adapayMember.avlBalance,
+            // };
+            // withdraw(params).then((response) => {
+            //     console.log("res 提现金额", response);
+            //     if (response.code !== 200) return this.$modal.msgError(response.msg);
+            //     this.$modal.msgSuccess("操作成功");
+            //     this.getList();
+            // });
+            this.handleClose();
         },
         getList() {
             console.log("this.merchantId", this.merchantId);
@@ -197,49 +214,57 @@ export default {
             };
             queryAdapayAccountBalance(param).then((response) => {
                 console.log("查询 queryAdapayAccountBalance", response);
-                 this.adapayMember = response.data;
+                this.adapayMember = response.data;
             });
         },
-
     },
-    created () {
-      this.getList()
-    }
+    created() {
+        this.getList();
+    },
 };
 </script>
 <style lang="scss" scoped>
-.number{
-    color:#50bfff;font-size:20px;font-weight: bolder;
+.number {
+    color: #50bfff;
+    font-size: 20px;
+    font-weight: bolder;
 }
-.center{
+
+.center {
     text-align: center;
 }
-.text{
+
+.text {
     font-size: 12px;
     color: red;
 }
+
 .main {
     display: flex;
     justify-content: space-between;
+
     // align-items: baseline;
-    .main-right{
+    .main-right {
         width: 310px;
         margin-right: 20px;
         border: 1px solid #e6ebf5;
         border-radius: 10px;
         padding: 10px;
-        transition: all .2s linear;
+        transition: all 0.2s linear;
     }
 }
-.main-right:hover{
+
+.main-right:hover {
     box-shadow: 0 0 5px 3px #999;
 }
+
 .bord {
     position: relative;
     top: 68px;
     height: 60px;
     border-left: 1px solid gray;
 }
+
 .card {
     // width: 230px;
     padding: 10px;