增加优化线上支付

src/main/resources/static/css/user-center/order/detail.css

@@ -59,8 +59,8 @@ li{list-style:none}
     .order-container .section-shopinfo .product-t .price>p .red{color: #FF2A2A;}
     .price-total{padding-top:20px;text-align:right;color:#22272e;font-size:16px}
     .price-total span{color:#f94b4b}
-    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: 72px;box-sizing: border-box;color: #22272E;background-color: #FFFAF8;padding: 8px 20px;margin-top: 5px;}
-    .order-container .section-shopinfo .shopinfo-bott p{display:inline-block;margin-right:50px;line-height: 28px;color: #627386;font-size: 14px;float: left;}
+    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;box-sizing: border-box;color: #22272E;background-color: #FFFAF8;padding: 8px 20px;margin-top: 5px;}
+    .order-container .section-shopinfo .shopinfo-bott p{display:inline-block;margin-right:50px;line-height: 34px;color: #627386;font-size: 14px;float: left;}
     .order-container .section-shopinfo .shopinfo-bott .red{color: #f94b4b;}
     .order-container .section-shopinfo .shopinfo-bott .org{color: #e15616;}
     .order-container .section-shopinfo .shopinfo-bott .none{color:#22272e;}

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

@@ -335,9 +335,7 @@ var payContainer = new Vue({
                     CAIMEI.dialog('网银支付的金额必须大于￥12.00');
                     return;
                 }
-
                 var params = {};
-
                 if(_self.pageType == 2){
                     params = {
                         unpaidAmount:_self.payAmount,
@@ -351,17 +349,7 @@ var payContainer = new Vue({
                         payType:_self.payInfo.payType
                     }
                 }
-                PayApi.PayOrderPayLink(params,function(response){
-                        _self.bankPayLink_url = response.data;
-                        var oInput = document.createElement("textarea");
-                        oInput.value = _self.bankPayLink_url;
-                        document.body.appendChild(oInput);
-                        oInput.select(); // 选择对象
-                        document.execCommand("Copy"); // 执行浏览器复制命令
-                        document.body.removeChild(oInput);
-                        CAIMEI.dialog('复制成功');
-                    }
-                )
+                _self.hlb_CopyLinkPaySubmitFn(params)
             }
         },
         copyOrderBtnSubmitFn:function(){//复制订单标识

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

@@ -3,7 +3,9 @@
  */
 var payContainer = new Vue({
     el:"#payContainer",
+    mixins: [hlbPayMixin,mhPayMixin],
     data: {
+        paymentChannel:'HLB',
         isSubMitStatus:false,
         payInfo:{
             payBankNum:'ICBC_B2B',//银行网管信息
@@ -16,6 +18,8 @@ var payContainer = new Vue({
             payUserType:'',//网银支付类型
             payLinkTypeText:'',//文案
         },
+        payAmount:0,
+        iframe:'',
         bankListData:[],// 银行列表
         userName :'',
         goodList:'',
@@ -78,11 +82,15 @@ var payContainer = new Vue({
                     var _data = response.data;
                     console.log(_data);
                     _self.payInfo.payOrderId = _data.orderPayLink.orderId;
-                    _self.payInfo.payUnpaidAmount = _data.orderPayLink.unpaidAmount;
+                    _self.payInfo.payUnpaidAmount = _self.payAmount = _data.orderPayLink.unpaidAmount;
                     _self.payInfo.payTime = decodeURI(_data.time);
                     _self.payInfo.payLinkType = _data.orderPayLink.payType;
                     _self.payInfo.payLinkTypeText =  _self.payInfo.payLinkType == 1 ? '企业网银' : '个人网银';
-                    _self.payInfo.payUserType =  _self.payInfo.payLinkType == 1 ? 'ENTERPRISE' : 'USER';
+                    if(_self.paymentChannel == 'HLB'){
+                        _self.payInfo.payUserType =  _self.payInfo.payLinkType == 1 ? 'B2B' : 'B2C';
+                    }else{
+                        _self.payInfo.payUserType =  _self.payInfo.payLinkType == 1 ? 'ENTERPRISE' : 'USER';
+                    }
                     _self.unpaidAmount = _data.orderPayLink.unpaidAmount;
                     _self.type = _data.type;
                     if(_data.code == 0){
@@ -179,57 +187,20 @@ var payContainer = new Vue({
             if (_self.type === 2){
                 // 支付超级会员
                 console.log('支付超级会员');
-                var params = {
-                    bankCode: this.payInfo.payBankNum,
-                    returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                    userType: _self.payInfo.payUserType,
-                    vipRecordId: _self.vipRecordId,
-                };
-                _self.PayVipPcMallPay(params);
+                if(this.paymentChannel == 'HLB'){
+                    _self.hlb_PayVipPcMallPay();
+                }else{
+                    _self.mh_PayVipPcMallPay();
+                }
             }else {
                 // 普通订单
                 console.log('支付普通订单');
-                var params = {
-                    payWay: 'UNIONPAY',
-                    payAmount: _self.payInfo.payUnpaidAmount * 100,
-                    bankCode: _self.payInfo.payBankNum,
-                    returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
-                    orderId: _self.payInfo.payOrderId,
-                    userType: _self.payInfo.payUserType
-                };
-                _self.PayOrderPcMallPay(params);
-            }
-        },
-        // 网银支付超级会员
-        PayVipPcMallPay: function(params){
-            var _self = this;
-            _self.isSubMitStatus=true;
-            PayApi.PayVipPcMallPay(params, function(response){
-                if (response.code == 0) {
-                    _self.isPayAlert = true;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
-                    _self.isSubMitStatus = false;
-                } else {
-                    CAIMEI.Alert(response.msg, '确定', false);
-                    _self.isSubMitStatus = false;
-                }
-            });
-        },
-        PayOrderPcMallPay:function(params){//订单网银支付请求
-            var _self = this;
-            _self.isSubMitStatus=true;
-            PayApi.PayOrderPcMallPay(params,function(response){
-                if(response.code == 0){
-                    _self.isPayAlert = true;
-                    _self.mbOrderId = response.data.data.mbOrderId;
-                    window.open(response.data.data.payUrl);
-                    _self.isSubMitStatus=false;
+                if(this.paymentChannel == 'HLB'){
+                    _self.hlb_PayOrderPcMallPay();
                 }else{
-                    CAIMEI.Alert(response.msg,'确定',false);
-                    _self.isSubMitStatus=false;
+                    _self.mh_PayOrderPcMallPay();
                 }
-            })
+            }
         },
         RefreshBody:function(){//刷新弹窗
             var _self = this;

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

@@ -365,17 +365,7 @@ var payContainer = new Vue({
                         payType:_self.payInfo.payType
                     }
                 }
-                PayApi.PayOrderPayLink(params,function(response){
-                        _self.bankPayLink_url = response.data;
-                        var oInput = document.createElement("textarea");
-                        oInput.value = _self.bankPayLink_url;
-                        document.body.appendChild(oInput);
-                        oInput.select(); // 选择对象
-                        document.execCommand("Copy"); // 执行浏览器复制命令
-                        document.body.removeChild(oInput);
-                        CAIMEI.dialog('复制成功');
-                    }
-                )
+                _self.mh_CopyLinkPaySubmitFn(params)
             }
         },
         copyOrderBtnSubmitFn:function(){//复制订单标识

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

@@ -4,6 +4,7 @@
 var payContainer = new Vue({
     el:"#payContainer",
     data: {
+        payAmount:0,
         loginLoading:true,
         isRequest:false,
         orderIdentificationId:'',
@@ -28,6 +29,7 @@ var payContainer = new Vue({
                     // console.log(response);
                     var data = response.data;
                     _self.orderNo = data.order.orderNo;
+                    _self.payAmount = data.order.payableAmount-data.order.receiptAmount;
                     _self.paySuccessCounter = data.order.paySuccessCounter;
                     _self.loginLoading = false;
                     _self.isRequest = true;

src/main/resources/static/js/pay/mixin/hlb_payMixin.js

@@ -14,7 +14,7 @@ var hlbPayMixin = function () {// 合利宝支付渠道
 					userType:_this.payInfo.payUserType
 				};
 				_this.isSubMitStatus=true;
-				console.log('正常订单网银支付通道',params)
+				console.log('正常订单合利宝网银支付通道',params)
 				PayApi.PayOrderPcMallPay(params,function(response){
 					if(response.code == 0){
 						// _this.isPayAlert = true;
@@ -332,6 +332,21 @@ var hlbPayMixin = function () {// 合利宝支付渠道
 					_this.isPayAlert = true;
 				}
 			},
+			hlb_CopyLinkPaySubmitFn:function (params) {
+				var _this = this;
+				console.log('合利宝支付链接');
+				PayApi.PayOrderPayLink(params,function(response){
+						_self.bankPayLink_url = response.data;
+						var oInput = document.createElement("textarea");
+						oInput.value = _this.bankPayLink_url;
+						document.body.appendChild(oInput);
+						oInput.select(); // 选择对象
+						document.execCommand("Copy"); // 执行浏览器复制命令
+						document.body.removeChild(oInput);
+						CAIMEI.dialog('复制成功');
+					}
+				)
+			}
 		}
 	};
 }();

src/main/resources/static/js/pay/mixin/mh_payMixin.js

@@ -33,6 +33,7 @@ var mhPayMixin = function () {// 米花支付渠道
 					userType:_this.payInfo.payUserType
 				};
 				_this.isSubMitStatus=true;
+				console.log('正常订单米花网银支付通道',params)
 				PayApi.PayOrderPcMallPay(params,function(response){
 					if(response.code == 0){
 						_this.isPayAlert = true;
@@ -334,7 +335,21 @@ var mhPayMixin = function () {// 米花支付渠道
 					_this.isPayAlert = true;
 				}
 			},
-
+			mh_CopyLinkPaySubmitFn:function (params) {
+				var _this = this;
+				console.log('米花支付链接');
+				PayApi.PayOrderPayLink(params,function(response){
+						_this.bankPayLink_url = response.data;
+						var oInput = document.createElement("textarea");
+						oInput.value = _this.bankPayLink_url;
+						document.body.appendChild(oInput);
+						oInput.select(); // 选择对象
+						document.execCommand("Copy"); // 执行浏览器复制命令
+						document.body.removeChild(oInput);
+						CAIMEI.dialog('复制成功');
+					}
+				)
+			}
 		}
 	};
 }();

src/main/resources/static/js/user-center/order/detail.js

@@ -163,27 +163,6 @@ var orderPage = new Vue({
                 })
             })
         },
-        showModelTypePop: function(){
-            var _self = this;
-            CAIMEI.Popup({
-                content: '<div class="payAlert">' +
-                           '<p>您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解</p>' +
-                           '<p>待付金额：<em>￥'+toFloat(_self.orderInfo.pendingPayments)+'</em></p>' +
-                           '<ul><li>开户行：中信银行（深圳泰然支行）</li>' +
-                                '<li>银行卡号：6217 6803 0362 0897</li>' +
-                                '<li>户名：周仁声</li>' +
-                                '<li>订单标识：<em class="no">'+_self.orderIdentificationId+'</em><em class="copy">复制</em></li></ul>' +
-                           '<p><i>请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</i></p>' +
-                         '</div>',
-                confitmBtnText: '确定',
-                cancelBtnText: '关闭'
-            },function(){
-                // 确定
-                _self.hidePaymentConfirm();
-            },function(){
-                // 关闭
-            });
-        },
         hanldPayOrderFn:function(){//支付订单
             var _self = this;
             OrderApi.OrderPaymentValidation({orderId:_self.orderId},function(r){
@@ -225,7 +204,7 @@ var orderPage = new Vue({
                         default:
                             if(r.data.onlinePayFlag == 1){
                                 _self.modelType = 3;
-                                _self.showModelTypePop();
+                                window.location.href = '/pay/caimei-payunder.html?orderId='+_self.orderId;
                             }else{
                                 window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.orderId;
                             }
@@ -244,7 +223,7 @@ var orderPage = new Vue({
                     } else {
                         if (_self.orderInfo.onlinePayFlag === 1) {
                             _self.modelType = 3;
-                            _self.showModelTypePop();
+                            window.location.href = '/pay/caimei-payunder.html?orderId='+_self.orderId;
                         } else {
                             window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.orderId;
                         }
@@ -258,7 +237,7 @@ var orderPage = new Vue({
             var _self = this;
             if(_self.orderInfo.onlinePayFlag == 1){
                 _self.modelType = 3;
-                _self.showModelTypePop();
+                window.location.href = '/pay/caimei-payunder.html?orderId='+_self.orderId;
             }else{
                 window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.orderId;
             }

src/main/resources/static/js/user-center/order/list.js

@@ -238,27 +238,6 @@ var orderPage = new Vue({
         hanldQueryExpressFn:function(orderId){//查看物流
            window.location.href='/user/order/logistics.html?orderId='+orderId;
         },
-        showModelTypePop: function(){
-            var _self = this;
-            CAIMEI.Popup({
-                content: '<div class="payAlert">' +
-                           '<p>您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解</p>' +
-                           '<p>待付金额：<em>￥'+toFloat(this.payModelData.pendingPayments)+'</em></p>' +
-                           '<ul><li>开户行：中信银行（深圳泰然支行）</li>' +
-                                '<li>银行卡号：6217 6803 0362 0897</li>' +
-                                '<li>户名：周仁声</li>' +
-                                '<li>订单标识：<em class="no">'+this.orderIdentificationId+'</em><em class="copy">复制</em></li></ul>' +
-                           '<p><i>请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</i></p>' +
-                         '</div>',
-                confitmBtnText: '确定',
-                cancelBtnText: '关闭'
-            },function(){
-                // 确定
-                _self.hidePaymentConfirm();
-            },function(){
-                // 关闭
-            });
-        },
         hanldPayOrderFn:function(order,orderId){//支付订单
             var _self = this;
             _self.hanldOrderData = order;
@@ -302,7 +281,7 @@ var orderPage = new Vue({
                         default:
                             if(r.data.onlinePayFlag == 1){
                                 _self.modelType = 3;
-                                _self.showModelTypePop();
+                                window.location.href = '/pay/caimei-payunder.html?orderId='+orderId;
                             }else{
                                 window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+orderId;
                             }
@@ -321,7 +300,7 @@ var orderPage = new Vue({
                     } else {
                         if (response.data.order.onlinePayFlag === 1) {
                             _self.modelType = 3;
-                            _self.showModelTypePop();
+                            window.location.href = '/pay/caimei-payunder.html?orderId='+_self.hanldOrderData.orderId;
                         } else {
                             window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
                         }
@@ -333,9 +312,9 @@ var orderPage = new Vue({
         },
         hanldCancelConfirm:function(){//不使用余额抵扣直接跳转收银台
             var _self = this;
-            if(_self.hanldOrderData.onlinePayFlag == 1){
+            if(_self.hanldOrderData.onlinePayFlag == 2){
                 _self.modelType = 3;
-                _self.showModelTypePop();
+                window.location.href = '/pay/caimei-payunder.html?orderId='+_self.hanldOrderData.orderId;
             }else{
                 window.location.href = '/pay/caimei-hlbpay.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
             }

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

@@ -163,6 +163,9 @@
                         <img :src="item.bankLogo" :alt="item.bankName">
                     </a>
                 </div>
+                <template>
+                    <div class="iframe" v-html="iframe" style="display: none;"></div>
+                </template>
             </div>
         </div>
         <div class="pay-button-main">
@@ -199,6 +202,8 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/qrcode.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-bank.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/mixin/hlb_payMixin.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/mixin/mh_payMixin.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-pay.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -24,7 +24,7 @@
             <div class="pay-title">提示：本次交易暂不支持线上支付，请使用线下转账方式付款。</div>
             <div class="pay-amount">
                 <p>待付金额：</p>
-                <h1>￥100000.00</h1>
+                <h1>￥{{ payAmount | NumFormat }}</h1>
             </div>
             <div class="pay-bank">
                 <div class="pay-bank-content">