支付二维码重定向

src/main/resources/static/js/pay/caimei-hlbpay.js

@@ -14,7 +14,7 @@ var payContainer = new Vue({
             payMobileUrl: '',//二维码生成链接
             payData:{},       //支付数据
             payUserType:'B2B',
-            payType:'',
+            payType:'1',
         },
         iframe:'',
         couponInfo:{},
@@ -121,6 +121,11 @@ var payContainer = new Vue({
                 if(response.code == 0){
                     _self.bankListB2BData = response.data.B2B;
                     _self.bankListB2CData = response.data.B2C;
+                    if(   _self.payInfo.payType == '1'){
+                        _self.payInfo.payBankNum = _self.bankListB2BData[0].b2B;
+                    }else{
+                        _self.payInfo.payBankNum = _self.bankListB2CData[0].b2C;
+                    }
                 }else{
                     console.log('获取网银支付银行列表异常')
                 }

src/main/resources/static/js/pay/caimei-pay.js

@@ -8,7 +8,7 @@ var payContainer = new Vue({
         paymentChannel:'HLB',
         isSubMitStatus:false,
         payInfo:{
-            payBankNum:'ICBC_B2B',//银行网管信息
+            payBankNum:'',//银行网管信息
             payCode:'',//链接状态
             shopOrderId:'',//主订单ID
             payUnpaidAmount:0,//本次支付金额
@@ -18,22 +18,21 @@ var payContainer = new Vue({
             payUserType:'',//网银支付类型
             payLinkTypeText:'',//文案
         },
-        payAmount:0,
         iframe:'',
         bankListB2BData:[],// 企业网银银行列表
         bankListB2CData:[],// 个人网银银行列表
         userName :'',
         goodList:'',
-        balancePayFee:'',//余额抵扣
-        payTotalFee: '',   //合计
-        payableAmount:'',//本次支付金额
-        payment:'', //剩余支付金额
+        totalAmount: '',   //合计
+        payableAmount:'',//剩余支付金额
+        payAmount:'', //本次支付金额
+        obligation:'',// 本次待付金额
+        eachDiscount:'',// 子订单优惠金额
         receiptAmount:'',//已支付金额
         discernReceipt:'',//支付记录
         discernReceiptList:[],//支付记录列表
         orderProductList:[],//商品列表
-        paySuccessCounter:0,
-        tabIndex:0,
+        bankTabIndex:0,
         downHour:'00',//倒计时
         downMinute:'00',//倒计分
         downSecond:'00',//倒计秒
@@ -90,6 +89,7 @@ var payContainer = new Vue({
                     }else{
                         _self.payInfo.payUserType =  _self.payInfo.payLinkType == 1 ? 'ENTERPRISE' : 'USER';
                     }
+                    _self.getBankList();
                     _self.unpaidAmount = _data.orderPayLink.unpaidAmount;
                     _self.type = _data.type;
                     if(_data.code == 0){
@@ -139,26 +139,18 @@ var payContainer = new Vue({
         },
         infoPayOrderCheckoutCounter:function(){//初始化订单数据
             var _self = this;
-            PayApi.PayOrderCheckoutCounter({shopOrderId:_self.payInfo.shopOrderId},function(response){
+            PayApi.PayOrderCheckoutShoporders({shopOrderId:_self.payInfo.shopOrderId},function(response){
                 console.log(response);
                 if(response.code == 0){
                     var data = response.data;
-                    _self.discernReceiptList = data.discernReceipt;
-                    _self.orderProductList = data.orderProductList;
+                    _self.discernReceiptList = data.discernReceipt;// 支付记录
+                    _self.orderProductList = data.orderProductList;// 自订单商品信息
+                    _self.obligation = data.shopOrder.obligation; // 待付金额
+                    _self.eachDiscount = data.shopOrder.eachDiscount; //优惠金额
+                    _self.payableAmount = data.shopOrder.obligation - _self.payInfo.payUnpaidAmount; //剩余支付金额
                     _self.userName =  data.userName;
-                    _self.balancePayFee =  data.order.balancePayFee;
-                    _self.payTotalFee =  data.order.payTotalFee;
-                    _self.receiptAmount=  data.order.receiptAmount;
-                    _self.payableAmount =  _self.payInfo.payUnpaidAmount;
-                    _self.organizeId = data.order.organizeId;
-                    _self.orderNo = data.order.orderNo;
-                    _self.orderTotalFee = data.order.orderTotalFee;
-                    if(data.order.status == '7'){
-                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.payableAmount);
-                    }else{
-                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.receiptAmount - _self.payableAmount - _self.balancePayFee);
-                    }
-                    _self.paySuccessCounter = data.order.paySuccessCounter;
+                    _self.totalAmount =  data.shopOrder.totalAmount; // 子订单金额合计
+                    _self.receiptAmount=  data.shopOrder.receiptAmount; // 已支付金额
                     _self.isRequest = true;
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -171,6 +163,11 @@ var payContainer = new Vue({
                 if(response.code == 0){
                     _self.bankListB2BData = response.data.B2B;
                     _self.bankListB2CData = response.data.B2C;
+                    if( _self.payInfo.payLinkType == 1){
+                        _self.payInfo.payBankNum = _self.bankListB2BData[0].b2B;
+                    }else{
+                        _self.payInfo.payBankNum = _self.bankListB2CData[0].b2C;
+                    }
                 }else{
                     console.log('获取网银支付银行列表异常')
                 }
@@ -211,8 +208,8 @@ var payContainer = new Vue({
                 window.location.href = '/pay/success.html?pageType='+ pageType +'&type='+ type +'&payAmount=' + _self.payInfo.payUnpaidAmount;
             });
         },
-        changeTab:function(index,item){// 选择银行
-            this.tabIndex = index;
+        checkBankPay:function(index,item){// 选择银行
+            this.bankTabIndex = index;
             if( this.payInfo.payLinkType == 1){
                 this.payInfo.payBankNum = item.b2B;
             }else{
@@ -285,7 +282,6 @@ var payContainer = new Vue({
     mounted: function () {
         var _self = this;
         _self.payInfo.payLinkLogo= CAIMEI.getUrlParam('linkLogo');
-        _self.getBankList();
         _self.LinkInfoOrderBank(_self.payInfo.payLinkLogo);
 
     }

src/main/resources/templates/pay/caimei-pay.html

@@ -29,55 +29,55 @@
                 </div>
             </div>
             <!-- 维沙 -->
-            <template v-if="organizeId === 3">
-                <div class="pay-goods">
-                    <div class="good-top">
-                        <div class="good-top-inner ws">
-                            <div class="ws-count-price"><span>支付总额：</span><span class="red">￥{{unpaidAmount | NumFormat}}</span></div>
-                            <div>
-                                <div class="ws-bot-right">
-                                    <div class="bot-num"><span>订单号：</span><span class="p">{{orderNo}}</span></div>
-                                    <div class="bot-num"><span>运费：</span><span class="p" id="freight">{{freight}}</span></div>
-                                    <div class="bot-num"><span>经理折扣：</span><span class="p" id="discountFee">￥{{discountFee | NumFormat}}</span></div>
-                                    <div class="bot-num"><span>订单金额：</span><span class="red" id="payTotalFee">￥{{unpaidAmount | NumFormat}}</span></div>
-                                    <div style="clear:both"></div>
-                                </div>
-                                <div class="bot-left" id="goodSlideToggle"@click="slideToggleContent">
-                                    <i class="icon-down" :class="isSiled ? 'roter' : '' "></i>
-                                    <p id="iconText">{{isSiled ? '点击箭头收起订单商品' :'点击箭头展开订单商品'}}</p>
-                                </div>
-                                <div style="clear:both"></div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="good-main" v-if="isSiled">
-                        <div class="list-title">
-                            <div class="t-li"><p>序号</p></div>
-                            <div class="t-li"><p>商品图片</p></div>
-                            <div class="t-li"><p>商品名称</p></div>
-                            <div class="t-li"><p>单价</p></div>
-                            <div class="t-li"><p>数量</p></div>
-                            <div class="t-li"><p>总价</p></div>
-                        </div>
-                        <div class="list-container ws-list-container" id="goodsContainer">
-                            <div class="list-main" v-for="(item, index) in orderProductList" :key="index" :class="{'active':index%2 != 1}">
-                                <div class="t-li"><p>{{index+1}}</p></div>
-                                <div class="t-li"><span class="tag" v-if="item.productType === 1 || item.productType === 2">赠品</span>
-                                    <img :src="item.image" :alt="item.name">
-                                </div>
-                                <div class="t-li"><p>{{item.name}}</p></div>
-                                <div class="t-li"><p>￥{{item.price | NumFormat}}</p></div>
-                                <div class="t-li"><p>{{item.num}}</p></div>
-                                <div class="t-li"><p>￥{{item.totalFee | NumFormat}}</p></div>
-                            </div>
-                        </div>
-                        <div class="list-total"> <span>合计：</span><span class="red">￥{{orderTotalFee | NumFormat}}</span></div>
-                        <div style="clear: both"></div>
-                    </div>
-                </div>
-            </template>
+<!--            <template v-if="organizeId === 3">-->
+<!--                <div class="pay-goods">-->
+<!--                    <div class="good-top">-->
+<!--                        <div class="good-top-inner ws">-->
+<!--                            <div class="ws-count-price"><span>支付总额：</span><span class="red">￥{{unpaidAmount | NumFormat}}</span></div>-->
+<!--                            <div>-->
+<!--                                <div class="ws-bot-right">-->
+<!--                                    <div class="bot-num"><span>订单号：</span><span class="p">{{orderNo}}</span></div>-->
+<!--                                    <div class="bot-num"><span>运费：</span><span class="p" id="freight">{{freight}}</span></div>-->
+<!--                                    <div class="bot-num"><span>经理折扣：</span><span class="p" id="discountFee">￥{{discountFee | NumFormat}}</span></div>-->
+<!--                                    <div class="bot-num"><span>订单金额：</span><span class="red" id="payTotalFee">￥{{unpaidAmount | NumFormat}}</span></div>-->
+<!--                                    <div style="clear:both"></div>-->
+<!--                                </div>-->
+<!--                                <div class="bot-left" id="goodSlideToggle"@click="slideToggleContent">-->
+<!--                                    <i class="icon-down" :class="isSiled ? 'roter' : '' "></i>-->
+<!--                                    <p id="iconText">{{isSiled ? '点击箭头收起订单商品' :'点击箭头展开订单商品'}}</p>-->
+<!--                                </div>-->
+<!--                                <div style="clear:both"></div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="good-main" v-if="isSiled">-->
+<!--                        <div class="list-title">-->
+<!--                            <div class="t-li"><p>序号</p></div>-->
+<!--                            <div class="t-li"><p>商品图片</p></div>-->
+<!--                            <div class="t-li"><p>商品名称</p></div>-->
+<!--                            <div class="t-li"><p>单价</p></div>-->
+<!--                            <div class="t-li"><p>数量</p></div>-->
+<!--                            <div class="t-li"><p>总价</p></div>-->
+<!--                        </div>-->
+<!--                        <div class="list-container ws-list-container" id="goodsContainer">-->
+<!--                            <div class="list-main" v-for="(item, index) in orderProductList" :key="index" :class="{'active':index%2 != 1}">-->
+<!--                                <div class="t-li"><p>{{index+1}}</p></div>-->
+<!--                                <div class="t-li"><span class="tag" v-if="item.productType === 1 || item.productType === 2">赠品</span>-->
+<!--                                    <img :src="item.image" :alt="item.name">-->
+<!--                                </div>-->
+<!--                                <div class="t-li"><p>{{item.name}}</p></div>-->
+<!--                                <div class="t-li"><p>￥{{item.price | NumFormat}}</p></div>-->
+<!--                                <div class="t-li"><p>{{item.num}}</p></div>-->
+<!--                                <div class="t-li"><p>￥{{item.totalFee | NumFormat}}</p></div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                        <div class="list-total"> <span>合计：</span><span class="red">￥{{orderTotalFee | NumFormat}}</span></div>-->
+<!--                        <div style="clear: both"></div>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </template>-->
             <!--购买会员-->
-            <template v-else-if="type === 2">
+            <template v-if="type === 2">
                 <div class="pay-svip">
                     <div class="pay-svip-title">购买超级会员</div>
                     <div class="content">
@@ -95,9 +95,8 @@
                     <div class="good-top">
                         <div class="good-top-inner">
                             <div class="bot-right">
-                                <div class="bot-num"><span>优惠：</span><span class="p" id="discountFee">￥{{discountFee | NumFormat}}</span></div>
-                                <div class="bot-num"><span>余额抵扣：</span><span class="p" id="balancePayFee">￥{{balancePayFee | NumFormat}}</span></div>
-                                <div class="bot-num"><span>合计：</span><span class="red" id="payTotalFee">￥{{payTotalFee | NumFormat}}</span></div>
+                                <div class="bot-num"><span>优惠：</span><span class="p" id="eachDiscount">￥{{eachDiscount | NumFormat}}</span></div>
+                                <div class="bot-num"><span>合计：</span><span class="red" id="totalAmount">￥{{totalAmount | NumFormat}}</span></div>
                             </div>
                             <div class="bot-left" id="goodSlideToggle"@click="slideToggleContent">
                                 <i class="icon-down" :class="isSiled ? 'roter' : '' "></i>
@@ -117,7 +116,7 @@
                         <div class="list-container" id="goodsContainer">
                             <div class="list-main" v-for="(item, index) in orderProductList" :key="index" :class="{'active':index%2 != 1}">
                                 <div class="t-li"><p>{{index+1}}</p></div>
-                                <div class="t-li"><span class="tag" v-if="item.productType === 1 || item.productType === 2">赠品</span>
+                                <div class="t-li"><span class="tag" v-if="item.giftType === 1 || item.giftType === 2">赠品</span>
                                     <img :src="item.image" :alt="item.name">
                                 </div>
                                 <div class="t-li"><p>{{item.name}}</p></div>
@@ -130,8 +129,8 @@
                 </div>
                 <div class="pay-ment">
                     <div class="pay-message">
-                        <div class="message-num"><span>本次支付金额：</span><span class="red" id="payableAmount">￥{{payableAmount | NumFormat}}</span></div>
-                        <div class="message-num"><span>剩余支付金额：</span><span class="red" id="payment">￥{{payment | NumFormat}}</span></div>
+                        <div class="message-num"><span>本次支付金额：</span><span class="red" id="payAmount">￥{{payAmount | NumFormat}}</span></div>
+                        <div class="message-num"><span>剩余支付金额：</span><span class="red" id="payableAmount">￥{{payableAmount | NumFormat}}</span></div>
                         <div class="message-num"><span>已支付：</span><span class="red" id="receiptAmount">￥{{receiptAmount | NumFormat}}</span></div>
                     </div>
                     <div class="pay-record">
@@ -153,12 +152,12 @@
             <div class="pay-bank">
                 <div class="bank-title">请选择以下一家银行进行付款<span class="color">(请在倒计时时间内使用<span class="big"> {{ payInfo.payLinkTypeText }} </span>完成本次支付)</span></div>
                 <div class="bank-list" id="bankContent" v-if="payInfo.payLinkType == 1">
-                    <a href="javascript:void(0);" v-if="item.b2B && item.b2B!=''" v-for="(item, index) in bankListData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
+                    <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in bankListB2BData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
                         <img :src="item.bankLogo" :alt="item.bankName">
                     </a>
                 </div>
                 <div class="bank-list" id="bankContentC" v-if="payInfo.payLinkType == 2">
-                    <a href="javascript:void(0);" v-if="item.b2C && item.b2C!=''" v-for="(item, index) in bankListData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
+                    <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in bankListB2CData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
                         <img :src="item.bankLogo" :alt="item.bankName">
                     </a>
                 </div>