订单模块接口联调

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

@@ -1,17 +1,23 @@
 li {list-style: none; }
  @media screen and (min-width:768px){
      .order-logistics{background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px;}
-     .order-list{overflow: hidden;padding: 10px;border-bottom: 1px solid #e2e7ef}
-     .left-img{float: left;width: 70px;height: 70px;}
-     .left-img img{width: 100%;height: 100%;}
+     .order-logistics-list{width: 100%;height: auto;float: left;margin-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+     .order-title{width: 100%;height: 60px;box-sizing: border-box;padding: 10px 0;float: left;}
+     .order-title .order-shopLogo{width: 40px;height: 40px;float: left;margin-right: 10px;}
+     .order-title .order-shopLogo img{width: 40px;height: 40px;display: block;}
+     .order-title .order-shopName{float: left;font-size: 12px;color: #333330;line-height: 40px;}
+     .order-product-list{width: 100%;height: auto;box-sizing: border-box;float: left;}
+     .order-product{width: 100%;height: 90px;box-sizing: border-box;padding: 10px;}
+     .left-img{float: left;width: 70px;height: 70px;box-sizing: border-box;border: 1px solid #E1E1E1;border-radius: 2px;}
+     .left-img img{width: 100%;height: 100%;display: block;}
      .right-name{float: left;margin-left: 10px;width: 90%;}
      .right-name .product-name{width: 544px;color: #4a4f58;font-size: 16px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
      .product-num .number{color: #627386;font-size: 14px;float: left;}
      .product-num .Ship{color: #22272e;float: right;}
      .product-num .Ship span{color: #e15616;}
      .product-num{overflow: hidden;margin-top: 10px;}
-     .mainContent{margin-top: 32px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-     .mainContent .title{font-size: 16px;color: #22272e;font-weight: bold;margin: 20px;}
+     .mainContent{width: 100%;height: auto;float: left;}
+     .mainContent .title{width: 100%;height: 40px;box-sizing: border-box;padding: 0 20px;background-color: #FFF; font-size: 16px;color: #22272e;font-weight: bold;line-height:40px;}
      .logistics-deatil{padding: 20px;background: #fff;}
      .logistics-deatil .title-deatil{font-size: 16px;color: #22272e;padding: 4px 0 16px 0;}
      .logsitics-list  .goodlist p{display: inline-block;margin-right: 88px;font-size: 14px;color: #627386;}

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

@@ -56,18 +56,6 @@ var OrderApi = {
                 callback(res);
             });
         },
-        /* 删除地址 */
-        GetFindInvoice: function (params, callback) {
-            Http.AjaxService({
-                url:'/personalCenter/findInvoice',
-                type:'GET',
-                data:params,
-                json:false
-            })
-            .then(function(res){
-                callback(res);
-            });
-        },
         GetAddressSelect:function(params,callback){ //获取省市区信息
             Http.AjaxService({
                 url:'/order/address/select',
@@ -148,10 +136,11 @@ var OrderApi = {
         /* 查询订单详情 */
         QueryOrderDetailsInfo: function (params, callback) {
             Http.AjaxService({
-                url:'/order/detail',
+                url:'/order/club/detail',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -250,10 +239,11 @@ var OrderApi = {
         //订单查看物流
         seelogistics: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/logistics',
+                url:'/order/club/logistics',
                 type:'get',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

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

@@ -28,23 +28,37 @@ var PayApi = {
                 callback(res);
             });
         },
-        PayOrderPcMallPay: function (params, callback) {//查询跳转网银页面
+        PayOrderPcMallPay: function (params, callback) {// 正常订单网银支付
             Http.AjaxService({
-                url:'/PayOrder/pcMallPay',
+                url:'/order/pay/union',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        PayOrderPcMallAlipay: function (params, callback) {// 正常订单支付宝支付
+            Http.AjaxService({
+                url:'/order/pay/alipay',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
             });
         },
-        PayOrderMiniWxPay: function (params, callback) {//调起微信公众号支付
+        PayOrderMiniWxPay: function (params, callback) {// 调起微信公众号支付
             Http.AjaxService({
-                url:'/PayOrder/miniWxPay',
+                url:'/order/pay/wechat',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -52,10 +66,11 @@ var PayApi = {
         },
         PayOrderPayWhetherSuccess: function (params, callback) {//查询微信是否已完成支付
             Http.AjaxService({
-                url:'/PayOrder/payWhetherSuccess',
+                url:'/order/pay/result/check',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -63,32 +78,59 @@ var PayApi = {
         },
         PayOrderFindOrderStatus: function (params, callback) {//查询判断是否已完成支付
             Http.AjaxService({
-                url:'/PayOrder/findOrderStatus',
+                url:'/order/pay/result/json',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
             });
         },
-        PayOrderPayLink: function (params, callback) {//查询判断是否已完成支付unpaidAmount 本次待付款金额 orderId  主订单ID
+        PayOrderPayLink: function (params, callback) {//生成网银支付链接
             Http.AjaxService({
-                url:'/PayOrder/payLink',
+                url:'/order/pay/link',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
             });
         },
-        PayOrdersecondHandPay: function (params, callback) {//发布二手商品支付 本次待付款金额 productID  主订单ID
+        PayOrdersecondUnion: function (params, callback) {//二手发布支付 网银支付
             Http.AjaxService({
-                url:'/PayOrder/secondHandPay',
+                url:'/order/pay/second/union',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        PayOrdersecondAliPay: function (params, callback) {//二手发布支付 支付宝支付
+            Http.AjaxService({
+                url:'/order/pay/second/alipay',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        PayOrdersecondWechat: function (params, callback) {//二手发布支付 微信支付
+            Http.AjaxService({
+                url:'/order/pay/second/wechat',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -96,10 +138,11 @@ var PayApi = {
         },
         PayOrderLinkData: function (params, callback) {//网银支付重定向数据初始化
             Http.AjaxService({
-                url:'/PayOrder/linkData',
+                url:'/order/pay/link/data',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

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

@@ -0,0 +1,50 @@
+var bank ={
+        b2BbankData : [// 企业网银
+            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',B2bNum:'ICBC_B2B',B2cNum:'ICBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',B2bNum:'CMBCHINA_B2B',B2cNum:'CMBCHINA_B2C'},
+            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',B2bNum:'CCB_B2B',B2cNum:'CCB_B2C'},
+            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',B2bNum:'CIB_B2B',B2cNum:'CIB_B2C'},
+            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',B2bNum:'CMBC_B2B',B2cNum:'CMBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国光大银行',B2bNum:'CEB_B2B',B2cNum:'CEB_B2C'},
+            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',B2bNum:'BOC_B2B',B2cNum:'BOC_B2C'},
+            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',B2bNum:'SZPA_B2B',B2cNum:'SZPA_B2C'},
+            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',B2bNum:'ECITIC_B2B',B2cNum:'ECITIC_B2C'},
+            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'上海浦东发展银行',B2bNum:'SPDB_B2B',B2cNum:'SPDB_B2C'},
+            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',B2bNum:'HXB_B2B',B2cNum:'HXB_B2C'},
+            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',B2bNum:'BCCB_B2B',B2cNum:'BCCB_B2C'},
+            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',B2bNum:'ABC_B2B',B2cNum:'ABC_B2C'},
+            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',B2bNum:'PSBC_B2B',B2cNum:'PSBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',B2bNum:'HSB_B2B',B2cNum:'HSB_B2C'},
+            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',B2bNum:'QDYH_B2B',B2cNum:'QDYH_B2C'},
+            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',B2bNum:'CZ_B2B',B2cNum:'CZ_B2C'},
+            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',B2bNum:'QLYH_B2B',B2cNum:'QLYH_B2C'},
+            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',B2bNum:'SHB_B2B',B2cNum:'SHB_B2C'},
+            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',B2bNum:'ISBC_B2B',B2cNum:null},
+            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',B2bNum:'XMCCB_B2B',B2cNum:null},
+            {imgUrl:'/img/pay/iconbank-23@2x.png',bankName:'晋商银行',B2bNum:null,B2cNum:'JSHB_B2C'}
+        ],
+        b2CbankData:[ // 个人网银
+            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',B2bNum:'ICBC_B2B',B2cNum:'ICBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',B2bNum:'CMBCHINA_B2B',B2cNum:'CMBCHINA_B2C'},
+            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',B2bNum:'CCB_B2B',B2cNum:'CCB_B2C'},
+            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',B2bNum:'CIB_B2B',B2cNum:'CIB_B2C'},
+            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',B2bNum:'CMBC_B2B',B2cNum:'CMBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国光大银行',B2bNum:'CEB_B2B',B2cNum:'CEB_B2C'},
+            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',B2bNum:'BOC_B2B',B2cNum:'BOC_B2C'},
+            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',B2bNum:'SZPA_B2B',B2cNum:'SZPA_B2C'},
+            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',B2bNum:'ECITIC_B2B',B2cNum:'ECITIC_B2C'},
+            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'上海浦东发展银行',B2bNum:'SPDB_B2B',B2cNum:'SPDB_B2C'},
+            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',B2bNum:'HXB_B2B',B2cNum:'HXB_B2C'},
+            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',B2bNum:'BCCB_B2B',B2cNum:'BCCB_B2C'},
+            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',B2bNum:'ABC_B2B',B2cNum:'ABC_B2C'},
+            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',B2bNum:'PSBC_B2B',B2cNum:'PSBC_B2C'},
+            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',B2bNum:'HSB_B2B',B2cNum:'HSB_B2C'},
+            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',B2bNum:'QDYH_B2B',B2cNum:'QDYH_B2C'},
+            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',B2bNum:'CZ_B2B',B2cNum:'CZ_B2C'},
+            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',B2bNum:'QLYH_B2B',B2cNum:'QLYH_B2C'},
+            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',B2bNum:'SHB_B2B',B2cNum:'SHB_B2C'},
+            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',B2bNum:'ISBC_B2B',B2cNum:null},
+            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',B2bNum:'XMCCB_B2B',B2cNum:null},
+            {imgUrl:'/img/pay/iconbank-23@2x.png',bankName:'晋商银行',B2bNum:null,B2cNum:'JSHB_B2C'}
+        ]
+}

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

@@ -6,65 +6,18 @@ var payContainer = new Vue({
     data: {
         isSubMitStatus:false,
         payInfo:{
-            PAY_BANK_NUM:'ICBC_B2B',//银行网管信息
-            PAY_CODE:'',//链接状态
-            PAY_ORDERID:'',//主订单ID
-            PAY_UNPAIDAMOUNT:0,//本次支付金额
-            PAY_TIME:'',//链接失效时间
-            PAY_LINKLOGO:'',
-            PAY_PAYLINKTYPE:'',
-            PAY_USERTYPE:'',//网银支付类型
-            PAY_PAYLINKTYPETEXT:'',//文案
+            payBankNum:'ICBC_B2B',//银行网管信息
+            payCode:'',//链接状态
+            payOrderId:'',//主订单ID
+            payUnpaidAmount:0,//本次支付金额
+            payTime:'',//链接失效时间
+            payLinkLogo:'',
+            payLinkType:'',
+            payUserType:'',//网银支付类型
+            payLinkTypeText:'',//文案
         },
-        B2BbankData:[
-            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',B2bNum:'ICBC_B2B',B2cNum:'ICBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',B2bNum:'CMBCHINA_B2B',B2cNum:'CMBCHINA_B2C'},
-            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',B2bNum:'CCB_B2B',B2cNum:'CCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',B2bNum:'CIB_B2B',B2cNum:'CIB_B2C'},
-            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',B2bNum:'CMBC_B2B',B2cNum:'CMBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国光大银行',B2bNum:'CEB_B2B',B2cNum:'CEB_B2C'},
-            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',B2bNum:'BOC_B2B',B2cNum:'BOC_B2C'},
-            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',B2bNum:'SZPA_B2B',B2cNum:'SZPA_B2C'},
-            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',B2bNum:'ECITIC_B2B',B2cNum:'ECITIC_B2C'},
-            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'上海浦东发展银行',B2bNum:'SPDB_B2B',B2cNum:'SPDB_B2C'},
-            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',B2bNum:'HXB_B2B',B2cNum:'HXB_B2C'},
-            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',B2bNum:'BCCB_B2B',B2cNum:'BCCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',B2bNum:'ABC_B2B',B2cNum:'ABC_B2C'},
-            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',B2bNum:'PSBC_B2B',B2cNum:'PSBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',B2bNum:'HSB_B2B',B2cNum:'HSB_B2C'},
-            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',B2bNum:'QDYH_B2B',B2cNum:'QDYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',B2bNum:'CZ_B2B',B2cNum:'CZ_B2C'},
-            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',B2bNum:'QLYH_B2B',B2cNum:'QLYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',B2bNum:'SHB_B2B',B2cNum:'SHB_B2C'},
-            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',B2bNum:'ISBC_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',B2bNum:'XMCCB_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-23@2x.png',bankName:'晋商银行',B2bNum:null,B2cNum:'JSHB_B2C'}
-
-        ],
-        B2CbankData:[
-            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',B2bNum:'ICBC_B2B',B2cNum:'ICBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',B2bNum:'CMBCHINA_B2B',B2cNum:'CMBCHINA_B2C'},
-            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',B2bNum:'CCB_B2B',B2cNum:'CCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',B2bNum:'CIB_B2B',B2cNum:'CIB_B2C'},
-            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',B2bNum:'CMBC_B2B',B2cNum:'CMBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国光大银行',B2bNum:'CEB_B2B',B2cNum:'CEB_B2C'},
-            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',B2bNum:'BOC_B2B',B2cNum:'BOC_B2C'},
-            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',B2bNum:'SZPA_B2B',B2cNum:'SZPA_B2C'},
-            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',B2bNum:'ECITIC_B2B',B2cNum:'ECITIC_B2C'},
-            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'上海浦东发展银行',B2bNum:'SPDB_B2B',B2cNum:'SPDB_B2C'},
-            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',B2bNum:'HXB_B2B',B2cNum:'HXB_B2C'},
-            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',B2bNum:'BCCB_B2B',B2cNum:'BCCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',B2bNum:'ABC_B2B',B2cNum:'ABC_B2C'},
-            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',B2bNum:'PSBC_B2B',B2cNum:'PSBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',B2bNum:'HSB_B2B',B2cNum:'HSB_B2C'},
-            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',B2bNum:'QDYH_B2B',B2cNum:'QDYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',B2bNum:'CZ_B2B',B2cNum:'CZ_B2C'},
-            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',B2bNum:'QLYH_B2B',B2cNum:'QLYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',B2bNum:'SHB_B2B',B2cNum:'SHB_B2C'},
-            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',B2bNum:'ISBC_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',B2bNum:'XMCCB_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-23@2x.png',bankName:'晋商银行',B2bNum:null,B2cNum:'JSHB_B2C'}
-        ],
+        B2BbankData:bank.b2BbankData,// 企业网银
+        B2CbankData:bank.b2CbankData,// 个人网银
         userName :'',
         goodList:'',
         freight :'',       //运费
@@ -90,7 +43,7 @@ var payContainer = new Vue({
         iconErrorClass:'',
         iconErrorText:'',
         iconErrorMsgnone:'',
-        organizeID:'',  //组织机构id
+        organizeId:'',  //组织机构id
         orderNo:'',      //订单号
         orderTotalFee:'',
         unpaidAmount:''  //真正的付款金额
@@ -121,22 +74,22 @@ var payContainer = new Vue({
                 if(response.code == 0){
                     var _data = response.data;
                     console.log(_data);
-                    _self.payInfo.PAY_ORDERID = _data.orderPayLink.orderId;
-                    _self.payInfo.PAY_UNPAIDAMOUNT = _data.orderPayLink.unpaidAmount;
-                    _self.payInfo.PAY_TIME = decodeURI(_data.time);
-                    _self.payInfo.PAY_PAYLINKTYPE = _data.orderPayLink.payType;
-                    _self.payInfo.PAY_PAYLINKTYPETEXT =  _self.payInfo.PAY_PAYLINKTYPE == '1' ? '企业网银' : '个人网银';
-                    _self.payInfo.PAY_USERTYPE =  _self.payInfo.PAY_PAYLINKTYPE == '1' ? 'ENTERPRISE' : 'USER';
+                    _self.payInfo.payOrderId = _data.orderPayLink.orderId;
+                    _self.payInfo.payUnpaidAmount = _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';
                     _self.unpaidAmount = _data.orderPayLink.unpaidAmount;
                     if(_data.code == 0){
                         setTimeout(function () {  //支付倒计时
-                            _self.countTime(_self.payInfo.PAY_TIME)
+                            _self.countTime(_self.payInfo.payTime)
                         }, 1000);
                         _self.infoPayOrderCheckoutCounter();
                     }else{
                         _self.isErrorShow = true;
                         _self.isRequest = true;
-                        switch (_self.payInfo.PAY_CODE) {
+                        switch (_self.payInfo.payCode) {
                             case -2:
                                 _self.iconErrorClass = 'offline';
                                 _self.iconErrorText = '订单已通过线下转账方式付款';
@@ -167,7 +120,7 @@ var payContainer = new Vue({
         },
         infoPayOrderCheckoutCounter:function(){//初始化订单数据
             var _self = this;
-            PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.PAY_ORDERID},function(response){
+            PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.payOrderId},function(response){
                 console.log(response);
                 if(response.code == 0){
                     var data = response.data;
@@ -179,8 +132,8 @@ var payContainer = new Vue({
                     _self.balancePayFee =  data.order.balancePayFee;
                     _self.payTotalFee =  data.order.payTotalFee;
                     _self.receiptAmount=  data.order.receiptAmount;
-                    _self.payableAmount =  _self.payInfo.PAY_UNPAIDAMOUNT;
-                    _self.organizeID = data.order.organizeID;
+                    _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'){
@@ -197,21 +150,21 @@ var payContainer = new Vue({
         },
         PaySubmitFn:function(){//立即支付
             var _self = this;
-            if(_self.payInfo.PAY_BANK_NUM == ''){
+            if(_self.payInfo.payBankNum == ''){
                 layer.msg('请选择银行！');
                 return;
             }
             var params = {
                     payWay:'UNIONPAY',
-                    payAmount: _self.payInfo.PAY_UNPAIDAMOUNT*100,
-                    bankCode:_self.payInfo.PAY_BANK_NUM,
+                    payAmount: _self.payInfo.payUnpaidAmount*100,
+                    bankCode:_self.payInfo.payBankNum,
                     returnUrl:'https://www.caimei365.com/',
-                    orderId:_self.payInfo.PAY_ORDERID,
-                    userType:_self.payInfo.PAY_USERTYPE
+                    orderId:_self.payInfo.payOrderId,
+                    userType:_self.payInfo.payUserType
                 };
             _self.PayOrderPcMallPay(params);
         },
-        PayOrderPcMallPay:function(params){//网银支付请求
+        PayOrderPcMallPay:function(params){//订单网银支付请求
             var _self = this;
             _self.isSubMitStatus=true;
             PayApi.PayOrderPcMallPay(params,function(response){
@@ -233,18 +186,18 @@ var payContainer = new Vue({
                 _self.isPayAlert = false;
                 var data = response.data.data;
                 if(data.status === '1'){
-                    window.location.href = '/pay/success.html?pageType=wechat&type=success&payAmount='+ _self.payInfo.PAY_UNPAIDAMOUNT;
+                    window.location.href = '/pay/success.html?pageType=wechat&type=success&payAmount='+ _self.payInfo.payUnpaidAmount;
                 }else{
-                    window.location.href = '/pay/success.html?pageType=wechat&type=error&payAmount='+ _self.payInfo.PAY_UNPAIDAMOUNT;
+                    window.location.href = '/pay/success.html?pageType=wechat&type=error&payAmount='+ _self.payInfo.payUnpaidAmount;
                 }
             });
         },
         changeTab:function(index,item){// 选择银行
             this.tabIndex = index;
-            if( this.payInfo.PAY_PAYLINKTYPE == '1'){
-                this.payInfo.PAY_BANK_NUM = item.B2bNum;
+            if( this.payInfo.payLinkType == 1){
+                this.payInfo.payBankNum = item.B2bNum;
             }else{
-                this.payInfo.PAY_BANK_NUM = item.B2cNum;
+                this.payInfo.payBankNum = item.B2cNum;
             }
         },
         slideToggleContent:function(){
@@ -312,8 +265,8 @@ var payContainer = new Vue({
     },
     mounted: function () {
         var _self = this;
-        _self.payInfo.PAY_LINKLOGO= CAIMEI.getUrlParam('linkLogo');
-        _self.LinkInfoOrderBank(_self.payInfo.PAY_LINKLOGO);
+        _self.payInfo.payLinkLogo= CAIMEI.getUrlParam('linkLogo');
+        _self.LinkInfoOrderBank(_self.payInfo.payLinkLogo);
 
     }
 });

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

@@ -6,59 +6,17 @@ var payContainer = new Vue({
     data: {
         isSubMitStatus:false,
         payInfo:{
-            PAY_BANK_NUM: '', //支付类型
-            PAY_ORDERID: '',  //订单ID
-            PAY_UNPAIDAMOUNT: '', //待支付金额
-            PAY_PAYAMOUNT: 0,//本次支付金额
-            PAY_MOBILE_URL: '',//二维码生成链接
-            PAY_DATA:{},       //支付数据
-            PAY_USERTYPE:'ENTERPRISE',
-            PAY_TYPE:'',
+            payBankNum: '', //支付类型
+            payOrderId: '',  //订单ID
+            payUnpaidaMount: '', //待支付金额
+            payAmount: 0,//本次支付金额
+            payMobileUrl: '',//二维码生成链接
+            payData:{},       //支付数据
+            payUserType:'ENTERPRISE',
+            payType:'',
         },
-        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-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'},
-            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',bankNum:'BOC_B2B'},
-            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',bankNum:'SZPA_B2B'},
-            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',bankNum:'ECITIC_B2B'},
-            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'浦发银行',bankNum:'SPDB_B2B'},
-            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',bankNum:'HXB_B2B'},
-            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',bankNum:'BCCB_B2B'},
-            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',bankNum:'ABC_B2B'},
-            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',bankNum:'PSBC_B2B'},
-            {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-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'}
-        ],
+        B2BbankData:bank.b2BbankData,
+        B2CbankData:bank.b2CbankData,
         methodTab:['线上支付','转账支付'],
         mobileData:[
             {imgUrl:'/img/pay/iconbank-ali@2x.png',bankName:'支付宝支付',bankNum:'ALIPAY'},
@@ -66,7 +24,7 @@ var payContainer = new Vue({
             {imgUrl:'/img/pay/iconbank-B2Bbank@2x.png',bankName:'网银支付',bankNum:'ICBC_B2B'},
             {imgUrl:'/img/pay/iconbank-B2Cbank@2x.png',bankName:'个人网银',bankNum:'ICBC_B2C'}
         ],
-        pageType:'',//页面跳转类型
+        pageType:'',//页面跳转类型 1 二手支付
         paidAmount:'',//订单待付金额
         payableAmount:'',//应付金额
         receiptAmount:'',//已支付金额
@@ -116,17 +74,17 @@ var payContainer = new Vue({
     methods: {
         infoPayOrderCheckoutCounter:function(){//初始化订单数据
             var _self = this;
-            PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.PAY_ORDERID},function(response){
+            PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.payOrderId},function(response){
                 if(response.code == 0){
                     // console.log(response);
                     var data = response.data; //金额初始化
-                    _self.payInfo.PAY_UNPAIDAMOUNT = (data.order.payableAmount - data.order.receiptAmount).toFixed(2);
-                    _self.payInfo.PAY_PAYAMOUNT = (data.order.payableAmount-data.order.receiptAmount).toFixed(2);
+                    _self.payInfo.payUnpaidaMount = (data.order.payableAmount - data.order.receiptAmount).toFixed(2);
+                    _self.payInfo.payAmount = (data.order.payableAmount-data.order.receiptAmount).toFixed(2);
                     _self.discernReceiptList = data.discernReceipt;
                     _self.paidAmount =  (data.order.payableAmount-data.order.receiptAmount).toFixed(2);
                     _self.receiptAmount =  data.order.receiptAmount;
                     _self.payableAmount=  data.order.payableAmount;
-                    _self.balanceAmount =  ( _self.payableAmount - _self.receiptAmount).toFixed(2) - _self.payInfo.PAY_PAYAMOUNT;
+                    _self.balanceAmount =  ( _self.payableAmount - _self.receiptAmount).toFixed(2) - _self.payInfo.payAmount;
                     _self.payAmount =  (_self.payableAmount - _self.receiptAmount).toFixed(2);//本次支付金额
                     _self.paySuccessCounter = data.order.paySuccessCounter;
                     _self.receiptStatus =  data.order.receiptStatus;
@@ -153,7 +111,7 @@ var payContainer = new Vue({
                     if(response.data === 0){
                         _self.isPaySwitch = true;
                         CAIMEI.Alert('线上支付功能正在维护中，请前往订单详情页面查看线下转账方式后进行付款','确定',true,function(){
-                            window.location.href='/user/order/detail.html?orderId='+_self.payInfo.PAY_ORDERID;
+                            window.location.href='/user/order/detail.html?orderId='+_self.payInfo.payOrderId;
                         });
                     }
                 }else{
@@ -166,7 +124,7 @@ var payContainer = new Vue({
             if(_self.invoiceStatus){
                 _self.layerConfirm();
             }else{
-                if(_self.payInfo.PAY_BANK_NUM == ''){
+                if(_self.payInfo.payBankNum == ''){
                     CAIMEI.dialog('请选择支付方式');
                     return;
                 }
@@ -183,7 +141,7 @@ var payContainer = new Vue({
                     return;
                 }
                 if(_self.payAmount > _self.paymentIimit){
-                    switch (_self.payInfo.PAY_BANK_NUM) {
+                    switch (_self.payInfo.payBankNum) {
                         case 'WEIXIN':
                             _self.paymentIimitText = '本次支付金额已超出微信支付限额，请输入小于5千的金额进行支付';
                             break;
@@ -194,7 +152,7 @@ var payContainer = new Vue({
                     CAIMEI.Alert(_self.paymentIimitText,'知道了');
                     return;
                 }
-                if(_self.payInfo.PAY_BANK_NUM == "WEIXIN"){
+                if(_self.payInfo.payBankNum == "WEIXIN"){
                     if(_self.pageType === '1'){
                         if(!isPC){
                             var orderInfo = {//二手微信二维码参数
@@ -202,16 +160,16 @@ var payContainer = new Vue({
                                     productId:_self.productID,
                                     payAmount:_self.payAmount
                             };
-                            _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
-                            location.href = _self.payInfo.PAY_MOBILE_URL;
+                            _self.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+                            location.href = _self.payInfo.payMobileUrl;
                         }else{
-                            _self.payInfo.PAY_DATA = {//二手
-                                type:_self.payInfo.PAY_BANK_NUM,
+                            _self.payInfo.payData = {//二手
+                                type:_self.payInfo.payBankNum,
                                 productId:_self.productID,
                                 amount:_self.payAmount,
-                                url:_self.payInfo.PAY_MOBILE_URL
+                                url:_self.payInfo.payMobileUrl
                             };
-                            CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
+                            CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
                             window.open("/pay/caimei-paymobile.html?pageType=1");
                             _self.isPayAlert = true;
                         }
@@ -219,39 +177,54 @@ var payContainer = new Vue({
                         if(!isPC){
                             var orderInfo = {//普通订单微信二维码参数
                                     pageType:0,
-                                    orderID:_self.payInfo.PAY_ORDERID,
+                                    orderID:_self.payInfo.payOrderId,
                                     payAmount:_self.payAmount
                             };
-                            _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
-                            location.href = _self.payInfo.PAY_MOBILE_URL;
+                            _self.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+                            location.href = _self.payInfo.payMobileUrl;
                         }else{
-                            _self.payInfo.PAY_DATA = {//正常订单
-                                type:_self.payInfo.PAY_BANK_NUM,
-                                orderid:_self.payInfo.PAY_ORDERID,
+                            _self.payInfo.payData = {//正常订单
+                                type:_self.payInfo.payBankNum,
+                                orderid:_self.payInfo.payOrderId,
                                 amount:_self.payAmount,
-                                url:_self.payInfo.PAY_MOBILE_URL
+                                url:_self.payInfo.payMobileUrl
                             };
-                            CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
+                            CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
                             window.open("/pay/caimei-paymobile.html?pageType=0");
                             _self.isPayAlert = true;
                         }
                     }
-                }else{
+                }else if(_self.payInfo.payBankNum == "ALIPAY"){//支付宝支付
+                    if(_self.pageType === '1'){// 二手
+                        var params = {//二手
+                                returnUrl:'https://www.caimei365.com/',
+                                productId:_self.productID,
+                            };
+                        _self.PayOrdersecondAliPay(params);
+                    }else{
+                        var params = {//正常订单
+                                payAmount:parseInt(_self.payAmount*100),
+                                returnUrl:'https://www.caimei365.com/',
+                                orderId:_self.payInfo.payOrderId
+                            };
+                        _self.PayOrderPcMallAlipay(params);
+                    }
+                }else{// 网银支付
                     if(_self.pageType === '1'){
                         var params = {//二手
-                            payWay:_self.payInfo.PAY_BANK_NUM,
+                            payWay:_self.payInfo.payBankNum,
                             returnUrl:'https://www.caimei365.com/',
                             productId:_self.productID,
                         };
-                        _self.PayOrdersecondHandPay(params,_self.payInfo.PAY_BANK_NUM);
+                        _self.PayOrdersecondUnion(params,_self.payInfo.payBankNum);
                     }else{
                         var params = {//正常订单
-                                payWay:_self.payInfo.PAY_BANK_NUM,
-                                payAmount:parseInt(_self.payAmount*100),
-                                returnUrl:'https://www.caimei365.com/',
-                                orderId:_self.payInfo.PAY_ORDERID
+                            payWay:_self.payInfo.payBankNum,
+                            payAmount:parseInt(_self.payAmount*100),
+                            returnUrl:'https://www.caimei365.com/',
+                            orderId:_self.payInfo.payOrderId
                         };
-                        _self.PayOrderPcMallPay(params,_self.payInfo.PAY_BANK_NUM);
+                        _self.PayOrderPcMallPay(params,_self.payInfo.payBankNum);
                     }
                 }
             }
@@ -261,7 +234,7 @@ var payContainer = new Vue({
             if(_self.invoiceStatus){
                 _self.layerConfirm();
             }else{
-                if(_self.payInfo.PAY_BANK_NUM == ''){
+                if(_self.payInfo.payBankNum == ''){
                     CAIMEI.dialog('请选择银行！');
                     return;
                 }
@@ -271,28 +244,25 @@ var payContainer = new Vue({
                 }
                 if(_self.pageType === '1'){
                     var params = {//二手
-                            payWay:'UNIONPAY',
-                            payAmount: parseInt(_self.payAmount*100),
-                            bankCode:_self.payInfo.PAY_BANK_NUM,
+                            bankCode:_self.payInfo.payBankNum,
                             returnUrl:'https://www.caimei365.com/',
                             productId:_self.productID,
-                            userType:_self.payInfo.PAY_USERTYPE,
+                            userType:_self.payInfo.payUserType,
                     };
-                    _self.PayOrdersecondHandPay(params,_self.payInfo.PAY_BANK_NUM);
+                    _self.PayOrdersecondUnion(params);
                 }else{
                     var params = {//正常订单
-                            payWay:'UNIONPAY',
                             payAmount: parseInt(_self.payAmount*100),
-                            bankCode:_self.payInfo.PAY_BANK_NUM,
+                            bankCode:_self.payInfo.payBankNum,
                             returnUrl:'https://www.caimei365.com/',
-                            orderId:_self.payInfo.PAY_ORDERID,
-                            userType:_self.payInfo.PAY_USERTYPE
+                            orderId:_self.payInfo.payOrderId,
+                            userType:_self.payInfo.payUserType
                     };
-                    _self.PayOrderPcMallPay(params,_self.payInfo.PAY_BANK_NUM);
+                    _self.PayOrderPcMallPay(params,_self.payInfo.payBankNum);
                 }
             }
         },
-        PayOrderPcMallPay:function(params,type){//网银&&支付宝生成支付地址
+        PayOrderPcMallPay:function(params){// 正常订单网银支付
             var _self = this;
             _self.isSubMitStatus=true;
             PayApi.PayOrderPcMallPay(params,function(response){
@@ -300,63 +270,34 @@ var payContainer = new Vue({
                     _self.isPayAlert = true;
                     _self.isSubMitStatus=false;
                     _self.mbOrderId = response.data.data.mbOrderId;
-                    if(type == 'ALIPAY'){
-                        _self.payInfo.PAY_MOBILE_URL = response.data.data.payUrl;
-                        _self.payInfo.PAY_DATA = {
-                            mbOrderId:_self.mbOrderId,
-                            type:_self.payInfo.PAY_BANK_NUM,
-                            orderid:_self.payInfo.PAY_ORDERID,
-                            amount:_self.payAmount,
-                            url:_self.payInfo.PAY_MOBILE_URL
-                        };
-                        CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                        if(!isPC){
-                            location.href = _self.payInfo.PAY_MOBILE_URL;
-                        }else{
-                            window.open("/pay/caimei-paymobile.html?pageType=1");
-                        }
-                    }else{
-                        window.open(response.data.data.payUrl);
-                    }
+                    window.open(response.data.data.payUrl);
                 }else{
                     _self.isSubMitStatus=false;
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
             })
         },
-        PayOrdersecondHandPay:function(params,type){//二手支付请求
+        PayOrderPcMallAlipay:function (params){// 正常订单支付宝支付
             var _self = this;
             _self.isSubMitStatus=true;
-            PayApi.PayOrdersecondHandPay(params,function(response){
+            PayApi.PayOrderPcMallAlipay(params,function(response){
                 if(response.code == 0){
                     _self.isPayAlert = true;
                     _self.isSubMitStatus=false;
                     _self.mbOrderId = response.data.data.mbOrderId;
-                    if(type == 'ALIPAY'){
-                        _self.payInfo.PAY_MOBILE_URL = response.data.data.payUrl;
-                        if(_self.pageType === '1'){
-                            _self.payInfo.PAY_DATA = {
-                                mbOrderId:_self.mbOrderId,
-                                type:_self.payInfo.PAY_BANK_NUM,
-                                productId:_self.productID,
-                                amount:_self.payAmount,
-                                url:_self.payInfo.PAY_MOBILE_URL
-                            };
-                            CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                            window.open("/pay/caimei-paymobile.html?pageType=1");
-                        }else{
-                            _self.payInfo.PAY_DATA = {
-                                mbOrderId:_self.mbOrderId,
-                                type:_self.payInfo.PAY_BANK_NUM,
-                                orderid:_self.payInfo.PAY_ORDERID,
-                                amount:_self.payAmount,
-                                url:_self.payInfo.PAY_MOBILE_URL
-                            };
-                            CAIMEI.Storage.setItem('PAY_DATA',JSON.stringify(_self.payInfo.PAY_DATA));
-                            window.open("/pay/caimei-paymobile.html");
-                        }
+                    _self.payInfo.payMobileUrl = response.data.data.payUrl;
+                    _self.payInfo.payData = {
+                        mbOrderId:_self.mbOrderId,
+                        type:_self.payInfo.payBankNum,
+                        orderid:_self.payInfo.payOrderId,
+                        amount:_self.payAmount,
+                        url:_self.payInfo.payMobileUrl
+                    };
+                    CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
+                    if(!isPC){
+                        location.href = _self.payInfo.payMobileUrl;
                     }else{
-                        window.open(response.data.data.payUrl);
+                        window.open("/pay/caimei-paymobile.html?pageType=1");
                     }
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -364,54 +305,101 @@ var payContainer = new Vue({
                 }
             })
         },
+        PayOrdersecondAliPay:function (params){// 二手支付宝支付
+            var _self = this;
+            _self.isSubMitStatus=true;
+            PayApi.PayOrdersecondAliPay(params,function(response){
+                if(response.code == 0){
+                    _self.isPayAlert = true;
+                    _self.isSubMitStatus=false;
+                    _self.mbOrderId = response.data.data.mbOrderId;
+                    _self.payInfo.payMobileUrl = response.data.data.payUrl;
+                    _self.payInfo.payData = {
+                        mbOrderId:_self.mbOrderId,
+                        type:_self.payInfo.payBankNum,
+                        productId:_self.productID,
+                        amount:_self.payAmount,
+                        url:_self.payInfo.payMobileUrl
+                    };
+                    CAIMEI.Storage.setItem('payData',JSON.stringify(_self.payInfo.payData));
+                    window.open("/pay/caimei-paymobile.html?pageType=1");
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isSubMitStatus=false;
+                }
+            })
+        },
+        PayOrdersecondUnion:function (params){// 二手网银支付
+            var _self = this;
+            _self.isSubMitStatus=true;
+            PayApi.PayOrdersecondUnion(params,function(response){
+                if(response.code == 0){
+                    _self.isPayAlert = true;
+                    _self.isSubMitStatus=false;
+                    _self.mbOrderId = response.data.data.mbOrderId;
+                    window.open(response.data.data.payUrl);
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isSubMitStatus=false;
+                }
+            })
+        },
         changePayAmount:function(event){//输入支付金额控制
             var _self = this;
             var value = event.target.value;
             if(value == "" || value <0 ){//判断是否等于0 或者为空
                 _self.payAmount = '';
-                _self.payInfo.PAY_PAYAMOUNT = _self.payInfo.PAY_UNPAIDAMOUNT;
-                _self.balanceAmount = _self.toFixedFn(_self.payInfo.PAY_UNPAIDAMOUNT);
+                _self.payInfo.payAmount = _self.payInfo.payUnpaidaMount;
+                _self.balanceAmount = _self.toFixedFn(_self.payInfo.payUnpaidaMount);
                 return;
-            }else if(Number(value) > _self.payInfo.PAY_UNPAIDAMOUNT){//判断大于应付金额
-                _self.payAmount = _self.payInfo.PAY_UNPAIDAMOUNT;
-                _self.payInfo.PAY_PAYAMOUNT =  _self.payAmount;
-                _self.balanceAmount = _self.toFixedFn(_self.payInfo.PAY_UNPAIDAMOUNT-_self.payInfo.PAY_PAYAMOUNT);
+            }else if(Number(value) > _self.payInfo.payUnpaidaMount){//判断大于应付金额
+                _self.payAmount = _self.payInfo.payUnpaidaMount;
+                _self.payInfo.payAmount =  _self.payAmount;
+                _self.balanceAmount = _self.toFixedFn(_self.payInfo.payUnpaidaMount-_self.payInfo.payAmount);
             }else{
                 _self.payAmount = value;
-                _self.payInfo.PAY_PAYAMOUNT = _self.payAmount;
-                _self.balanceAmount = _self.toFixedFn(_self.payInfo.PAY_UNPAIDAMOUNT-_self.payInfo.PAY_PAYAMOUNT);
+                _self.payInfo.payAmount = _self.payAmount;
+                _self.balanceAmount = _self.toFixedFn(_self.payInfo.payUnpaidaMount-_self.payInfo.payAmount);
             }
         },
         changePayAmountBlur:function(event){//失去焦点设置金额
             var _self = this;
             _self.payAmount = _self.toFixedFn(event.target.value);
-            _self.payInfo.PAY_PAYAMOUNT = _self.payAmount;
+            _self.payInfo.payAmount = _self.payAmount;
         },
         changeTab:function(index,item){//选择支付方式切换
             this.tabIndex = index;
             switch (this.tabIndex) {
                 case 0:
-                    this.payInfo.PAY_BANK_NUM = 'ALIPAY';
+                    this.payInfo.payBankNum = 'ALIPAY';
                     break;
                 case 1:
-                    this.payInfo.PAY_BANK_NUM = '';
+                    this.payInfo.payBankNum = '';
                     break;
             }
         },
         checkMobilePay:function(index,bankNum){//选择移动支付方式
-            this.mobileTabIndex = index;
-            this.payInfo.PAY_BANK_NUM = bankNum;
-            if( this.mobileTabIndex==2){
-                this.payInfo.PAY_TYPE = '1';
-                this.payInfo.PAY_USERTYPE = 'ENTERPRISE';
-            }else if(this.mobileTabIndex == 3){
-                this.payInfo.PAY_TYPE = '2';
-                this.payInfo.PAY_USERTYPE = 'USER';
+            var _self = this;
+            _self.mobileTabIndex = index;
+            _self.payInfo.payBankNum = bankNum;
+            if( _self.mobileTabIndex==2){
+                _self.bankTabIndex = 0
+                _self.payInfo.payType = '1';
+                _self.payInfo.payUserType = 'ENTERPRISE';
+            }else if(_self.mobileTabIndex == 3){
+                _self.bankTabIndex = 0
+                _self.payInfo.payType = '2';
+                _self.payInfo.payUserType = 'USER';
             }
         },
         checkBankPay:function(index,item){//选择网银支付方式-选择银行
-            this.bankTabIndex = index;
-            this.payInfo.PAY_BANK_NUM = item.bankNum;
+            var _self = this;
+            _self.bankTabIndex = index;
+            if( _self.mobileTabIndex == 2 ){
+                _self.payInfo.payBankNum = item.B2bNum;
+            }else if( _self.mobileTabIndex ==3 ){
+                _self.payInfo.payBankNum = item.B2cNum;
+            }
         },
         copyLinkPaySubmitFn:function(){//复制网银支付链接
             var _self = this;
@@ -430,16 +418,23 @@ var payContainer = new Vue({
                     CAIMEI.dialog('企业网银支付的金额必须大于￥10.00');
                     return;
                 }
-                PayApi.PayOrderPayLink({unpaidAmount:_self.payAmount,orderId:_self.payInfo.PAY_ORDERID,payType:_self.payInfo.PAY_TYPE},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('复制成功');
-                })
+                PayApi.PayOrderPayLink(
+                    {
+                        unpaidAmount:_self.payAmount,
+                        orderId:_self.payInfo.payOrderId,
+                        payType:_self.payInfo.payType
+                    },
+                    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('复制成功');
+                    }
+                )
             }
         },
         copyOrderBtnSubmitFn:function(){//复制订单标识
@@ -458,8 +453,8 @@ var payContainer = new Vue({
         },
         RefreshBody:function(){//刷新页面
             var _self = this;
-            if(_self.payInfo.PAY_BANK_NUM == 'WEIXIN'){
-                PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.PAY_ORDERID, paySuccessCounter:_self.paySuccessCounter},function(response){
+            if(_self.payInfo.payBankNum == 'WEIXIN'){
+                PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
                     _self.isPayAlert = false;
                     if(response.code === 0){
                         _self.windowLocationHref('success');
@@ -525,23 +520,23 @@ var payContainer = new Vue({
         }else{
              var HrefType = CAIMEI.getUrlParam('type');
             if(HrefType == 'payfirm'){
-                _self.payInfo.PAY_ORDERID =  CAIMEI.getUrlParam('orderId');
-                _self.orderIdentificationId = '#'+_self.payInfo.PAY_ORDERID+'#';
+                _self.payInfo.payOrderId =  CAIMEI.getUrlParam('orderId');
+                _self.orderIdentificationId = '#'+_self.payInfo.payOrderId+'#';
             }else{
                 var data =JSON.parse(localStorage.getItem("confirmOrderInfo"));
-                _self.payInfo.PAY_ORDERID = data.data.orderId;
-                _self.orderIdentificationId = '#'+_self.payInfo.PAY_ORDERID+'#';
+                _self.payInfo.payOrderId = data.data.orderId;
+                _self.orderIdentificationId = '#'+_self.payInfo.payOrderId+'#';
             }
             _self.infoPayOrderCheckoutCounter();//正常订单初始化
         }
         var viewer = window.navigator.userAgent.toLowerCase();
         if(viewer.match(/MicroMessenger/i) == 'micromessenger'){
             _self.is_Wechat_bowcr = true;
-            _self.payInfo.PAY_BANK_NUM = 'WEIXIN';
+            _self.payInfo.payBankNum = 'WEIXIN';
             _self.mobileTabIndex = 1;
         }else{
             _self.is_Wechat_bowcr = false;
-            _self.payInfo.PAY_BANK_NUM = 'ALIPAY';
+            _self.payInfo.payBankNum = 'ALIPAY';
             _self.mobileTabIndex = 0;
         }
     }

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

@@ -6,11 +6,11 @@ var payContainer = new Vue({
     data: {
         loginLoading:true,
         payInfo:{
-            PAY_TYPE:'',//支付类型 WEIXIN 微信支付  ALIPAY 支付宝支付
-            PAY_ORDERID:'', //订单ID
-            PAY_PAYAMOUNT:0,
-            PAY_UNPAIDAMOUNT:0,//本次支付金额
-            PAY_MOBILE_URL:'',//URL
+            payType:'',//支付类型 WEIXIN 微信支付  ALIPAY 支付宝支付
+            payOrderId:'', //订单ID
+            payAmount:0,
+            payUnpaidAmount:0,//本次支付金额
+            payMobileUrl:'',//URL
         },
         orderNo:'',//订单编号
         payableAmount:'',//应付金额
@@ -52,7 +52,7 @@ var payContainer = new Vue({
             var _self = this;
             if( _self.pageType === '1'){
                 setTimeout(function(){
-                    switch (_self.payInfo.PAY_TYPE) {
+                    switch (_self.payInfo.payType) {
                         case 'WEIXIN':
                             _self.getWrchatQrcodeShow();
                             break;
@@ -62,14 +62,14 @@ var payContainer = new Vue({
                     }
                 },2000);
             }else{
-                PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.PAY_ORDERID},function(response){
+                PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.payOrderId},function(response){
                     if(response.code == 0){
                         // console.log(response);
                         var data = response.data;
                         _self.orderNo = data.order.orderNo;
                         _self.paySuccessCounter = data.order.paySuccessCounter;
-                        _self.payInfo.PAY_PAYAMOUNT = data.order.payableAmount-data.order.receiptAmount;
-                        switch (_self.payInfo.PAY_TYPE) {
+                        _self.payInfo.payAmount = data.order.payableAmount-data.order.receiptAmount;
+                        switch (_self.payInfo.payType) {
                             case 'WEIXIN':
                                 _self.getWrchatQrcodeShow();
                                 break;
@@ -88,7 +88,7 @@ var payContainer = new Vue({
             var _self = this;
             var qrcode = new QRCode(document.getElementById("ali_pay_container"), {
                     render: "canvas", //也可以替换为table
-                    text: _self.payInfo.PAY_MOBILE_URL,
+                    text: _self.payInfo.payMobileUrl,
                     width: 220,
                     height: 220,
                     colorDark : "#000000",
@@ -118,14 +118,14 @@ var payContainer = new Vue({
             }else{
                 orderInfo = {//普通订单微信二维码参数
                     pageType:0,
-                    orderID:_self.payInfo.PAY_ORDERID,
+                    orderID:_self.payInfo.payOrderId,
                     payAmount:_self.payAmount
                 };
             }
-            _self.payInfo.PAY_MOBILE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+            _self.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxea43a0f9ebce9e66&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
             var qrcode = new QRCode(document.getElementById("wx_pay_container"), {
                 render: "canvas", //也可以替换为table
-                text: _self.payInfo.PAY_MOBILE_URL,
+                text: _self.payInfo.payMobileUrl,
                 width: 220,
                 height: 220,
                 colorDark : "#000000",
@@ -146,7 +146,7 @@ var payContainer = new Vue({
         setTimerWechatPay:function () {//定时任务查询微信支付结果
             var _self = this;
             var timer;
-            PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.PAY_ORDERID, paySuccessCounter:_self.paySuccessCounter},function(response){
+            PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
                 // console.log(response);
                 if(response.code === 0){
                     clearTimeout(timer); //清理定时任务
@@ -189,27 +189,27 @@ var payContainer = new Vue({
     },
     mounted: function () {
         var _self = this;
-        var payData = JSON.parse(CAIMEI.Storage.getItem('PAY_DATA'));
+        var payData = JSON.parse(CAIMEI.Storage.getItem('payData'));
         _self.pageType = CAIMEI.getUrlParam('pageType');
         console.log(payData);
         console.log(_self.pageType);
         if( _self.pageType === '1'){
             console.log('二手商品');
-            _self.payInfo.PAY_TYPE = payData.type;
+            _self.payInfo.payType = payData.type;
             _self.productID = payData.productId;
-            _self.payInfo.PAY_MOBILE_URL = payData.url;
+            _self.payInfo.payMobileUrl = payData.url;
             _self.mbOrderId = payData.mbOrderId;
             _self.payAmount = _self.payableAmount = payData.amount;
         }else{
             console.log('订单支付');
-            _self.payInfo.PAY_TYPE = payData.type;
-            _self.payInfo.PAY_ORDERID = payData.orderid;
-            _self.payInfo.PAY_UNPAIDAMOUNT = payData.amount;
-            _self.payInfo.PAY_MOBILE_URL = payData.url;
+            _self.payInfo.payType = payData.type;
+            _self.payInfo.payOrderId = payData.orderid;
+            _self.payInfo.payUnpaidAmount = payData.amount;
+            _self.payInfo.payMobileUrl = payData.url;
             _self.mbOrderId = payData.mbOrderId;
-            _self.payAmount =_self.payableAmount = _self.payInfo.PAY_UNPAIDAMOUNT;
+            _self.payAmount =_self.payableAmount = _self.payInfo.payUnpaidAmount;
         }
-        console.log(_self.payInfo.PAY_TYPE);
+        console.log(_self.payInfo.payType);
         _self.infoPayOrderCheckoutCounter();
     }
 });

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

@@ -40,13 +40,12 @@ var payContainer = new Vue({
         WxRequestsecondHandPay:function(){
             var _this = this;
             var params = {
-                payWay:'WEIXIN',
-                code:_this.wechatcode,
-                state:_this.rand(1000,9999),
-                productId:_this.productId,
-                returnUrl:'https://www.caimei365.com/',
-            };
-            PayApi.PayOrdersecondHandPay(params,function(response){
+                    code:_this.wechatcode,
+                    state:_this.rand(1000,9999),
+                    productId:_this.productId,
+                    returnUrl:'https://www.caimei365.com/',
+                };
+            PayApi.PayOrdersecondWechat(params,function(response){
                 if(response.code == 0){
                     var PayInfo = JSON.parse(response.data.data.payInfo);
                     if (typeof WeixinJSBridge == "undefined"){
@@ -71,7 +70,6 @@ var payContainer = new Vue({
             var _this = this;
             var params={
                     payAmount:_this.payAmount*100,
-                    payWay:"WEIXIN",
                     code:_this.wechatcode,
                     state:_this.rand(1000,9999),
                     orderId:_this.orderID,

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

@@ -3,8 +3,8 @@
  */
 // var _WS_SERVICE = 'http://192.168.2.67:8010'; //维沙网银支付本地联调
 // var _WS_SERVICE = 'http://192.168.2.68:8010'; //维沙网银支付本地联调
-var _WS_SERVICE = 'https://mall2b-b.caimei365.com';//维沙网银支付测试联调
-// var _WS_SERVICE = 'https://mall2b.caimei365.com';//维沙网银支付正式联调
+// var _WS_SERVICE = 'https://mall2b-b.caimei365.com';//维沙网银支付测试联调
+var _WS_SERVICE = 'https://mall2b.caimei365.com';//维沙网银支付正式联调
 var payContainer = new Vue({
     el:"#payContainer",
     data: {
@@ -20,55 +20,8 @@ var payContainer = new Vue({
             PAY_USERTYPE:'',//网银支付类型
             PAY_PAYLINKTYPETEXT:''//文案
         },
-        B2BbankData:[
-            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',B2bNum:'ICBC_B2B',B2cNum:'ICBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',B2bNum:'CMBCHINA_B2B',B2cNum:'CMBCHINA_B2C'},
-            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',B2bNum:'CCB_B2B',B2cNum:'CCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',B2bNum:'CIB_B2B',B2cNum:'CIB_B2C'},
-            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',B2bNum:'CMBC_B2B',B2cNum:'CMBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国光大银行',B2bNum:'CEB_B2B',B2cNum:'CEB_B2C'},
-            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',B2bNum:'BOC_B2B',B2cNum:'BOC_B2C'},
-            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',B2bNum:'SZPA_B2B',B2cNum:'SZPA_B2C'},
-            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',B2bNum:'ECITIC_B2B',B2cNum:'ECITIC_B2C'},
-            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'上海浦东发展银行',B2bNum:'SPDB_B2B',B2cNum:'SPDB_B2C'},
-            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',B2bNum:'HXB_B2B',B2cNum:'HXB_B2C'},
-            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',B2bNum:'BCCB_B2B',B2cNum:'BCCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',B2bNum:'ABC_B2B',B2cNum:'ABC_B2C'},
-            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',B2bNum:'PSBC_B2B',B2cNum:'PSBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',B2bNum:'HSB_B2B',B2cNum:'HSB_B2C'},
-            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',B2bNum:'QDYH_B2B',B2cNum:'QDYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',B2bNum:'CZ_B2B',B2cNum:'CZ_B2C'},
-            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',B2bNum:'QLYH_B2B',B2cNum:'QLYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',B2bNum:'SHB_B2B',B2cNum:'SHB_B2C'},
-            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',B2bNum:'ISBC_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',B2bNum:'XMCCB_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-23@2x.png',bankName:'晋商银行',B2bNum:null,B2cNum:'JSHB_B2C'}
-
-        ],
-        B2CbankData:[
-            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',B2bNum:'ICBC_B2B',B2cNum:'ICBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',B2bNum:'CMBCHINA_B2B',B2cNum:'CMBCHINA_B2C'},
-            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',B2bNum:'CCB_B2B',B2cNum:'CCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',B2bNum:'CIB_B2B',B2cNum:'CIB_B2C'},
-            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',B2bNum:'CMBC_B2B',B2cNum:'CMBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国光大银行',B2bNum:'CEB_B2B',B2cNum:'CEB_B2C'},
-            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',B2bNum:'BOC_B2B',B2cNum:'BOC_B2C'},
-            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',B2bNum:'SZPA_B2B',B2cNum:'SZPA_B2C'},
-            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',B2bNum:'ECITIC_B2B',B2cNum:'ECITIC_B2C'},
-            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'上海浦东发展银行',B2bNum:'SPDB_B2B',B2cNum:'SPDB_B2C'},
-            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',B2bNum:'HXB_B2B',B2cNum:'HXB_B2C'},
-            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',B2bNum:'BCCB_B2B',B2cNum:'BCCB_B2C'},
-            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',B2bNum:'ABC_B2B',B2cNum:'ABC_B2C'},
-            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',B2bNum:'PSBC_B2B',B2cNum:'PSBC_B2C'},
-            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',B2bNum:'HSB_B2B',B2cNum:'HSB_B2C'},
-            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',B2bNum:'QDYH_B2B',B2cNum:'QDYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',B2bNum:'CZ_B2B',B2cNum:'CZ_B2C'},
-            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',B2bNum:'QLYH_B2B',B2cNum:'QLYH_B2C'},
-            {imgUrl:'/img/pay/iconbank-20@2x.png',bankName:'上海银行',B2bNum:'SHB_B2B',B2cNum:'SHB_B2C'},
-            {imgUrl:'/img/pay/iconbank-21@2x.png',bankName:'莱商银行',B2bNum:'ISBC_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-22@2x.png',bankName:'厦门银行',B2bNum:'XMCCB_B2B',B2cNum:null},
-            {imgUrl:'/img/pay/iconbank-23@2x.png',bankName:'晋商银行',B2bNum:null,B2cNum:'JSHB_B2C'}
-        ],
+        B2BbankData:bank.b2BbankData,// 企业网银
+        B2CbankData:bank.b2CbankData,// 个人网银
         userName :'',
         goodList:'',
         freight :'',       //运费

src/main/resources/static/js/shopping/confirm.js

@@ -21,7 +21,7 @@ const defaultConfirmParam = {
         clubCouponId:0,		// 关联优惠券Id
         clubId:0,			// 机构Id
         orderInfo:[],		// 订单商品数据 // 订单发票信息
-        orderInvoice:{ type: 0 },     // 订单发票信息
+        orderInvoice:{ type: 0 },   // 订单发票信息
         payInfo:{			        // 订单金额数据
             orderShouldPayFee: 0,	// 订单最终支付金额
             balancePayFlag: 0,		// 勾选余额的状态(1使用，0不使用)
@@ -47,7 +47,7 @@ var shoppingConfirm = new Vue({
         reducedPrice: 0,          // 满减金额
         couponAmount:0,	  		  // 优惠券金额
         totalDiscountAmount:0,	  // 共减金额
-        cartParam: Object.assign({}, defaultCartParam), 		// 购物车立即结算确认订单参数
+        cartParam: Object.assign({}, defaultCartParam), 		    // 购物车立即结算确认订单参数
         productParam: Object.assign({}, defaultProductParam), 	// 商品立即购买确认订单参数
         postageParam: Object.assign({}, defaultPostageParam),	// 邮费计算参数
         confirmParam: Object.assign({}, defaultConfirmParam), 	// 提交订单参数

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

@@ -12,7 +12,7 @@ var orderPage = new Vue({
         townOptions:[],
         addressForm: {
             id: '',
-            name: '',
+            receiver: '',
             mobile: '',
             townId: '',
             cityId: '',
@@ -33,16 +33,16 @@ var orderPage = new Vue({
         },
         GetQueryListData:function(){//查询d地址列表
             var _self = this;
-            OrderApi.GetAddressList({userID:_self.userId,pageNum:1,pageSize:20},function (response) {
+            OrderApi.GetAddressList({userId:_self.userId,pageNum:1,pageSize:20},function (response) {
                 if(response.code == 0){
                     var data = response.data;
                     if(data.results && data.results.length>0) {
                         _self.addressList = [];
-                        _self.addressList = data.results;
+                        _self.addressList = data.list;
                         _self.addressLength =  _self.addressList.length;
                     }else{
                         _self.addressList = [];
-                        _self.addressList = data.results;
+                        _self.addressList = data.list;
                     }
                     _self.isRequset = false;
                 }else{
@@ -53,7 +53,7 @@ var orderPage = new Vue({
         // 获取全部省份
         getProvinceOptions: function(){
             var _self = this;
-            PublicApi.GetProvince({},function(r){
+            OrderApi.GetAddressSelect({},function(r){
                 if(r.code === 0 && r.data){
                     _self.provinceOptions =r.data;
                 }else{
@@ -61,14 +61,14 @@ var orderPage = new Vue({
                 }
             });
         },
-        getCityOptions: function(provinceId,callback){
+        getCityOptions: function(parentId,callback){
             var _self = this;
-            if(provinceId && provinceId>0){
+            if(parentId && parentId>0){
                 _self.cityOptions = [];
                 _self.townOptions = [];
                 _self.addressForm.cityId = '';
                 _self.addressForm.townId = '';
-                PublicApi.GetCity({ provinceId: provinceId },function(r){
+                OrderApi.GetAddressSelect({ parentId: parentId,type:1 },function(r){
                     if(r.code === 0 && r.data){
                         _self.cityOptions = r.data;
                         if(callback){callback();}
@@ -78,12 +78,12 @@ var orderPage = new Vue({
                 });
             }
         },
-        getTownOptions: function(cityId, callback){
+        getTownOptions: function(parentId, callback){
             var _self = this;
-            if(cityId && cityId>0){
+            if(parentId && parentId>0){
                 _self.townOptions = [];
                 _self.addressForm.townId = '';
-                PublicApi.GetTown({cityId: cityId},function(r){
+                OrderApi.GetAddressSelect({parentId: parentId,type:2},function(r){
                     if(r.code === 0 && r.data){
                         _self.townOptions = r.data;
                         if(callback){callback();}
@@ -105,10 +105,10 @@ var orderPage = new Vue({
                 }
             });
         },
-        deleteAddress :function(addressID){//列表删除单个地址
+        deleteAddress :function(addressId){//列表删除单个地址
             var _self = this;
             CAIMEI.Modal('确定要删除该地址？','取消','确定',function () {
-                OrderApi.DeleteAddress({addressID:addressID,userID:_self.userId},function (response) {
+                OrderApi.DeleteAddress({addressId:addressId,userId:_self.userId},function (response) {
                     if(response.code == 0 ){ //删除成功
                         CAIMEI.dialog('删除成功',true,function () {
                             _self.GetQueryListData();
@@ -122,7 +122,7 @@ var orderPage = new Vue({
         createAddress: function(){
             this.isShwoAddModel = true;
             this.addressForm.id = 0;
-            this.addressForm.name = '';
+            this.addressForm.receiver = '';
             this.addressForm.mobile = '';
             this.addressForm.default = false;
             this.addressForm.desc = '';
@@ -131,19 +131,20 @@ var orderPage = new Vue({
             this.addressForm.townId = '';
             if(!isPC){fixedBody();}
         },
-        editAddress :function(item) {//编辑地址
-            this.isShwoAddModel = true;
-            this.addressForm.id = item.addressID;
-            this.addressForm.name = item.shouHuoRen;
-            this.addressForm.mobile = item.mobile;
-            this.addressForm.default = (item.defaultFlag*1===1);
-            this.addressForm.desc = item.address;
-            this.addressForm.provinceId = item.provinceID;
+        editAddress :function(item) {// 编辑地址
             var _self = this;
-            this.getCityOptions(item.provinceID, function(){
-                _self.addressForm.cityId = item.cityID;
-                _self.getTownOptions(item.cityID,function(){
-                    _self.addressForm.townId = item.townID;
+            console.log(item)
+            _self.isShwoAddModel = true;
+            _self.addressForm.id = item.addressId;
+            _self.addressForm.receiver = item.receiver;
+            _self.addressForm.mobile = item.mobile;
+            _self.addressForm.default = (item.defaultFlag*1===1);
+            _self.addressForm.desc = item.address;
+            _self.addressForm.provinceId = item.provinceId;
+            _self.getCityOptions(item.provinceId, function(){
+                _self.addressForm.cityId = item.cityId;
+                _self.getTownOptions(item.cityId,function(){
+                    _self.addressForm.townId = item.townId;
                 });
             });
             if(!isPC){fixedBody();}
@@ -164,13 +165,13 @@ var orderPage = new Vue({
                 };
                 _self.isConDisabled = true;
                 var params = {
-                    userID:_self.userId, //用户id ,只在新增收货地址时传
-                    shouHuoRen:_self.addressForm.name, //收货人
-                    mobile:_self.addressForm.mobile,   //手机
-                    townID:_self.addressForm.townId,   //区ID
-                    address:_self.addressForm.desc, //地址
-                    defaultFlag:_self.addressForm.default?1:0 //是否默认收货地址(0 不是默认,1 默认)
-                };
+                        userId:_self.userId, //用户id ,只在新增收货地址时传
+                        receiver:_self.addressForm.receiver, //收货人
+                        mobile:_self.addressForm.mobile,   //手机
+                        townId:_self.addressForm.townId,   //区ID
+                        address:_self.addressForm.desc, //地址
+                        defaultFlag:_self.addressForm.default?1:0 //是否默认收货地址(0 不是默认,1 默认)
+                    };
                 if(_self.addressForm.id){
                     // 编辑
                     params.addressID = _self.addressForm.id;//编辑保存地址ID

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

@@ -71,7 +71,7 @@ var orderPage = new Vue({
     methods: {
         GetQueryOrderDetailsInfo:function(){//查询订单详情
             var _self = this;
-            OrderApi.QueryOrderDetailsInfo({orderID:_self.orderId , userId:_self.userId},function (response) {
+            OrderApi.QueryOrderDetailsInfo({orderId:_self.orderId , userId:_self.userId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
                     _self.orderInfo = data.order;
@@ -227,7 +227,7 @@ var orderPage = new Vue({
                                 _self.modelType = 3;
                                 _self.showModelTypePop();
                             }else{
-                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.orderId;
+                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.orderId;
                             }
                     }
                 }else{
@@ -246,7 +246,7 @@ var orderPage = new Vue({
                             _self.modelType = 3;
                             _self.showModelTypePop();
                         } else {
-                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.orderId;
+                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.orderId;
                         }
                     }
                 } else {
@@ -260,7 +260,7 @@ var orderPage = new Vue({
                 _self.modelType = 3;
                 _self.showModelTypePop();
             }else{
-                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.orderId;
+                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.orderId;
             }
         },
         hidePaymentConfirm:function(){//隐藏弹窗

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

@@ -303,7 +303,7 @@ var orderPage = new Vue({
                                 _self.modelType = 3;
                                 _self.showModelTypePop();
                             }else{
-                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+orderId;
+                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+orderId;
                             }
                     }
                 }else{
@@ -322,7 +322,7 @@ var orderPage = new Vue({
                             _self.modelType = 3;
                             _self.showModelTypePop();
                         } else {
-                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.hanldOrderData.orderID;
+                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
                         }
                     }
                 } else {
@@ -336,7 +336,7 @@ var orderPage = new Vue({
                 _self.modelType = 3;
                 _self.showModelTypePop();
             }else{
-                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.hanldOrderData.orderID;
+                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderId='+_self.hanldOrderData.orderId;
             }
         },
         hidePaymentConfirm:function(){//隐藏弹窗

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

@@ -4,6 +4,7 @@ var logistics = new Vue({
        data:{
             showflag:false,
             orderId:'',
+            logisticsList:[],
             dataList:[],
             logisticsInfoList:[],
             activeIndex:''
@@ -15,30 +16,33 @@ var logistics = new Vue({
                   _this.showflag= !_this.showflag;
                   info.showflag = _this.showflag
               // }
-
           },
+           initLogistics:function(){
+               var _self = this;
+               OrderApi.seelogistics({orderId:_self.orderId},function (res) {
+                   if(res.code==0){
+                       var data = res.data;
+                       console.log('00000000000',data);
+                       if(data.length>0){
+                           _self.logisticsList = data;
+                           // _self.logisticsList= data[0].shopOrderList;
+                           // _self.logisticsInfoList =data[0].logisticsInformationList;
+                       }else {
+                           _self.dataList =[];
+                           _self.logisticsList =[];
+                           _self.logisticsInfoList = [];
+                           console.log('22222222222',_self.logisticsInfoList)
+                       }
+                   }else {
+                       CAIMEI.Alert(res.msg,'确定')
+                   }
+               });
+           }
        },
        mounted:function () {
-              var _self = this;
-              _self.orderId = CAIMEI.getUrlParam('orderId');
-           OrderApi.seelogistics({orderId:_self.orderId},function (res) {
-                  if(res.code==0){
-                  console.log(res);
-                     if(res.data.logisticsRecordList.length>0){
-                            _self.dataList=res.data.logisticsRecordList;
-                     }else {
-                             _self.dataList=[]
-                      }
-                      if(res.data.logisticsInfoList.length>0){
-                            _self.logisticsInfoList = res.data.logisticsInfoList;
-                      }else {
-                            _self.logisticsInfoList = []
-                      }
-                  }else {
-                      CAIMEI.Alert(res.msg,'确定')
-                  }
-           });
-
+                var _self = this;
+                _self.orderId = CAIMEI.getUrlParam('orderId');
+                _self.initLogistics();
        }
 
 })

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

@@ -29,7 +29,7 @@
                 </div>
             </div>
             <!-- 维沙 -->
-             <template v-if="organizeID === 3">
+             <template v-if="organizeId === 3">
                 <div class="pay-goods">
                     <div class="good-top">
                         <div class="good-top-inner ws">
@@ -62,7 +62,9 @@
                         <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.productImage" :alt="item.name"></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>
@@ -103,7 +105,9 @@
                         <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"><img :src="item.productImage" :alt="item.name"></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>
@@ -135,13 +139,13 @@
                 </div>
             </template>
             <div class="pay-bank">
-                <div class="bank-title">请选择以下一家银行进行付款<span class="color">(请在倒计时时间内使用<span class="big"> {{ payInfo.PAY_PAYLINKTYPETEXT }} </span>完成本次支付)</span></div>
-                <div class="bank-list" id="bankContent" v-if="payInfo.PAY_PAYLINKTYPE == '1'">
+                <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>
                 </div>
-                <div class="bank-list" id="bankContentC" v-if="payInfo.PAY_PAYLINKTYPE == '2'">
+                <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>
@@ -180,6 +184,7 @@
 <script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.service.js(v=${version})}"></script>
 <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/pay/caimei-bank.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-paycash.html

@@ -106,11 +106,13 @@
                                 </a>
                             </div>
                         </div>
-                        <div class="pay-link" v-if="mobileTabIndex === 2 || mobileTabIndex === 3 && pageType != '1'">
-                            <p v-if="isPC">若您在公司的职位无法直接使用企业网银付款，请点击右侧“复制支付链接”按钮，将该链接发送给公司财务人员进行企业网银付款</p>
-                            <a href="javascript:void(0);" id="copyLink" @click="copyLinkPaySubmitFn">复制支付链接</a>
-                            <p v-if="!isPC">复制支付链接成功后，将链接发送到电脑端进行付款</p>
-                        </div>
+                        <template v-if="pageType != '1'">
+                            <div class="pay-link" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
+                                <p v-if="isPC">若您在公司的职位无法直接使用企业网银付款，请点击右侧“复制支付链接”按钮，将该链接发送给公司财务人员进行企业网银付款</p>
+                                <a href="javascript:void(0);" id="copyLink" @click="copyLinkPaySubmitFn">复制支付链接</a>
+                                <p v-if="!isPC">复制支付链接成功后，将链接发送到电脑端进行付款</p>
+                            </div>
+                        </template>
                     </div>
                     <div class="payment" id="offlinePayment" v-if="tabIndex === 1">
                         <div class="payment-transfer">
@@ -159,6 +161,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.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/caimei-paycash.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -20,7 +20,7 @@
 <!--        <img src="/img/base/loading.gif">-->
 <!--    </div>-->
     <div class="container" :class="isRequest ? 'active' : ''">
-        <div class="pay-content weixin clearfix" v-if="payInfo.PAY_TYPE === 'WEIXIN'">
+        <div class="pay-content weixin clearfix" v-if="payInfo.payType === 'WEIXIN'">
             <div class="pay-codecontent">
                 <div class="pay-amount">
                     <div class="pay-amount-text">
@@ -47,7 +47,7 @@
                 </div>
             </div>
         </div>
-        <div class="pay-content ali clearfix" v-if="payInfo.PAY_TYPE === 'ALIPAY'">
+        <div class="pay-content ali clearfix" v-if="payInfo.payType === 'ALIPAY'">
             <div class="pay-codecontent">
                 <div class="pay-amount">
                     <div class="pay-amount-text">

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

@@ -131,6 +131,7 @@
 <script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.service.js(v=${version})}"></script>
 <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/pay/caimei-bank.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-weisapay.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -42,7 +42,7 @@
                             <div class="form">
                                 <div class="formLine">
                                     <p class="label"><em>*</em>收货人：</p>
-                                    <input type="text" v-model.trim="addressForm.name" placeholder="请输入收货人姓名" :rule="rule.name" maxlength="10" @blur="blurHandle($event)" needverify>
+                                    <input type="text" v-model.trim="addressForm.receiver" placeholder="请输入收货人姓名" :rule="rule.name" maxlength="10" @blur="blurHandle($event)" needverify>
                                     <i class="checked icon mIcon"></i>
                                     <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                                 </div>
@@ -56,15 +56,15 @@
                                     <p class="label"><em>*</em>联系地址：</p>
                                     <select name="province" v-model="addressForm.provinceId" @change="getCityOptions(addressForm.provinceId)">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in provinceOptions" :key="index" :value='item.provinceID'>{{item.name}}</option>
+                                        <option v-for="(item ,index) in provinceOptions" :key="index" :value='item.id'>{{item.name}}</option>
                                     </select>
                                     <select name="city" v-model="addressForm.cityId" @change="getTownOptions(addressForm.cityId)">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in cityOptions" :key="index" :value="item.cityID">{{item.name}}</option>
+                                        <option v-for="(item ,index) in cityOptions" :key="index" :value="item.id">{{item.name}}</option>
                                     </select>
                                     <select name="town" v-model="addressForm.townId">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in townOptions" :key="index" :value="item.townID">{{item.name}}</option>
+                                        <option v-for="(item ,index) in townOptions" :key="index" :value="item.id">{{item.name}}</option>
                                     </select>
                                     <textarea v-model.trim="addressForm.desc" placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  @blur="blurHandle($event)" needverify></textarea>
                                     <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
@@ -83,11 +83,10 @@
                             </div>
                         </div>
                     </div>
-
                     <div class="section" v-if="addressList.length > 0">
                         <div class="list" v-for="(item, index) in addressList" :key="index">
                             <div class="list-left">
-                                <p><span class="label">收货人:</span>{{item.shouHuoRen}}</p>
+                                <p><span class="label">收货人:</span>{{item.receiver}}</p>
                                 <p><span class="label">联系方式:</span>{{item.mobile}}</p>
                                 <p><span class="label">收货地址:</span><span class="prov">{{item.province}}</span>{{item.city}}{{item.town}}{{item.address}}</p>
                             </div>
@@ -97,10 +96,10 @@
                                         <i class="icon mIcon"></i>
                                         <span class="span-s">默认地址</span>
                                     </template>
-                                    <a v-else @click="setDefaultAddress(item.addressID)" href="javascript:void(0)">设为默认地址</a>
+                                    <a v-else @click="setDefaultAddress(item.addressId)" href="javascript:void(0)">设为默认地址</a>
                                 </div>
                                 <div class="list-button">
-                                    <a class="list-btn ico" href="javascript:void(0)" @click.stop="deleteAddress(item.addressID)">
+                                    <a class="list-btn ico" href="javascript:void(0)" @click.stop="deleteAddress(item.addressId)">
                                         <i class="icon mIcon">
                                             <span>删除</span>
                                         </i>

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

@@ -52,7 +52,7 @@
                                     <p class="copy" @click="copyOrderBtnSubmitFn">复制</p>
                                 </div>
                                 <div class="order-item">
-                                    <p>收货人：<span class="none">{{userInfo.shouHuoRen}}</span> </p>
+                                    <p>收货人：<span class="none">{{userInfo.receiver}}</span> </p>
                                     <p>电话：<span class="none">{{userInfo.mobile}}</span> </p>
                                     <p class="address">地址：<span class="none">{{userInfo.province}}{{userInfo.city}}{{userInfo.town}}{{userInfo.address}}</span> </p>
                                 </div>
@@ -101,7 +101,7 @@
                                     <div class="section-prosinfo" v-for="(pros, pIndex) in shop.orderProductList" :key="pIndex">
                                         <div class="product-t clear">
                                             <div class="image">
-                                                <img :src="pros.productImage" alt="">
+                                                <img :src="pros.image" alt="">
                                                 <span v-if="pros.productType==2||pros.productType==1" class="tip">赠品</span>
                                             </div>
                                             <div class="text">

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

@@ -24,62 +24,70 @@
              <!--左侧导航-->
              <template th:replace="user-center/components/tableft"></template>
             <div class="right">
-                <div class="order-logistics">
-                    <div class="order-list" v-for="item in dataList">
-                        <div class="left-img">
-                            <img :src="item.image">
-                        </div>
-                        <div class="right-name">
-                            <p class="product-name">{{item.productName}}</p>
-                            <p class="product-num">
-                                <span class="number">数量：{{item.buyNum}}</span>
-                                <span class="Ship">已发货：<span>{{item.shipmentsNum}}</span></span>
-                            </p>
+                <div v-if="logisticsList.length>0">
+                    <div class="order-logistics-list clear" v-for="logistics in logisticsList" :key="logistics">
+                        <div class="order-logistics clear" v-for="shop in logistics.shopOrderList">
+                            <div class="order-title">
+                                <div class="order-shopLogo">
+                                    <img :src="shop.shopLogo" alt="">
+                                </div>
+                                <div class="order-shopName">{{ shop.shopName }}</div>
+                            </div>
+                            <div class="order-product-list">
+                                <div class="order-product" v-for="pros in shop.logisticsRecordList">
+                                    <div class="left-img"><img :src="pros.image"></div>
+                                    <div class="right-name">
+                                        <p class="product-name">{{pros.productName}}</p>
+                                        <p class="product-num">
+                                            <span class="number">数量：{{pros.buyNum}}</span>
+                                            <span class="Ship">已发货：<span>{{pros.num}}</span></span>
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="mainContent">
-                    <div class="title">物流信息</div>
-                    <div class="logistics-deatil">
-                        <div class="title-deatil">物流详情</div>
-                         <div class="logsitics-list" v-if="logisticsInfoList.length>0">
-                             <div class="goodlist" v-for="(info,index) in logisticsInfoList" :key="index">
-                               <p>发货时间：<span>{{info.updateDate}}</span></p>
-                               <p v-if="isPC">物流公司：<span>{{info.logisticsCompanyName}}</span></p>
-                               <p v-if="isPC">物流单号：<span>{{info.nu}}</span></p>
-                               <p v-if="showflag && !(isPC)">物流公司：<span>{{info.logisticsCompanyName}}</span></p>
-                               <p v-if="showflag && !(isPC)">物流单号：<span>{{info.nu}}</span></p>
-                               <i class="icon mIcon" @click="openpackage(info)" :class="info.showflag?'open1':'open'"></i>
-                                 <div class="package-status" v-show="info.showflag">
-                                    <div class="status-box">
-                                        <ul class="status-list" v-if="isPC">
-                                            <li v-for="r in info.routerList">
-                                               <div class="status-time-before">{{r.time.substring(0,10)}}</div>
-                                                <div class="status-date">{{r.time.substring(20,23)}}</div>
-                                                <div class="status-time">{{r.time.substring(10,20)}}</div>
-                                                <div class="status-content-before">{{r.desc}}</div>
-                                            </li>
-                                        </ul>
-                                        <ul class="status-list" v-else>
-                                            <li  v-for="r in info.routerList">
-                                                <div class="status-content-before">{{r.desc}}</div>
-                                                <div class="status-time-before">2017-08-17</div>
-                                                <div class="status-date">周一</div>
-                                                <div class="status-time">14:24:36</div>
-                                            </li>
-                                        </ul>
+                        <div class="mainContent">
+                            <div class="title">物流信息</div>
+                            <div class="logistics-deatil">
+                                <div class="title-deatil">物流详情</div>
+                                <div class="logsitics-list">
+                                    <div class="goodlist" v-for="(info,index) in logistics.logisticsInformationList" :key="index">
+                                        <p>发货时间：<span>{{info.updateDate}}</span></p>
+                                        <p v-if="isPC">物流公司：<span>{{info.logisticsCompanyName}}</span></p>
+                                        <p v-if="isPC">物流单号：<span>{{info.nu}}</span></p>
+                                        <p v-if="showflag && !(isPC)">物流公司：<span>{{info.logisticsCompanyName}}</span></p>
+                                        <p v-if="showflag && !(isPC)">物流单号：<span>{{info.nu}}</span></p>
+                                        <i class="icon mIcon" @click="openpackage(info)" :class="info.showflag?'open1':'open'"></i>
+                                        <div class="package-status" v-show="info.showflag">
+                                            <div class="status-box">
+                                                <ul class="status-list" v-if="isPC">
+                                                    <li v-for="r in info.routerList">
+                                                        <div class="status-time-before">{{r.time.substring(0,10)}}</div>
+                                                        <div class="status-date">{{r.time.substring(20,23)}}</div>
+                                                        <div class="status-time">{{r.time.substring(10,20)}}</div>
+                                                        <div class="status-content-before">{{r.desc}}</div>
+                                                    </li>
+                                                </ul>
+                                                <ul class="status-list" v-else>
+                                                    <li  v-for="r in info.routerList">
+                                                        <div class="status-content-before">{{r.desc}}</div>
+                                                        <div class="status-time-before">2017-08-17</div>
+                                                        <div class="status-date">周一</div>
+                                                        <div class="status-time">14:24:36</div>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-
-                             </div>
-                         </div>
-                         <div v-else class="empty">
-                            <img src="/img/order/icon-logsitics.svg">
-                           <div class="msg"><p>暂无数据</p></div>
-                         </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
-
+                <div v-else class="empty">
+                    <img src="/img/order/icon-logsitics.svg">
+                    <div class="msg"><p>暂无数据</p></div>
+                </div>
             </div>
         </div>
     </div>