网银支付修改

src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-t.caimei365.com
+  spiServer: https://spi-b.caimei365.com
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

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

@@ -11,13 +11,13 @@ var payContainer = new Vue({
             PAY_UNPAIDAMOUNT: '', //待支付金额
             PAY_PAYAMOUNT: 0,//本次支付金额
             PAY_MOBILE_URL: '',//二维码生成链接
-            PAY_DATA:{}       //支付数据
+            PAY_DATA:{},       //支付数据
+            PAY_USERTYPE:'ENTERPRISE'
         },
-        bankData:[
+        B2BbankData:[
             {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',bankNum:'ICBC_B2B'},
             {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',bankNum:'CMBCHINA_B2B'},
             {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',bankNum:'CCB_B2B'},
-            {imgUrl:'/img/pay/iconbank-04@2x.png',bankName:'交通银行',bankNum:'BOCO_B2B'},
             {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',bankNum:'CIB_B2B'},
             {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',bankNum:'CMBC_B2B'},
             {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国广发银行',bankNum:'CEB_B2B'},
@@ -32,13 +32,38 @@ var payContainer = new Vue({
             {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',bankNum:'HSB_B2B'},
             {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',bankNum:'QDYH_B2B'},
             {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',bankNum:'CZ_B2B'},
-            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',bankNum:'QLYH_B2B'}
+            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',bankNum:'QLYH_B2B'},
+            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',bankNum:'SHB_B2B'},
+            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',bankNum:'ISBC_B2B'},
+            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',bankNum:'XMCCB_B2B'}
+        ],
+        B2CbankData:[
+            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',bankNum:'ICBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',bankNum:'CMBCHINA_B2C'},
+            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',bankNum:'CCB_B2C'},
+            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',bankNum:'CIB_B2C'},
+            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',bankNum:'CMBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国广发银行',bankNum:'CEB_B2C'},
+            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',bankNum:'BOC_B2C'},
+            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',bankNum:'SZPA_B2C'},
+            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',bankNum:'ECITIC_B2C'},
+            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'浦发银行',bankNum:'SPDB_B2C'},
+            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',bankNum:'HXB_B2C'},
+            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',bankNum:'BCCB_B2C'},
+            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',bankNum:'ABC_B2C'},
+            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',bankNum:'PSBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',bankNum:'HSB_B2C'},
+            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',bankNum:'CZ_B2C'},
+            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',bankNum:'QLYH_B2C'},
+            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',bankNum:'SHB_B2C'},
+            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'晋商银行',bankNum:'JSHB_B2C'}
         ],
         methodTab:['线上支付','转账支付'],
         mobileData:[
             {imgUrl:'/img/pay/iconbank-ali@2x.png',bankName:'支付宝支付',bankNum:'ALIPAY'},
             {imgUrl:'/img/pay/iconbank-wx@2x.png',bankName:'微信支付',bankNum:'WEIXIN'},
-            {imgUrl:'/img/pay/iconbank-bank@2x.png',bankName:'网银支付',bankNum:'ICBC_B2B'}
+            {imgUrl:'/img/pay/iconbank-B2Bbank@2x.png',bankName:'网银支付',bankNum:'ICBC_B2B'},
+            {imgUrl:'/img/pay/iconbank-B2Cbank@2x.png',bankName:'个人网银',bankNum:'ICBC_B2C'}
         ],
         pageType:'',//页面跳转类型
         paidAmount:'',//订单待付金额
@@ -51,6 +76,7 @@ var payContainer = new Vue({
         discernReceiptList:[],//支付记录列表
         tabIndex:0,//支付方式 0 移动支付 1网银支付 2线下转账
         mbOrderId:'',//支付订单ID
+        BankUserType:1,
         mobileTabIndex:null,
         bankTabIndex:0,
         isRequest:false,
@@ -168,7 +194,6 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payInfo.PAY_BANK_NUM == "WEIXIN"){
-
                     if(_self.pageType === '1'){
                         if(!isPC){
                             var orderInfo = {//二手微信二维码参数
@@ -250,7 +275,9 @@ var payContainer = new Vue({
                             bankCode:_self.payInfo.PAY_BANK_NUM,
                             returnUrl:'https://www.caimei365.com/',
                             productId:_self.productID,
+                            userType:_self.payInfo.PAY_USERTYPE,
                     };
+                    debugger
                     _self.PayOrdersecondHandPay(params,_self.payInfo.PAY_BANK_NUM);
                 }else{
                     var params = {//正常订单
@@ -258,8 +285,10 @@ var payContainer = new Vue({
                             payAmount: parseInt(_self.payAmount*100),
                             bankCode:_self.payInfo.PAY_BANK_NUM,
                             returnUrl:'https://www.caimei365.com/',
-                            orderId:_self.payInfo.PAY_ORDERID
+                            orderId:_self.payInfo.PAY_ORDERID,
+                            userType:_self.payInfo.PAY_USERTYPE
                     };
+                    debugger
                     _self.PayOrderPcMallPay(params,_self.payInfo.PAY_BANK_NUM);
                 }
             }
@@ -374,7 +403,9 @@ var payContainer = new Vue({
             this.mobileTabIndex = index;
             this.payInfo.PAY_BANK_NUM = bankNum;
             if( this.mobileTabIndex==2){
-
+                this.payInfo.PAY_USERTYPE = 'ENTERPRISE';
+            }else if(this.mobileTabIndex == 3){
+                this.payInfo.PAY_USERTYPE = 'USER';
             }
         },
         checkBankPay:function(index,item){//选择网银支付方式-选择银行

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

@@ -84,13 +84,23 @@
                                     <img src="/img/pay/iconbank-wx@2x.png" alt="微信支付">
                                 </a>
                                 <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(2,'ICBC_B2B')" :class="{ active: mobileTabIndex === 2 }">
-                                    <img src="/img/pay/iconbank-bank@2x.png" alt="网银支付">
+                                    <img src="/img/pay/iconbank-B2Bbank@2x.png" alt="企业网银">
+                                </a>
+                                <a href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(3,'ICBC_B2C')" :class="{ active: mobileTabIndex === 3 }">
+                                    <img src="/img/pay/iconbank-B2Cbank@2x.png" alt="个人网银">
                                 </a>
                             </div>
                         </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 bankData" :key="index" :class="{ active: bankTabIndex === index }"  @click="checkBankPay(index,item)">
+                                <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>
+                            </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>
                             </div>
@@ -124,7 +134,7 @@
     </div>
     <div class="pay-button-main">
         <div class="inner">
-            <div class="pay-button" v-if="mobileTabIndex === 2">
+            <div class="pay-button" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
                 <a v-show="isPC" href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
             </div>
             <div class="pay-button" v-else>

src/main/resources/templates/user-center/order/detail.html

@@ -222,7 +222,7 @@
                         <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
                             <div class="inner">
                                 <a class="btn primary confirm" href="javascript: void(0);" v-if="orderInfo.affirmPaymentFlag=='00'" @click="hanldConfirmFn(orderInfo.userID,orderInfo.orderID)"><p>确认</p>打款供应商</a>
-                                <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
+                                <a class="btn primary" href="javascript: void(0);" v-if="!orderInfo.payButton && ['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
                                 <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
                                 <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
                                 <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>

src/main/resources/templates/user-center/order/list.html

@@ -100,7 +100,7 @@
                                 </div>
                                 <div class="order-botton">
                                     <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag=='00'" @click="hanldConfirmFn(order.userID,order.orderID)"><p>确认</p>打款供应商</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderID)">支付订单</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="!order.payButton && ['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderID)">支付订单</a>
                                     <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderID)">取消订单</a>
                                     <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderID)">确认订单</a>