Merge branch 'developerA' into developer

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -348,6 +348,12 @@ public class ProductController extends BaseController {
         return ACTIVITY_COUPON_EXP;
     }
 
+    /**
+     * 认证通页面
+     */
+    @GetMapping("/attestation.html")
+    public String getAttestationPath() { return ACTIVITY_ATTESTAION; }
+
     /**
      * H5配套商品页
      */

src/main/resources/static/js/common/serviceapi/pay.service.js

@@ -188,5 +188,17 @@ var PayApi = {
             .then(function(res){
                 callback(res);
             });
+        },
+        PayGetBankCode: function(params, callback){ // 网银银行列表
+            Http.AjaxService({
+                url:'/order/pay/bankcode',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+                .then(function(res){
+                    callback(res);
+                });
         }
 };

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

@@ -16,8 +16,7 @@ var payContainer = new Vue({
             payUserType:'',//网银支付类型
             payLinkTypeText:'',//文案
         },
-        B2BbankData:bank.b2BbankData,// 企业网银
-        B2CbankData:bank.b2CbankData,// 个人网银
+        bankListData:[],
         userName :'',
         goodList:'',
         freight :'',       //运费
@@ -106,7 +105,7 @@ var payContainer = new Vue({
                             case -2:
                                 _self.iconErrorClass = 'offline';
                                 _self.iconErrorText = '订单已通过线下转账方式付款';
-                                _self.iconErrorMsgnone = '不能再使用企业网银支付';
+                                _self.iconErrorMsgnone = '不能再使用网银支付';
                                 break;
                             case -3:
                                 _self.iconErrorClass = 'fail';
@@ -161,6 +160,16 @@ var payContainer = new Vue({
                 }
             })
         },
+        getBankList:function () {// 获取网银支付银行列表
+            var _self = this;
+            PayApi.PayGetBankCode({},function(response){
+                if(response.code == 0){
+                    _self.bankListData = response.data.list;
+                }else{
+                    console.log('获取网银支付银行列表异常')
+                }
+            })
+        },
         PaySubmitFn:function(){//立即支付
             var _self = this;
             if(_self.payInfo.payBankNum == ''){
@@ -307,6 +316,7 @@ 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/static/js/pay/caimei-paycash.js

@@ -15,8 +15,7 @@ var payContainer = new Vue({
             payUserType:'ENTERPRISE',
             payType:'',
         },
-        B2BbankData:bank.b2BbankData,
-        B2CbankData:bank.b2CbankData,
+        bankListData:[],
         methodTab:['线上支付','转账支付'],
         mobileData:[
             {imgUrl:'/img/pay/iconbank-ali@2x.png',bankName:'支付宝支付',bankNum:'ALIPAY'},
@@ -45,9 +44,8 @@ var payContainer = new Vue({
         bankPayLink_url:'',
         orderIdentificationId:'',//订单标识
         receiptStatus:'',
-        invoiceStatus:false,
         isReceiptStatus:false,
-        onlinePayFlag:'',
+        onlinePay:1,
         payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
         productID:'',//发布商品的ID
         is_Wechat_bowcr:false,
@@ -90,13 +88,12 @@ var payContainer = new Vue({
                     _self.payAmount =  (_self.payableAmount - _self.receiptAmount).toFixed(2);//本次支付金额
                     _self.paySuccessCounter = data.order.paySuccessCounter;
                     _self.receiptStatus =  data.order.receiptStatus;
-                    _self.invoiceStatus = data.order.invoiceStatus;
-                    _self.onlinePayFlag = data.order.onlinePayFlag;
+                    _self.onlinePay  = data.onlinePay ;
                     if(_self.receiptAmount>0){
-                        _self.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。';
+                        _self.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。';
                         _self.isReceiptStatus = false;
                     }else{
-                        _self.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。';
+                        _self.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。';
                         _self.isReceiptStatus = true;
                     }
                     _self.isRequest = true;
@@ -106,6 +103,16 @@ var payContainer = new Vue({
                 }
             })
         },
+        getBankList:function () {// 获取网银支付银行列表
+            var _self = this;
+            PayApi.PayGetBankCode({},function(response){
+                if(response.code == 0){
+                    _self.bankListData = response.data.list;
+                }else{
+                    console.log('获取网银支付银行列表异常')
+                }
+            })
+        },
         PayOrderOnLineSwitch:function(){//获取是否可以先上支付
             var _self = this;
             PayApi.PayOrderOnLineSwitch({},function(response){
@@ -131,7 +138,7 @@ var payContainer = new Vue({
                 CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
                 return;
             }
-            if(_self.invoiceStatus){
+            if(_self.onlinePay == 2){
                 _self.layerConfirm();
             }else{
                 if(_self.payInfo.payBankNum == ''){
@@ -251,7 +258,7 @@ var payContainer = new Vue({
                 CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
                 return;
             }
-            if(_self.invoiceStatus){
+            if(_self.onlinePay == 2){
                 _self.layerConfirm();
             }else{
                 if(_self.payInfo.payBankNum == ''){
@@ -259,7 +266,7 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payAmount <= 10){
-                    CAIMEI.dialog('企业网银支付的金额必须大于￥10.00');
+                    CAIMEI.dialog('网银支付的金额必须大于￥10.00');
                     return;
                 }
                 if(_self.pageType === '1'){
@@ -429,7 +436,7 @@ var payContainer = new Vue({
                 CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
                 return;
             }
-            if(_self.invoiceStatus){
+            if(_self.onlinePay == 2){
                 _self.layerConfirm();
             }else{
                 if(_self.payAmount == ''){
@@ -441,7 +448,7 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payAmount <= 10){
-                    CAIMEI.dialog('企业网银支付的金额必须大于￥10.00');
+                    CAIMEI.dialog('网银支付的金额必须大于￥10.00');
                     return;
                 }
 
@@ -554,8 +561,8 @@ var payContainer = new Vue({
         },
         layerConfirm:function(){
             var _self = this;
-            CAIMEI.Alert('本次交易暂不支持线上支付开票,请使用线下转账的方式付款','知道了',true,function () {
-                _self.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。';
+            CAIMEI.Alert('本次交易暂不支持线上支付，请使用线下转账方式付款。','知道了',true,function () {
+                _self.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。';
                 _self.isReceiptStatus = true;
             });
         },
@@ -658,6 +665,7 @@ var payContainer = new Vue({
             // CAIMEI.Storage.removeItem('comboInfo');
             // 设置支付金额
             this.payAmount = _self.toFixedFn(this.comboInfo.price);
+            this.getBankList(); // 获取银行列表
         } else {
             var HrefType = CAIMEI.getUrlParam('type');
             if (HrefType == 'payfirm') {
@@ -668,7 +676,8 @@ var payContainer = new Vue({
                 _self.payInfo.payOrderId = data.data.orderId;
                 _self.orderIdentificationId = '#' + _self.payInfo.payOrderId + '#';
             }
-            _self.infoPayOrderCheckoutCounter();//正常订单初始化
+            this.getBankList(); // 获取银行列表
+            this.infoPayOrderCheckoutCounter();//正常订单初始化
         }
         var viewer = window.navigator.userAgent.toLowerCase();
         if(viewer.match(/MicroMessenger/i) == 'micromessenger'){

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

@@ -154,13 +154,13 @@
             <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.B2bNum" v-for="(item, index) in B2BbankData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
-                        <img :src="item.imgUrl" :alt="item.bankName">
+                    <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)">
+                        <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.B2cNum" v-for="(item, index) in B2CbankData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
-                        <img :src="item.imgUrl" :alt="item.bankName">
+                    <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)">
+                        <img :src="item.bankLogo" :alt="item.bankName">
                     </a>
                 </div>
             </div>

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

@@ -109,21 +109,21 @@
                         </div>
                         <div class="pay-bank"  v-if="mobileTabIndex === 2 && isPC">
                             <div class="bank-list mfw" id="bankContent">
-                                <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in B2BbankData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
-                                    <img :src="item.imgUrl" :alt="item.bankName">
+                                <a href="javascript:void(0);" v-if="item.b2B!=''" class="bank-b mIcon" v-for="(item, index) in bankListData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
+                                    <img :src="item.bankLogo" :alt="item.bankName">
                                 </a>
                             </div>
                         </div>
                         <div class="pay-bank"  v-if="mobileTabIndex === 3 && isPC">
                             <div class="bank-list mfw" id="bankB2CContent">
-                                <a href="javascript:void(0);" class="bank-b mIcon" v-for="(item, index) in B2CbankData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
-                                    <img :src="item.imgUrl" :alt="item.bankName">
+                                <a href="javascript:void(0);" v-if="item.b2C!=''" class="bank-b mIcon" v-for="(item, index) in bankListData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
+                                    <img :src="item.bankLogo" :alt="item.bankName">
                                 </a>
                             </div>
                         </div>
                         <template v-if="pageType != '1'">
                             <div class="pay-link" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
-                                <p v-if="isPC">若您在公司的职位无法直接使用企业网银付款，请点击右侧“复制支付链接”按钮，将该链接发送给公司财务人员进行企业网银付款</p>
+                                <p v-if="isPC">若您在公司的职位无法直接使用网银付款，请点击右侧“复制支付链接”按钮，将该链接发送给公司财务人员进行网银付款</p>
                                 <a href="javascript:void(0);" id="copyLink" @click="copyLinkPaySubmitFn">复制支付链接</a>
                                 <p v-if="!isPC">复制支付链接成功后，将链接发送到电脑端进行付款</p>
                             </div>