订单模块接口联调

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

@@ -4,9 +4,12 @@ spring:
   #数据源连接--start
   datasource:
     #driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    username: developer
+#    password: 05bZ/OxTB:X+yd%1
+    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: 05bZ/OxTB:X+yd%1
+    password: J5p3tgOVazNl4ydf
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5

src/main/resources/static/js/base.js

@@ -103,13 +103,14 @@ var globalHead = new Vue({
         // 头部购物车数据
         getHeadCart: function(userId) {
             var _self = this;
-            tokenAjax("get", "/shoppingCart/header/cart", {userId: userId},function (r) {
+            $.getJSON(coreServer+"/order/club/cart/head",{ userId: userId }).done(function (r) {
                 if (r.code === 0 && r.data) {
-                    _self.headCart.cartList = r.data;
-                    _self.headCart.cartCount = r.data.length;
+                    var data = r.data;
+                    _self.headCart.cartList = data.list;
+                    _self.headCart.cartCount = data.list.length;
                     _self.headCart.productCount = 0;
                     _self.headCart.priceTotal = 0;
-                    r.data.map(function(item){
+                    data.list.map(function(item){
                         _self.headCart.productCount += item.number;
                         _self.headCart.priceTotal += item.number*item.price;
                     });
@@ -117,7 +118,9 @@ var globalHead = new Vue({
                     CAIMEI.Storage.clear();
                     location.href = "/login.html";
                 }
-            });
+            }).fail(function(){
+                return callback();
+            })
         },
         goCartsLinkFn:function(){
             var _self = this;
@@ -132,7 +135,7 @@ var globalHead = new Vue({
         },
         DeleteCartProducts:function(id){  // 删除购物车
             var _self = this;
-            ShoppingApi.DeleteCartProducts({userID: this.userData.userId, productIDs: id},function(response){
+            ShoppingApi.DeleteCartProducts({userId: this.userData.userId, productIds: id},function(response){
                 if(response.code === 0){
                     _self.getHeadCart(_self.userData.userId);
                 }else{

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

@@ -7,10 +7,11 @@ var OrderApi = {
         /* 查询用户地址列表 */
         GetAddressList: function (params, callback) {
             Http.AjaxService({
-                url:'/personalCenter/findAddress',
+                url:'/order/address/list',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -19,10 +20,11 @@ var OrderApi = {
         /* 添加,保存地址 */
         AddSaveAddress: function (params, callback) {
             Http.AjaxService({
-                url:'/personalCenter/saveAddress',
+                url:'/order/address/save',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -31,10 +33,11 @@ var OrderApi = {
         /* 设为默认地址 */
         DefaultAddress: function (params, callback) {
             Http.AjaxService({
-                url:'/personalCenter/defaultAddress',
+                url:'/order/address/set/default',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -43,10 +46,11 @@ var OrderApi = {
         /* 删除地址 */
         DeleteAddress: function (params, callback) {
             Http.AjaxService({
-                url:'/personalCenter/deleteAddress',
-                type:'GET',
+                url:'/order/address/delete',
+                type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -64,13 +68,39 @@ var OrderApi = {
                 callback(res);
             });
         },
-        /* 确认订单 */
+        GetAddressSelect:function(params,callback){ //获取省市区信息
+            Http.AjaxService({
+                url:'/order/address/select',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res)
+            });
+        },
+        /* 购物车去结算确认订单 */
         GetOrderConfirmInfo: function (params, callback) {
             Http.AjaxService({
-                url:'/order/confirm',
+                url:'/order/club/cart/settlement',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        /* 商品详情立即购买确认订单 */
+        ProductCreateOrderInfo: function (params, callback) {
+            Http.AjaxService({
+                url:'/order/club/product/settlement',
+                type:'GET',
+                data:params,
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -79,10 +109,11 @@ var OrderApi = {
         /* 获取订单邮费信息 */
         GetOrderPostage: function (params, callback) {
             Http.AjaxService({
-                url:'/order/postage',
+                url:'/order/club/postage',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -91,10 +122,11 @@ var OrderApi = {
         /* 提交订单 */
         ConfirmOrder: function (params, callback) {
             Http.AjaxService({
-                url:'/order/submit',
+                url:'/order/submit/generate',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -103,10 +135,11 @@ var OrderApi = {
         /* 查询订单列表 */
         GetQueryOrderListData: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/getOrderList',
+                url:'/order/club/list',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -139,10 +172,11 @@ var OrderApi = {
         /* 机构用户取消订单操作*/
         GetCancelOrder: function (params, callback) {
             Http.AjaxService({
-                url:'/order/cancel',
-                type:'GET',
+                url:'/order/club/cancel',
+                type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -151,10 +185,11 @@ var OrderApi = {
         /* 机构用户删除订单操作*/
         GetDeleteOrder: function (params, callback) {
             Http.AjaxService({
-                url:'/order/delete',
-                type:'GET',
+                url:'/order/club/delete',
+                type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -163,10 +198,11 @@ var OrderApi = {
         /* 机构用户确认收货操作*/
         GetAffirmOrder: function (params, callback) {
             Http.AjaxService({
-                url:'/order/affirm',
-                type:'GET',
+                url:'/order/club/receive',
+                type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -178,7 +214,8 @@ var OrderApi = {
                 url:'/order/affirmOrder',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -187,22 +224,24 @@ var OrderApi = {
         /* 订单支付,效验付款规则 orderId 订单ID */
         OrderPaymentValidation: function (params, callback) {
             Http.AjaxService({
-                url:'/order/paymentValidation',
+                url:'/order/pay/check',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
             });
         },
-        /* 订单支付,效验付款规则 orderId 订单ID */
+        /* 订单支付,余额抵扣 orderId 订单ID */
         OrderBalanceDeduction: function (params, callback) {
             Http.AjaxService({
-                url:'/order/balanceDeduction',
+                url:'/order/pay/balance/deduction',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -223,10 +262,11 @@ var OrderApi = {
         //  打款供应商
         confirmpayment: function (params, callback) {
             Http.AjaxService({
-                url:'/order/affirm/payment',
+                url:'/order/club/second/payment/confirm',
                 type:'post',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

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

@@ -4,12 +4,13 @@
  * auther ZHJY
  */
 var PayApi = {
-        PayOrderOnLineSwitch: function (params, callback) {//网银支付链接初始化数据
+        PayOrderOnLineSwitch: function (params, callback) {//获取线上支付全局开关状态
             Http.AjaxService({
-                url:'/PayOrder/onLineSwitch',
+                url:'/order/pay/online/switch',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -17,10 +18,11 @@ var PayApi = {
         },
         PayOrderCheckoutCounter: function (params, callback) {//网银支付链接初始化数据
             Http.AjaxService({
-                url:'/PayOrder/checkoutCounter',
+                url:'/order/pay/checkout/counter',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

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

@@ -4,16 +4,33 @@
  * auther ZHJY
  */
 var ShoppingApi = {
+        /**
+         * @机构添加购物车
+         * @param:userId 用户userId
+         */
+        ClubAddCart: function (params, callback) {
+            Http.AjaxService({
+                url:'/order/club/cart/add',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+                .then(function(res){
+                    callback(res);
+                });
+        },
         /**
          * @购物车列表
          * @param:userId 用户userId
          */
         QueryShoppingCartList: function (params, callback) {
             Http.AjaxService({
-                url:'/shoppingCart/list',
+                url:'/order/club/cart/list',
                 type:'GET',
                 data:params,
-                json:true
+                json:true,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -25,10 +42,11 @@ var ShoppingApi = {
          */
         DeleteCartProducts: function (params, callback) {
             Http.AjaxService({
-                url:'/shoppingCart/delete',
+                url:'/order/club/cart/delete',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -42,10 +60,11 @@ var ShoppingApi = {
          */
         ShoppingCartUpdate: function (params, callback) {
             Http.AjaxService({
-                url:'/shoppingCart/update',
+                url:'/order/club/cart/update',
                 type:'POST',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -60,14 +79,14 @@ var ShoppingApi = {
          */
         ShoppingCartGetCoupon:function (params, callback) {
             Http.AjaxService({
-                url:'/shoppingCart/get/coupon',
+                url:'/order/club/coupon',
                 type:'get',
                 data:params,
                 json:true,
-                isHost:false
+                isHost:true
             })
-                .then(function(res){
-                    callback(res);
-                });
+            .then(function(res){
+                callback(res);
+            });
         }
 };

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

@@ -525,11 +525,11 @@ var payContainer = new Vue({
         }else{
              var HrefType = CAIMEI.getUrlParam('type');
             if(HrefType == 'payfirm'){
-                _self.payInfo.PAY_ORDERID =  CAIMEI.getUrlParam('orderID');
+                _self.payInfo.PAY_ORDERID =  CAIMEI.getUrlParam('orderId');
                 _self.orderIdentificationId = '#'+_self.payInfo.PAY_ORDERID+'#';
             }else{
                 var data =JSON.parse(localStorage.getItem("confirmOrderInfo"));
-                _self.payInfo.PAY_ORDERID = data.data.orderID;
+                _self.payInfo.PAY_ORDERID = data.data.orderId;
                 _self.orderIdentificationId = '#'+_self.payInfo.PAY_ORDERID+'#';
             }
             _self.infoPayOrderCheckoutCounter();//正常订单初始化

src/main/resources/static/js/product/detail.js

@@ -237,17 +237,59 @@ var productDetail = new Vue({
         },
 		addShopCart: function(){ //加入购物车
 		    var _self = this;
-		    if(this.addStatus){
+		    if(_self.addStatus){
 		        _self.addStatus = false;
-                addShoppingCart(this.userId, this.productId, this.number,function(){
-                    _self.addStatus = true;
-                });
+                ShoppingApi.ClubAddCart(
+                    {
+                        productCount:this.number,
+                        productId:this.productId,
+                        userId:this.userId,
+                        source:1
+                    },
+                    function (response){
+                        if(response.code == 0){
+                            _self.addStatus = true;
+                            $.confirm({
+                                useBootstrap: false,
+                                boxWidth: (isPC?'338px':'74.6vw'),
+                                title: false,
+                                content:'<div class="cartAlert"><h6>商品已成功加入购物车！</h6><p>当前购物车共<em>'+response.data+'</em>种商品</p></div>',
+                                closeIcon: true,
+                                animation: 'opacity',
+                                closeAnimation: 'opacity',
+                                animateFromElement: false,
+                                scrollToPreviousElement: false,
+                                buttons: {
+                                    login: {
+                                        text: '去结算',
+                                        btnClass: 'btn-to-cart',
+                                        action: function(){
+                                            window.location.href = '/shopping/cart.html';
+                                        }
+                                    },
+                                    close: {
+                                        text: '继续购物',
+                                        btnClass: 'btn-to-goon',
+                                        action:function(){
+
+                                        }
+                                    }
+                                }
+                            });
+                            globalHead.getHeadCart(_self.userId);
+                        }else{
+                            CAIMEI.dialog('加入购物车失败！',true,function () {
+                                _self.addStatus = true;
+                            });
+                        }
+                    }
+                )
 		    }
 		},
-        buyNowSubmit: function(){
-            if(this.productId && this.number){
-                // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
-                window.location.href = '/shopping/confirm.html?type=2&id='+this.productId+'&count='+this.number;
+        buyNowSubmit: function(){ // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
+            var _self = this;
+            if(_self.productId && _self.number){
+                window.location.href = '/shopping/confirm.html?type=2&productId='+_self.productId+'&count='+_self.number;
             }
         },
         getRecommends: function(){

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

@@ -69,8 +69,8 @@ var shoppingCart = new Vue({
     methods: {
         getCartLists: function () {
             var _self = this;
-            if(this.userId ===0){return;}
-            ShoppingApi.QueryShoppingCartList({userId: this.userId},function(response){
+            if(_self.userId ===0){return;}
+            ShoppingApi.QueryShoppingCartList({userId: _self.userId,source:1},function(response){
                 if(response.code === 0){
                     var data = response.data;
                     _self.listData = data.list;
@@ -82,7 +82,7 @@ var shoppingCart = new Vue({
                     _self.totalCouponList = data.couponList;
                     // 默认全选
                     _self.listData.forEach(function(supplier){
-                        supplier.checked = true;
+                        supplier.isChecked = true;
                         if(supplier.cartList.length>0){
                             supplier.cartList.forEach(function(cartItem){
                                 _self.submitIds.push(cartItem.productId);
@@ -357,17 +357,25 @@ var shoppingCart = new Vue({
         },
         updateCart: function(cart){
             var _self = this;
-            ShoppingApi.ShoppingCartUpdate({userID:_self.userId,productID: cart.productId,productCount: cart.number},function(response){
-                if(response.code === 0){
-                    console.log('更新购物车商品数量成功');
-                }else{
-                    CAIMEI.Alert(response.msg,'确定',true, function(){});
-                }
-            })
+            ShoppingApi.ShoppingCartUpdate(
+                {
+                    userId:_self.userId,
+                    productId: cart.productId,
+                    productCount: cart.number,
+                    source:1
+                },
+                function(response){
+                    if(response.code === 0){
+                        console.log('更新购物车商品数量成功');
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定',true, function(){});
+                    }
+                 }
+            )
         },
         deleteCart: function(productIds){
             var _self = this;
-            ShoppingApi.DeleteCartProducts({userID:_self.userId,productIDs:productIds},function(response){
+            ShoppingApi.DeleteCartProducts({userId:_self.userId,productIds:productIds},function(response){
                 if(response.code === 0){
                     CAIMEI.dialog('删除成功',true,function () {
                         _self.getCartLists();
@@ -404,11 +412,11 @@ var shoppingCart = new Vue({
                 _self.deleteCart(productIds);
             });
         },
-        submitCart: function(){
-            if (this.submitIds.length>0){
-                var productIds = this.submitIds.join(",");
+        submitCart: function(){ // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
+            var  _self = this;
+            if (_self.submitIds.length>0){
+                var productIds = _self.submitIds.join(",");
                 window.localStorage.setItem("shoppingProductIds", productIds);
-                // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
                 window.location.href = '/shopping/confirm.html?type=1';
             }
         },
@@ -455,7 +463,7 @@ var shoppingCart = new Vue({
             _self.productCouponList = [];
             _self.currentTab = 1;
             _self.couponParam.status = 1;
-            _self.couponParam.shopId = shop.id
+            _self.couponParam.shopId = shop.shopId
             _self.queryPopupCoupons();
             _self.isShowPopup = true;
         },

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

@@ -1,3 +1,37 @@
+const defaultProductParam = {
+        productCount:0, 	// 商品数量
+        productId:0,		// 商品Id
+        source:1,			// 来源：1WWW 2小程序
+        userId:0			// 用户Id
+};
+const defaultCartParam = {
+        productIds:0,		// 商品Id(逗号隔开)
+        source:1,			// 来源：1WWW 2小程序
+        userId:0			// 用户Id
+};
+const defaultPostageParam = {
+        productIds:0,		// 商品Id(逗号隔开)
+        userId:0,			// 用户Id
+        townId:0			// 地区Id
+};
+const defaultConfirmParam = {
+        cartType:1, 		// 购买类型:（1自主下单, 3协销下单）
+        orderSource:1,		// 订单来源 1WWW 6小程序[采美,星范]
+        addressId:0,		// 收货地址Id
+        clubCouponId:0,		// 关联优惠券Id
+        clubId:0,			// 机构Id
+        orderInfo:[],		// 订单商品数据 // 订单发票信息
+        orderInvoice:{ type: 0 },     // 订单发票信息
+        payInfo:{			        // 订单金额数据
+            orderShouldPayFee: 0,	// 订单最终支付金额
+            balancePayFlag: 0,		// 勾选余额的状态(1使用，0不使用)
+            clauseId:0,				// 条款Id
+            postage: 0,				// 运费金额
+            postageFlag: 0,			// 运费类型
+            userBeans: 0,			// 抵扣采美豆数量
+            rebateFlag:0			// 是否返佣订单
+        }
+};
 var shoppingConfirm = new Vue({
     el: "#shoppingConfirm",
     data: {
@@ -13,6 +47,10 @@ var shoppingConfirm = new Vue({
         reducedPrice: 0,          // 满减金额
         couponAmount:0,	  		  // 优惠券金额
         totalDiscountAmount:0,	  // 共减金额
+        cartParam: Object.assign({}, defaultCartParam), 		// 购物车立即结算确认订单参数
+        productParam: Object.assign({}, defaultProductParam), 	// 商品立即购买确认订单参数
+        postageParam: Object.assign({}, defaultPostageParam),	// 邮费计算参数
+        confirmParam: Object.assign({}, defaultConfirmParam), 	// 提交订单参数
         address: {
             id: '',
             townId: '',
@@ -27,6 +65,17 @@ var shoppingConfirm = new Vue({
             default: '',
             selectedId: ''
         },
+        orderInvoice:{      // 订单发票信息
+            id:0,
+            type: 0,
+            invoiceTitleType: 0,  // 发票抬头类型 1企业 0个人
+            invoiceTitle: '',     // 单位名称
+            corporationTaxNum:'', // 纳税人识别号
+            registeredAddress: '',// 单位地址
+            registeredPhone:'',	  // 注册电话
+            openBank:'',		  // 开户银行
+            bankAccountNo: '',    // 银行账号
+        },
         addressList: [],
         isShowAddressList: false,
         isShowAddressForm: false,
@@ -56,31 +105,14 @@ var shoppingConfirm = new Vue({
             deductMoney: 0,     //显示已使用的余额
             surplusMoney: 0     //显示勾选后的剩余抵扣
         },
-        payInfo: {
-            clauseId: 0,         //条款（暂时保留）
-            orderShouldPayFee: 0.00,//提交的总价
-            balancePayFlag: 0,   //余额抵扣的状态 0不使用，1使用
-            freight: 0.00,          //邮费
-            freePostFlag:-1      // 0包邮 -1到付 1 有运费
-        },
-        clubCouponId:0,			  // 用户关联优惠Id
-        invoice: {
-            id:'',
-            type: 0,
-            invoiceTitleType: 0, //发票抬头类型 1企业 0个人
-            invoiceTitle: '',    //单位名称
-            corporationTaxNum:'',//纳税人识别号
-            registeredAddress: '',//单位地址
-            registeredPhone:'',	 //注册电话
-            openBank:'',		//开户银行
-            bankAccountNo: '',  //银行账号
-        },
         isBeansShow:false,
         userBeans:0,
+        hanldPostage:0,
+        hanldPostageFlag:0,
+        hanldShouldPayFee:0,
         freightBeansMoney:0,
         freightMoney:0,
         deductionBeans:0,
-        hanldUserBeans:0,
         submitLoading: false,
         checkedIndex:null,
         couponList:[], // 可用优惠券列表
@@ -123,14 +155,45 @@ var shoppingConfirm = new Vue({
             var el = event.currentTarget;
             verifyHandle(el);
         },
-        getConfirmList: function (productCount) {// 初始化确认订单信息
+        getProductCreateOrderInfo:function(){// 商品立即购买确认订单初始化
+            var _self = this;
+            if(_self.userId ===0){return;}
+            OrderApi.ProductCreateOrderInfo(_self.productParam,function(response){
+                if (response.code === 0 ) {
+                    var data = response.data;
+                    _self.listData = data.list;
+                    _self.totalPrice =  data.totalPrice;
+                    _self.reducedPrice = data.reducedPrice;
+                    _self.totalCount =  data.totalCount;
+                    _self.kindCount = data.kindCount;
+                    _self.balance.userMoney = data.userMoney;
+                    _self.balance.originUserMoney = data.userMoney;
+                    _self.hanldShouldPayFee = data.totalPrice;
+                    _self.getAddressList(_self.userId,20);
+                    if( data.couponList &&  data.couponList.length>0){
+                        _self.isCouponShow = true;
+                        _self.couponAmount = data.couponList[0].couponAmount;
+                        _self.confirmParam.clubCouponId = data.couponList[0].clubCouponId;
+                        data.couponList.forEach((el) => {
+                            _self.couponList.push(Object.assign(el,{ischecked:false}))
+                        })
+                        _self.couponList[0].ischecked = true;
+                        _self.hanldShouldPayFee = data.totalPrice - _self.couponAmount;
+                    }
+                    _self.totalDiscountAmount =  _self.reducedPrice + _self.couponAmount;
+                    if(data.invoice){
+                        data.invoice.type = 0;
+                        _self.orderInvoice =  data.invoice;
+                    }
+                }else{
+                    CAIMEI.Alert(r.msg, '确定', false);
+                }
+            });
+        },
+        getCartCreateOrderInfo: function () {// 购物车去结算确认订单初始化
             var _self = this;
-            if(this.userId ===0){return;}
-            OrderApi.GetOrderConfirmInfo({
-                userId: _self.userId,
-                count: productCount,
-                productIds: this.productIds
-            },function(response){
+            if(_self.userId ===0){return;}
+            OrderApi.GetOrderConfirmInfo(_self.cartParam,function(response){
                 if (response.code === 0 ) {
                     var data = response.data;
                     _self.listData = data.list;
@@ -140,46 +203,41 @@ var shoppingConfirm = new Vue({
                     _self.kindCount = data.kindCount;
                     _self.balance.userMoney = data.userMoney;
                     _self.balance.originUserMoney = data.userMoney;
-                    _self.payInfo.orderShouldPayFee = data.totalPrice;
+                    _self.hanldShouldPayFee = data.totalPrice;
                     _self.getAddressList(_self.userId,20);
                     if( data.couponList &&  data.couponList.length>0){
                         _self.isCouponShow = true;
                         _self.couponAmount = data.couponList[0].couponAmount;
-                        _self.clubCouponId = data.couponList[0].clubCouponId;
+                        _self.confirmParam.clubCouponId = data.couponList[0].clubCouponId;
                         data.couponList.forEach((el) => {
                             _self.couponList.push(Object.assign(el,{ischecked:false}))
                         })
                         _self.couponList[0].ischecked = true;
-                        _self.payInfo.orderShouldPayFee = data.totalPrice - _self.couponAmount;
+                        _self.hanldShouldPayFee = data.totalPrice - _self.couponAmount;
                     }
                     _self.totalDiscountAmount =  _self.reducedPrice + _self.couponAmount;
                     if(data.invoice){
                         data.invoice.type = 0;
-                        _self.invoice =  data.invoice;
+                        _self.orderInvoice =  data.invoice;
                     }
                 }else{
                     CAIMEI.Alert(r.msg, '确定', false);
                 }
             });
         },
-        getFreight: function(townId){// 获取邮费
+        getFreight: function(){// 获取邮费
             var _self = this;
-            OrderApi.GetOrderPostage({
-                userId: this.userId,
-                productIds: this.productIds,
-                totalPrice: this.totalPrice,
-                townId: townId
-            },function (r) {
+            OrderApi.GetOrderPostage(_self.postageParam,function (r) {
                 if(r.code === 0 && r.data){
-                    _self.payInfo.freePostFlag = r.data.freePostFlag;
+                    _self.confirmParam.payInfo.postageFlag = _self.hanldPostageFlag = r.data.postageFlag;
                     _self.userBeans = r.data.userBeans;
-                    _self.payInfo.freight = (r.data.freePostFlag===1 ? r.data.freight : 0);
-                    _self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight - _self.couponAmount;
-                    switch (_self.payInfo.freePostFlag) {
+                    _self.confirmParam.payInfo.postage = _self.hanldPostage = (r.data.postageFlag=== 1 ? r.data.postage : 0);
+                    _self.hanldShouldPayFee = _self.totalPrice + _self.confirmParam.payInfo.postage - _self.couponAmount;
+                    switch ( _self.confirmParam.payInfo.postageFlag) {
                         case 1:
                             if( _self.userBeans > 0 ){
-                                _self.freightBeansMoney = r.data.freight;
-                                _self.freightMoney = r.data.freight;
+                                _self.freightBeansMoney = r.data.postage;
+                                _self.freightMoney = r.data.postage;
                                 _self.isBeansShow = true;
                             }else{
                                 _self.freightBeansMoney = 0;
@@ -220,74 +278,76 @@ var shoppingConfirm = new Vue({
         getAddressList: function(userId,pageSize){ // 获取收货地址
             var _self = this;
             OrderApi.GetAddressList({
-                userID:userId,
+                userId:userId,
                 pageNum:1,
                 pageSize:pageSize
-            },function (r) {
-                if(r.code === 0 && r.data){
-                    if(r.data.results){
-                        _self.addressList = r.data.results;
-                        _self.address.id = r.data.results[0].addressID;
-                        _self.address.townId = r.data.results[0].townID;
-                        _self.address.cityId = r.data.results[0].cityID;
-                        _self.address.provinceId = r.data.results[0].provinceID;
-                        _self.address.name = r.data.results[0].shouHuoRen;
-                        _self.address.mobile = r.data.results[0].mobile;
-                        _self.address.desc = r.data.results[0].address;
-                        _self.address.town = r.data.results[0].town;
-                        _self.address.city = r.data.results[0].city;
-                        _self.address.province = r.data.results[0].province;
+            },function (res) {
+                if(res.code === 0 && res.data){
+                    if(res.data.list){
+                        _self.addressList = res.data.list;
+                        _self.address.id = res.data.list[0].addressId;
+                        _self.confirmParam.addressId = res.data.list[0].addressId;
+                        _self.address.townId = res.data.list[0].townId;
+                        _self.postageParam.townId = res.data.list[0].townId;
+                        _self.address.cityId = res.data.list[0].cityId;
+                        _self.address.provinceId = res.data.list[0].provinceId;
+                        _self.address.name = res.data.list[0].receiver;
+                        _self.address.mobile = res.data.list[0].mobile;
+                        _self.address.desc = res.data.list[0].address;
+                        _self.address.town = res.data.list[0].town;
+                        _self.address.city = res.data.list[0].city;
+                        _self.address.province = res.data.list[0].province;
                         _self.address.default = true;
-                        _self.address.selectedId = r.data.results[0].addressID;
+                        _self.address.selectedId = res.data.list[0].addressId;
                         _self.getFreight(_self.address.townId);
                     }else{
                         _self.createAddress();
                     }
                     _self.getProvinceOptions();
                 }else {
-                    CAIMEI.Alert(r.msg, '确定', false);
+                    CAIMEI.Alert(res.msg, '确定', false);
                     _self.createAddress();
                 }
             })
         },
         getProvinceOptions: function(){ // 获取全部省份
             var _self = this;
-            PublicApi.GetProvince({},function(r){
-                if(r.code === 0 && r.data){
-                    _self.provinceOptions =r.data;
+            OrderApi.GetAddressSelect({},function(res){
+                if(res.code === 0 && res.data){
+                    _self.provinceOptions =res.data;
                 }else{
-                    CAIMEI.Alert(r.msg,'确定',false);
+                    CAIMEI.Alert(res.msg,'确定',false);
                 }
             });
         },
-        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){
-                    if(r.code === 0 && r.data){
-                        _self.cityOptions = r.data;
+                OrderApi.GetAddressSelect({ parentId: parentId,type:1 },function(res){
+                    if(res.code === 0 && res.data){
+                        _self.cityOptions = res.data;
                         if(callback){callback();}
                     }else{
-                        CAIMEI.Alert(r.msg,'确定',false);
+                        CAIMEI.Alert(res.msg,'确定',false);
                     }
                 });
             }
         },
-        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){
-                    if(r.code === 0 && r.data){
-                        _self.townOptions = r.data;
+                OrderApi.GetAddressSelect({parentId: parentId,type:2},function(res){
+                    if(res.code === 0 && res.data){
+                        _self.townOptions = res.data;
                         if(callback){callback();}
                     }else{
-                        CAIMEI.Alert(r.msg,'确定',false);
+                        CAIMEI.Alert(res.msg,'确定',false);
                     }
                 })
             }
@@ -317,15 +377,15 @@ var shoppingConfirm = new Vue({
             if(!isPC){fixedBody();}
         },
         updateAddress: function(){// 更新选择地址
-            this.isShowAddressForm = true;
-            this.addressForm.id = this.address.id;
-            this.addressForm.name = this.address.name;
-            this.addressForm.mobile = this.address.mobile;
-            this.addressForm.default = this.address.default;
-            this.addressForm.desc = this.address.desc;
-            this.addressForm.provinceId = this.address.provinceId;
             var _self = this;
-            this.getCityOptions(this.address.provinceId, function(){
+            _self.isShowAddressForm = true;
+            _self.addressForm.id = _self.address.id;
+            _self.addressForm.name = _self.address.name;
+            _self.addressForm.mobile = _self.address.mobile;
+            _self.addressForm.default = _self.address.default;
+            _self.addressForm.desc = _self.address.desc;
+            _self.addressForm.provinceId = _self.address.provinceId;
+            _self.getCityOptions(_self.address.provinceId, function(){
                 _self.addressForm.cityId = _self.address.cityId;
                 _self.getTownOptions(_self.address.cityId,function(){
                     _self.addressForm.townId = _self.address.townId;
@@ -345,16 +405,15 @@ var shoppingConfirm = new Vue({
                 };
                 _self.saveLoading = 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.name,            // 收货人
+                        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
+                if(_self.addressForm.id){// 编辑
+                    params.addressId = _self.addressForm.id;//编辑保存地址ID
                 }
                 _self.saveAddress(params);
             });
@@ -387,7 +446,7 @@ var shoppingConfirm = new Vue({
         deleteAddress: function(addressId){// 列表删除单个地址
             var _self = this;
             CAIMEI.Modal('确定要删除该地址？','取消','确定',function () {
-                OrderApi.DeleteAddress({addressID:addressId,userID:_self.userId},function (r) {
+                OrderApi.DeleteAddress({addressId:addressId,userId:_self.userId},function (r) {
                     if(r.code === 0 ){
                         CAIMEI.dialog('删除成功');
                         // 重新获取地址列表
@@ -403,20 +462,22 @@ var shoppingConfirm = new Vue({
         },
         confirmAddress: function(){// 确认地址并查询邮费
             var _self = this;
-            this.addressList.forEach(function(item){
-                if (_self.address.selectedId==item.addressID){
-                    _self.address.id = item.addressID;
-                    _self.address.townId = item.townID;
-                    _self.address.cityId = item.cityID;
-                    _self.address.provinceId = item.provinceID;
-                    _self.address.name = item.shouHuoRen;
+            _self.addressList.forEach(function(item){
+                if (_self.address.selectedId==item.addressId){
+                    _self.address.id = item.addressId;
+                    _self.confirmParam.addressId = item.addressId;
+                    _self.address.townId = item.townId;
+                    _self.postageParam.townId = item.townId;
+                    _self.address.cityId = item.cityId;
+                    _self.address.provinceId = item.provinceId;
+                    _self.address.name = item.receiver;
                     _self.address.mobile = item.mobile;
                     _self.address.desc = item.address;
                     _self.address.town = item.town;
                     _self.address.city = item.city;
                     _self.address.province = item.province;
                     _self.address.default = (item.defaultFlag > 0);
-                    _self.getFreight(_self.address.townId);
+                    _self.getFreight();
                 }
             });
             this.closeAddressBox();
@@ -438,7 +499,7 @@ var shoppingConfirm = new Vue({
             })
             _self.couponAmount = coupon.couponAmount;
             _self.totalDiscountAmount = _self.reducedPrice + _self.couponAmount;
-            _self.clubCouponId = coupon.clubCouponId;
+            _self.confirmParam.clubCouponId = coupon.clubCouponId;
             _self.changeDeductibleFreight();
             _self.useUserMoney();
         },
@@ -461,11 +522,11 @@ var shoppingConfirm = new Vue({
             var _self = this;
             if(this.balance.userMoney>0){
                 this.$nextTick(function() {
-                    var total = _self.totalPrice + _self.payInfo.freight - _self.couponAmount; // 订单总金额 + 邮费金额
+                    var total = _self.totalPrice +_self.confirmParam.payInfo.postage - _self.couponAmount; // 订单总金额 + 邮费金额
                     if(_self.balance.flag){
-                        _self.payInfo.balancePayFlag = 1;
+                        _self.confirmParam.payInfo.balancePayFlag = 1;
                         if(_self.balance.userMoney >= total){ // 全部抵扣
-                            _self.payInfo.orderShouldPayFee = 0;
+                            _self.hanldShouldPayFee = 0;
                             if(_self.balance.isFreight){// 勾选了采美豆丢运费
                                 _self.balance.deductMoney = _self.totalPrice - _self.couponAmount; // 抵扣使用金额 = 订单总金额
                                 _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.totalPrice); // 抵扣后剩余余额 = 余额总额 - (订单总金额+邮费金额)
@@ -477,99 +538,99 @@ var shoppingConfirm = new Vue({
                             }
                        }else{ // 部分抵扣
                             if(_self.balance.isFreight){// 勾选了采美豆丢运费
-                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney) - _self.couponAmount; // 最终订单总价 = 订单总金额 - 余额总额
+                                _self.hanldShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney) - _self.couponAmount; // 最终订单总价 = 订单总金额 - 余额总额
                                 _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
                                 _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
-                                console.log('部分抵扣勾选了采美豆运费',_self.payInfo.orderShouldPayFee)
+                                console.log('部分抵扣勾选了采美豆运费',_self.hanldShouldPayFee)
                             }else{
-                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
+                                _self.hanldShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
                                 _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
                                 _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
-                                console.log('部分抵扣没有勾选了采美豆运费',_self.payInfo.orderShouldPayFee)
+                                console.log('部分抵扣没有勾选了采美豆运费',_self.hanldShouldPayFee)
                             }
                         }
                     }else{// 取消抵扣
-                        _self.payInfo.balancePayFlag = 0;
+                        _self.confirmParam.payInfo.balancePayFlag = 0;
                         _self.balance.userMoney = _self.balance.originUserMoney;
                         _self.balance.deductMoney = 0;
                         _self.balance.surplusMoney = _self.balance.originUserMoney;
                         if(_self.balance.isFreight){//判断是否有采美豆抵扣运费
-                            _self.payInfo.orderShouldPayFee = _self.totalPrice - _self.couponAmount; // 最终订单总价 = 订单总金额
+                            _self.hanldShouldPayFee = _self.totalPrice - _self.couponAmount; // 最终订单总价 = 订单总金额
                         }else{
-                            _self.payInfo.orderShouldPayFee = total; // 最终订单总价 = 订单总金额 + 邮费金额
+                            _self.hanldShouldPayFee = total; // 最终订单总价 = 订单总金额 + 邮费金额
                         }
-                        console.log('取消余额抵扣',_self.payInfo.orderShouldPayFee)
+                        console.log('取消余额抵扣',_self.hanldShouldPayFee)
                     }
                 });
             }
         },
         changeDeductibleFreight: function(){//选择采美豆抵扣邮费
             var _self = this;
-            var total = _self.totalPrice + _self.payInfo.freight - _self.couponAmount;
+            var total = _self.totalPrice +_self.confirmParam.payInfo.postage - _self.couponAmount;
             if(_self.balance.isFreight){//判断是否勾选运费
-                if(_self.payInfo.freePostFlag == 1){//有邮费
-                    _self.hanldUserBeans = _self.freightBeansMoney*100;
+                if(_self.confirmParam.payInfo.postageFlag == 1){//有邮费
+                    _self.confirmParam.payInfo.userBeans = _self.freightBeansMoney*100;
                     if( _self.userBeans > 0 ){// 判断采美豆大于0
                         if(_self.balance.flag) {// 勾选了余额抵扣
                             console.log('订单总额',total)
                             if(_self.balance.userMoney>=total){ // 全部抵扣
-                                _self.payInfo.orderShouldPayFee = 0;
+                                _self.hanldShouldPayFee = 0;
                                 _self.balance.deductMoney = _self.totalPrice - _self.couponAmount;  // 抵扣使用金额 = 订单总金额
                                 _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney);  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
-                                console.log('有勾选余额抵扣全抵',_self.payInfo.orderShouldPayFee)
+                                console.log('有勾选余额抵扣全抵',_self.hanldShouldPayFee)
                             }else{ // 部分抵扣
-                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney) - _self.couponAmount;
+                                _self.hanldShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney) - _self.couponAmount;
                                 _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
                                 _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
-                                console.log('有勾选余额抵扣部分抵',_self.payInfo.orderShouldPayFee)
+                                console.log('有勾选余额抵扣部分抵',_self.hanldShouldPayFee)
                             }
                         }else{
-                            _self.payInfo.orderShouldPayFee = ((_self.totalPrice*100 + _self.payInfo.freight*100 - _self.freightBeansMoney*100)/100) - _self.couponAmount;
-                            console.log('无余额抵扣',_self.payInfo.orderShouldPayFee)
+                            _self.hanldShouldPayFee = ((_self.totalPrice*100 +_self.confirmParam.payInfo.postage*100 - _self.freightBeansMoney*100)/100) - _self.couponAmount;
+                            console.log('无余额抵扣',_self.hanldShouldPayFee)
                         }
                     }
-                }else if(_self.payInfo.freePostFlag == -1){// 到付
-                    _self.hanldUserBeans = _self.freightBeansMoney*100;
+                }else if(_self.confirmParam.payInfo.postageFlag == -1){// 到付
+                    _self.confirmParam.payInfo.userBeans = _self.freightBeansMoney*100;
                     if(_self.balance.flag) {// 勾选了余额抵扣
                         if(_self.balance.userMoney >= total){ // 全部抵扣
-                            _self.payInfo.orderShouldPayFee = 0;
+                            _self.hanldShouldPayFee = 0;
                             _self.balance.deductMoney = _self.totalPrice - _self.couponAmount;  // 抵扣使用金额 = 订单总金额
                             _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney);  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
-                            console.log('到付有勾选余额抵扣全抵',_self.payInfo.orderShouldPayFee)
+                            console.log('到付有勾选余额抵扣全抵',_self.hanldShouldPayFee)
                         }else{ // 部分抵扣
-                            _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney) - _self.couponAmount;
+                            _self.hanldShouldPayFee =_self.hanldShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney) - _self.couponAmount;
                             _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
                             _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
-                            console.log('到付有勾选余额抵扣部分抵',_self.payInfo.orderShouldPayFee)
+                            console.log('到付有勾选余额抵扣部分抵',_self.hanldShouldPayFee)
                         }
                     }else{
-                        _self.payInfo.orderShouldPayFee = _self.totalPrice - _self.couponAmount ;
-                        console.log('到付未勾选余额抵扣',_self.payInfo.orderShouldPayFee)
+                        _self.hanldShouldPayFee = _self.totalPrice - _self.couponAmount ;
+                        console.log('到付未勾选余额抵扣',_self.hanldShouldPayFee)
                     }
                 }else{
-                    _self.hanldUserBeans = 0;
-                    _self.payInfo.orderShouldPayFee = _self.totalPrice - _self.couponAmount ;
-                    console.log('其他',_self.payInfo.orderShouldPayFee)
+                    _self.confirmParam.payInfo.userBeans = 0;
+                    _self.hanldShouldPayFee = _self.totalPrice - _self.couponAmount ;
+                    console.log('其他',_self.hanldShouldPayFee)
                 }
             }else{
                 console.log('未勾选采美豆抵扣')
-                _self.hanldUserBeans = 0;
+                _self.confirmParam.payInfo.userBeans = 0;
                 if(_self.balance.flag) {//如果勾选了余额抵扣
                     if(_self.balance.userMoney>=total) { // 全部抵扣
                         console.log('勾选采美豆抵扣=========》',total)
-                        _self.payInfo.orderShouldPayFee = 0 ;
+                        _self.hanldShouldPayFee = 0 ;
                         _self.balance.deductMoney = total; // 抵扣使用金额 = (订单总金额+邮费金额-优惠券价格)
                         _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
-                        console.log('余额全抵抵未勾选采美豆抵扣',_self.payInfo.orderShouldPayFee)
+                        console.log('余额全抵抵未勾选采美豆抵扣',_self.hanldShouldPayFee)
                     }else{
                         console.log('未勾选采美豆抵扣=========》',total)
-                        _self.payInfo.orderShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney);
+                        _self.hanldShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney);
                         _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = (订单总金额+邮费金额)
                         _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney); // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
-                        console.log('余额部分抵未勾选采美豆抵扣',_self.payInfo.orderShouldPayFee)
+                        console.log('余额部分抵未勾选采美豆抵扣',_self.hanldShouldPayFee)
                     }
                 }else{
-                    _self.payInfo.orderShouldPayFee = (_self.totalPrice + _self.payInfo.freight) - _self.couponAmount;
+                    _self.hanldShouldPayFee = (_self.totalPrice +_self.confirmParam.payInfo.postage) - _self.couponAmount;
                 }
             }
         },
@@ -593,107 +654,94 @@ var shoppingConfirm = new Vue({
         },
         submitOrder: function(){
             var _self = this;
-            if(this.submitLoading){return false;}
-            if(!this.address.id){
+            if(_self.submitLoading){return false;}
+            if(!_self.confirmParam.addressId){
                 CAIMEI.dialog('请先添加收货地址～');
                 return false;
             }
-            if(this.invoice.type*1 === 1){
+            if(_self.orderInvoice.type*1 === 1){
                 // 普通发票
-                if(!this.invoice.invoiceTitle){
+                if(!_self.orderInvoice.invoiceTitle){
                     CAIMEI.dialog('请输入个人抬头');return false;
                 }
-                if(this.invoice.invoiceTitleType===1 && !this.invoice.corporationTaxNum){
+                if(_self.orderInvoice.invoiceTitleType===1 && !_self.orderInvoice.corporationTaxNum){
                     CAIMEI.dialog('请输入纳税人识别号');return false;
                 }
-            }else if(this.invoice.type*1 === 2){
+            }else if(_self.orderInvoice.type*1 === 2){
                 // 增值税发票
-                if(!this.invoice.invoiceTitle){
+                if(!_self.orderInvoice.invoiceTitle){
                     CAIMEI.dialog('请输入个人抬头');return false;
                 }
-                if(!this.invoice.corporationTaxNum){
+                if(!_self.orderInvoice.corporationTaxNum){
                     CAIMEI.dialog('请输入纳税人识别号');return false;
                 }
-                if(!this.invoice.registeredAddress){
+                if(!_self.orderInvoice.registeredAddress){
                     CAIMEI.dialog('请输入单位地址');return false;
                 }
-                if(!this.invoice.registeredPhone){
+                if(!_self.orderInvoice.registeredPhone){
                     CAIMEI.dialog('请输入注册电话');return false;
                 }
-                if(!this.invoice.openBank){
+                if(!_self.orderInvoice.openBank){
                     CAIMEI.dialog('请输入开户银行');return false;
                 }
-                if(!this.invoice.bankAccountNo){
+                if(!_self.orderInvoice.bankAccountNo){
                     CAIMEI.dialog('请输入银行账号');return false;
                 }
             }
             // 禁用按钮
-            this.submitLoading = true;
+            _self.submitLoading = true;
             // 发票信息
-            if(this.invoice.type*1 === 0){
-                this.invoice = Object.assign(this.invoice,'',{type:0});
-            }else if(this.invoice.type*1 === 1){
-                this.invoice = Object.assign(this.invoice,'',{type:1, invoiceContent: '商品明细'});
-            }else if(this.invoice.type*1 === 2){
-                this.invoice = Object.assign(this.invoice,'',{type:2});
+            if(_self.confirmParam.orderInvoice.type*1 === 0){
+                _self.confirmParam.orderInvoice = Object.assign(_self.confirmParam.orderInvoice,'',{type:0});
+            }else if(_self.confirmParam.orderInvoice.type*1 === 1){
+                _self.confirmParam.orderInvoice = Object.assign(_self.confirmParam.orderInvoice,'',{type:1, invoiceContent: '商品明细'});
+            }else if(_self.confirmParam.orderInvoice.type*1 === 2){
+                _self.confirmParam.orderInvoice = Object.assign(_self.confirmParam.orderInvoice,'',{type:2});
             }
             //商品信息
-            var _orderInfo = this.listData.map(function(supplier){
-                    var productInfo = [];
-                    supplier.cartList.forEach(function(item){
-                        productInfo.push({
-                            productId:item.productId,
-                            productNum:item.number,
-                            presentNum:0,
-                            productType:item.productType
-                        })
-                    });
-                    return {
-                        shopId: supplier.id,
-                        note: supplier.note ? supplier.note : '',
-                        productInfo: productInfo
-                    }
-                });
-            var _payInfo = {
-                    clauseId: 0,
-                    orderShouldPayFee: toFloat(this.payInfo.orderShouldPayFee),
-                    balancePayFlag: this.payInfo.balancePayFlag,
-                    freight: toFloat(this.payInfo.freight),
-                    freePostFlag: this.payInfo.freePostFlag,
-                    userBeans:this.hanldUserBeans
-                };
-            var params = {
-                    clubCouponId:this.clubCouponId,
-                    cartType: this.type,
-                    orderSource: 1,            // 购买类型:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
-                    serviceProviderId: '',     // 协销ID（小程序忽略）
-                    clubUserId: this.userId,   // 机构用户ID
-                    addressId: this.address.id,// 地址ID
-                    orderInfo: _orderInfo,             // 商品信息
-                    payInfo: _payInfo,               // 订单信息
-                    orderInvoice: this.invoice           // 发票信息
-            };
-            OrderApi.ConfirmOrder({'params':JSON.stringify(params)},function (r) {
-                if(r.code === 0){
-                    var _data = r.data;
-                    if(Number(_data.code) === 1){//余额抵扣全部订单金额
-                        var data = { payableAmount: _self.deductMoney };
+            _self.confirmParam.orderInfo = _self.listData.map(el => {
+                var productInfo = [];
+                el.cartList.forEach(item => {
+                    productInfo.push({
+                        productId:item.productId,
+                        productNum:item.number,
+                        presentNum:0,
+                        productType:item.productType
+                    })
+                })
+                return {shopId:el.shopId,note:el.note?el.note:'',productInfo:productInfo}
+            });
+            if(_self.orderInvoice.type!=0){
+                _self.orderInvoice.type = parseInt(_self.orderInvoice.type)
+                _self.confirmParam.orderInvoice = _self.orderInvoice;
+            }
+            _self.confirmParam.payInfo.postage = parseInt(_self.hanldPostage).toFixed(2);
+            _self.confirmParam.payInfo.postageFlag = parseInt(_self.hanldPostageFlag);
+            _self.confirmParam.payInfo.orderShouldPayFee = _self.hanldShouldPayFee.toFixed(2);
+            _self.confirmParam.payInfo = JSON.stringify(_self.confirmParam.payInfo);
+            _self.confirmParam.orderInfo = JSON.stringify(_self.confirmParam.orderInfo);
+            _self.confirmParam.orderInvoice = JSON.stringify(_self.confirmParam.orderInvoice);
+            OrderApi.ConfirmOrder(_self.confirmParam,function (res) {
+                if(res.code === 0){
+                    var data = res.data;
+                    if(data.code === 1){//余额抵扣全部订单金额
+                        var Amount = { payableAmount: _self.deductMoney };
                         CAIMEI.Storage.removeItem('confirmOrderInfo');
-                        CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
-                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_data.payTotalFee;
+                        CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:Amount}));
+                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+data.payTotalFee;
                     }else{//余额抵扣部分订单金额或者未支付的
-                        var data = {
-                                orderID:_data.orderID,
-                                orderNo:_data.orderNo,
-                                orderMark:_data.orderMark,
-                                payableAmount:_data.payableAmount
+                        var order = {
+                                orderId:data.orderId,
+                                orderNo:data.orderNo,
+                                orderMark:data.orderMark,
+                                payableAmount:data.payableAmount
                             };
                         CAIMEI.Storage.removeItem('confirmOrderInfo');
-                        CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
-                        window.location.href = '/pay/caimei-paycash.html?type=confirm&orderID='+_data.orderID;
+                        CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:order}));
+                        window.location.href = '/pay/caimei-paycash.html?type=confirm&orderId='+data.orderId;
                     }
                 }else{
-                    CAIMEI.Alert(r.msg,'确定',true, function(){
+                    CAIMEI.Alert(res.msg,'确定',true, function(){
                         setTimeout(function(){
                             _self.submitLoading = false;
                         },500);
@@ -703,24 +751,23 @@ var shoppingConfirm = new Vue({
         }
     },
     created: function () {
-        this.type = getUrlParam("type") ? getUrlParam("type")*1 : "";
+        var _self = this;
+        _self.type = getUrlParam("type") ? getUrlParam("type")*1 : "";
         if(globalUserData){
-            this.userId = globalUserData.userId;
-            this.userIdentity = globalUserData.identity;
-            this.userToken = globalUserData.token;
+            _self.userId = _self.productParam.userId = _self.cartParam.userId = _self.postageParam.userId =   globalUserData.userId;
+            _self.confirmParam.clubId = globalUserData.clubId
+            _self.userIdentity = globalUserData.identity;
+            _self.userToken = globalUserData.token;
             // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
-            if(this.type === 1) {
-                this.productIds = window.localStorage.getItem("shoppingProductIds");
+            if(_self.type === 1) {
+                _self.cartParam.productIds = _self.postageParam.productIds = _self.productIds = window.localStorage.getItem("shoppingProductIds");
                 // 获取列表数据
-                this.getConfirmList(null);
+                _self.getCartCreateOrderInfo();
             }else if(this.type === 2){
-                this.productIds = getUrlParam("id");
-                var count = getUrlParam("count");
-                if(this.productIds && count) {
-                    // 获取列表数据
-                    this.getConfirmList(count);
-                }else{
-                    alertInfo("参数错误，请重新提交订单！");
+                _self.productParam.productId = _self.postageParam.productIds = _self.productIds = getUrlParam("productId");
+                _self.productParam.productCount = getUrlParam("count");
+                if(_self.productParam.productId && _self.productParam.productCount) {
+                    _self.getProductCreateOrderInfo();
                 }
             }
         }

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

@@ -80,7 +80,7 @@ var orderPage = new Vue({
                     _self.shopOrderList = data.shopOrderList;
                     _self.discernReceiptList = data.discernReceiptList;
                     _self.returnedPurchaseList = data.returnedPurchaseList;
-                    _self.orderIdentificationId = '#'+ _self.orderInfo.orderID+'#';
+                    _self.orderIdentificationId = '#'+ _self.orderInfo.orderId+'#';
                     _self.isRequset = false;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', true,function () {
@@ -89,10 +89,10 @@ var orderPage = new Vue({
                 }
             })
         },
-         hanldConfirmFn:function(userId,orderId){//确认打款供应商
-         var _self = this;
+         hanldConfirmFn:function(){//确认打款供应商
+            var _self = this;
             CAIMEI.Modal('确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','取消','确定',function () {
-                 OrderApi.confirmpayment({orderID:orderId,userId:userId},function(response){
+                 OrderApi.confirmpayment({orderId:_self.orderId,userId:_self.userId},function(response){
                     if(response.code == 0){
                          CAIMEI.dialog('确认成功',true,function () {
                             _self.GetQueryOrderDetailsInfo();
@@ -104,11 +104,11 @@ var orderPage = new Vue({
                     }
                 })
             })
-    },
+        },
         hanldConfirmOrderFn:function(){//确认订单
             var _self = this;
             CAIMEI.Modal('是否确认订单？','取消','确定',function () {
-                OrderApi.AffirmOrderOrder({orderID:_self.orderId},function(response){
+                OrderApi.AffirmOrderOrder({orderId:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('确认成功',true,function () {
                             _self.GetQueryOrderDetailsInfo();
@@ -122,7 +122,7 @@ var orderPage = new Vue({
         hanldCancelOrderFn:function(){//取消订单
             var _self = this;
             CAIMEI.Modal('确认取消该订单吗？','取消','确定',function () {
-                OrderApi.GetCancelOrder({orderID:_self.orderId},function(response){
+                OrderApi.GetCancelOrder({orderId:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('取消成功',true,function () {
                             _self.GetQueryOrderDetailsInfo();
@@ -136,7 +136,7 @@ var orderPage = new Vue({
         hanldDeleteOrderFn:function(){//删除订单
             var _self = this;
             CAIMEI.Modal('确认删除该订单吗？','取消','确定',function () {
-                OrderApi.GetDeleteOrder({orderID:_self.orderId},function(response){
+                OrderApi.GetDeleteOrder({orderId:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('删除成功',true,function () {
                             window.location.href='/user/order/list.html?state=0';
@@ -150,7 +150,7 @@ var orderPage = new Vue({
         hanldReceivingOrderFn:function(){//确认收货
             var _self = this;
             CAIMEI.Modal('是否确认收货？','取消','确定',function () {
-                OrderApi.GetAffirmOrder({orderID:_self.orderId},function(response){
+                OrderApi.GetAffirmOrder({orderId:_self.orderId},function(response){
                     if(response.code == 0){
                         _self.beansType = 7;
                         _self.beanNumber = 100;
@@ -168,11 +168,11 @@ var orderPage = new Vue({
             CAIMEI.Popup({
                 content: '<div class="payAlert">' +
                            '<p>您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解</p>' +
-                           '<p>待付金额：<em>￥'+toFloat(this.orderInfo.pendingPayments)+'</em></p>' +
+                           '<p>待付金额：<em>￥'+toFloat(_self.orderInfo.pendingPayments)+'</em></p>' +
                            '<ul><li>开户行：中信银行（深圳泰然支行）</li>' +
                                 '<li>银行卡号：6217 6803 0362 0897</li>' +
                                 '<li>户名：周仁声</li>' +
-                                '<li>订单标识：<em class="no">'+this.orderIdentificationId+'</em><em class="copy">复制</em></li></ul>' +
+                                '<li>订单标识：<em class="no">'+_self.orderIdentificationId+'</em><em class="copy">复制</em></li></ul>' +
                            '<p><i>请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</i></p>' +
                          '</div>',
                 confitmBtnText: '确定',
@@ -223,7 +223,7 @@ var orderPage = new Vue({
                             CAIMEI.Alert('订单已申请全部退款，无需再付款！', '确定', false);
                             break;
                         default:
-                            if(r.data.onlinePayFlag == '1'){
+                            if(r.data.onlinePayFlag == 1){
                                 _self.modelType = 3;
                                 _self.showModelTypePop();
                             }else{
@@ -242,7 +242,7 @@ var orderPage = new Vue({
                     if (_self.modelType === 2) {
                         window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payModelData.pendingPayments;
                     } else {
-                        if (_self.orderInfo.onlinePayFlag === '1') {
+                        if (_self.orderInfo.onlinePayFlag === 1) {
                             _self.modelType = 3;
                             _self.showModelTypePop();
                         } else {
@@ -256,7 +256,7 @@ var orderPage = new Vue({
         },
         hanldCancelConfirm:function(){//不使用余额抵扣直接跳转收银台
             var _self = this;
-            if(_self.orderInfo.onlinePayFlag == '1'){
+            if(_self.orderInfo.onlinePayFlag == 1){
                 _self.modelType = 3;
                 _self.showModelTypePop();
             }else{

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

@@ -158,14 +158,14 @@ var orderPage = new Vue({
             OrderApi.GetQueryOrderListData(_self.listQuery,function (response) {
                 if(response.code == 0){
                     var data = response.data;
-                    if(data.results && data.results.length>0) {
+                    if(data.list && data.list.length>0) {
                         _self.orderList = [];
-                        _self.orderList = data.results;
-                        _self.listRecord = data.totalRecord;
+                        _self.orderList = data.list;
+                        _self.listRecord = data.total;
                     }else{
                         _self.orderList = [];
-                        _self.orderList = data.results;
-                        _self.listRecord = data.totalRecord;
+                        _self.orderList = data.list;
+                        _self.listRecord = data.total;
                     }
                     _self.isRequset = false;
                 }else{
@@ -190,7 +190,7 @@ var orderPage = new Vue({
         hanldCancelOrderFn:function(orderId){//取消订单
             var _self = this;
             CAIMEI.Modal('确认取消该订单吗？','取消','确定',function () {
-                OrderApi.GetCancelOrder({orderID:orderId},function(response){
+                OrderApi.GetCancelOrder({orderId:orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('取消成功',true,function () {
                             _self.GetQueryOrderListData();
@@ -204,7 +204,7 @@ var orderPage = new Vue({
         hanldDeleteOrderFn:function(orderId){//删除订单
             var _self = this;
             CAIMEI.Modal('确认删除该订单吗？','取消','确定',function () {
-                OrderApi.GetDeleteOrder({orderID:orderId},function(response){
+                OrderApi.GetDeleteOrder({orderId:orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('删除成功',true,function () {
                             _self.GetQueryOrderListData();
@@ -218,7 +218,7 @@ var orderPage = new Vue({
         hanldReceivingOrderFn:function(orderId){//确认收货
             var _self = this;
             CAIMEI.Modal('是否确认收货？','取消','确定',function () {
-                OrderApi.GetAffirmOrder({orderID:orderId},function(response){
+                OrderApi.GetAffirmOrder({orderId:orderId},function(response){
                     if(response.code == 0){
                         _self.beansType = 7;
                         _self.beanNumber = 100;
@@ -299,7 +299,7 @@ var orderPage = new Vue({
                             CAIMEI.Alert('订单已申请全部退款，无需再付款！', '确定', false);
                             break;
                         default:
-                            if(r.data.onlinePayFlag == '1'){
+                            if(r.data.onlinePayFlag == 1){
                                 _self.modelType = 3;
                                 _self.showModelTypePop();
                             }else{
@@ -318,7 +318,7 @@ var orderPage = new Vue({
                     if (type === 2) {
                         window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payModelData.pendingPayments;
                     } else {
-                        if (data.order.onlinePayFlag === '1') {
+                        if (data.order.onlinePayFlag === 1) {
                             _self.modelType = 3;
                             _self.showModelTypePop();
                         } else {
@@ -332,7 +332,7 @@ var orderPage = new Vue({
         },
         hanldCancelConfirm:function(){//不使用余额抵扣直接跳转收银台
             var _self = this;
-            if(_self.hanldOrderData.onlinePayFlag == '1'){
+            if(_self.hanldOrderData.onlinePayFlag == 1){
                 _self.modelType = 3;
                 _self.showModelTypePop();
             }else{

src/main/resources/templates/components/header.html

@@ -18,7 +18,7 @@
                                         <span class="unit" v-text="'数量：'+cart.number"></span>
                                         <span class="price" v-text="'￥'+parseFloat(cart.price).toFixed(2)"></span>
                                     </a>
-                                    <span class="delBtn" @click="DeleteCartProducts(cart.id)"></span>
+                                    <span class="delBtn" @click="DeleteCartProducts(cart.productId)"></span>
                                 </div>
                             </div>
                             <div class="cartBtm">

src/main/resources/templates/product/detail.html

@@ -351,6 +351,7 @@
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/shopping.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/detail.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/shopping/cart.html

@@ -47,11 +47,11 @@
             <div class="supplierItem" v-for="supplier,index in listData">
                 <div class="supplierTit">
                     <div class="c0">
-                        <input class="check" type="checkbox" @change="ckeckSupplier($event, supplier.checked)" v-model="supplier.checked">
+                        <input class="check" type="checkbox" @change="ckeckSupplier($event, supplier.isChecked)" v-model="supplier.isChecked">
                     </div>
                     <a  class="shop" :href="'/supplier-'+supplier.id+'.html'" target="_blank">
-                        <img class="img" :src="supplier.logo">
-                        <span class="name" v-text="supplier.name"></span>
+                        <img class="img" :src="supplier.shopLogo">
+                        <span class="name" v-text="supplier.shopName"></span>
                     </a>
                     <!--店铺促销-->
                     <div class="price">

src/main/resources/templates/shopping/confirm.html

@@ -64,15 +64,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>
@@ -104,8 +104,8 @@
             <div class="supplierItem" v-for="supplier,index in listData">
                 <div class="supplierTit">
                     <a href="javascript:void(0);">
-                        <img class="img" :src="supplier.logo">
-                        <span class="name" v-text="supplier.name"></span>
+                        <img class="img" :src="supplier.shopLogo">
+                        <span class="name" v-text="supplier.shopName"></span>
                     </a>
                     <!--店铺促销-->
                     <div class="price">
@@ -210,10 +210,10 @@
         <h2 class="title">发票信息</h2>
         <div class="invoiceWrap">
             <div class="formLine">
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="0" checked><i class="icon mIcon">不要发票</i></label>
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="2"><i class="icon mIcon">要发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="orderInvoice.type" value="0" checked><i class="icon mIcon">不要发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="orderInvoice.type" value="2"><i class="icon mIcon">要发票</i></label>
             </div>
-            <div class="invoiceForm" v-show="invoice.type==1"><!--普通发票-->
+            <div class="invoiceForm" v-show="orderInvoice.type==1"><!--普通发票-->
                 <div class="formLine">
                     <p class="label"><em>*</em>发票内容：</p>
                     <input type="text" disabled value="商品明细">
@@ -221,57 +221,57 @@
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>发票类型：</p>
-                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="invoice.invoiceTitleType" value="0"><i class="icon mIcon">个人</i></label>
-                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="invoice.invoiceTitleType" value="1"><i class="icon mIcon">公司</i></label>
+                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.invoiceTitleType" value="0"><i class="icon mIcon">个人</i></label>
+                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.invoiceTitleType" value="1"><i class="icon mIcon">公司</i></label>
                     <span class="errTips icon mIcon"></span>
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>发票抬头：</p>
-                    <input type="text" v-model.trim="invoice.invoiceTitle" :placeholder="'请输入'+(invoice.invoiceTitleType==1?'公司':'个人')+'抬头'" maxlength="20" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.invoiceTitle" :placeholder="'请输入'+(orderInvoice.invoiceTitleType==1?'公司':'个人')+'抬头'" maxlength="20" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的发票抬头"></span>
                 </div>
-                <div class="formLine" v-show="invoice.invoiceTitleType==1">
+                <div class="formLine" v-show="orderInvoice.invoiceTitleType==1">
                     <p class="label"><em>*</em>纳税人识别号：</p>
-                    <input type="text" v-model.trim="invoice.corporationTaxNum" placeholder="请输入纳税人识别号" maxlength="20" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.corporationTaxNum" placeholder="请输入纳税人识别号" maxlength="20" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的纳税人识别号"></span>
                 </div>
             </div>
-            <div class="invoiceForm" v-show="invoice.type==2"><!--增值税发票-->
+            <div class="invoiceForm" v-show="orderInvoice.type==2"><!--增值税发票-->
                 <div class="formLine">
                     <p class="label"><em>*</em>单位名称：</p>
-                    <input type="text" v-model.trim="invoice.invoiceTitle" placeholder="请输入单位名称" maxlength="20" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.invoiceTitle" placeholder="请输入单位名称" maxlength="20" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的单位名称"></span>
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>纳税人识别号：</p>
-                    <input type="text" v-model.trim="invoice.corporationTaxNum" placeholder="请输入纳税人识别号" maxlength="20" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.corporationTaxNum" placeholder="请输入纳税人识别号" maxlength="20" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的纳税人识别号"></span>
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>注册地址：</p>
-                    <input type="text" v-model.trim="invoice.registeredAddress" placeholder="请输入注册地址" maxlength="40" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.registeredAddress" placeholder="请输入注册地址" maxlength="40" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的注册地址"></span>
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>注册电话：</p>
-                    <input type="text" v-model.trim="invoice.registeredPhone" placeholder="请输入注册电话" maxlength="15" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.registeredPhone" placeholder="请输入注册电话" maxlength="15" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的注册电话"></span>
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>开户银行：</p>
-                    <input type="text" v-model.trim="invoice.openBank" placeholder="请输入开户银行" maxlength="10" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.openBank" placeholder="请输入开户银行" maxlength="10" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的开户银行"></span>
                 </div>
                 <div class="formLine">
                     <p class="label"><em>*</em>银行账号：</p>
-                    <input type="text" v-model.trim="invoice.bankAccountNo" placeholder="请输入银行账号" maxlength="19" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="orderInvoice.bankAccountNo" placeholder="请输入银行账号" maxlength="19" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的银行账号"></span>
                 </div>
@@ -318,17 +318,17 @@
             <p>商品种类: <span>{{kindCount}}种</span></p>
             <p>数量总计: <span>{{totalCount}}件</span></p>
             <p>运费:
-                <span v-if="payInfo.freePostFlag==-1">到付</span>
-                <span v-if="payInfo.freePostFlag==0">包邮</span>
-                <span v-if="payInfo.freePostFlag==1"><em>¥{{payInfo.freight | NumFormat}}</em></span>
+                <span v-if="hanldPostageFlag == -1">到付</span>
+                <span v-if="hanldPostageFlag == 0">包邮</span>
+                <span v-if="hanldPostageFlag == 1"><em>¥{{ hanldPostage | NumFormat }}</em></span>
             </p>
             <p v-if="reducedPrice>0">促销满减: <span><em>- ¥{{reducedPrice | NumFormat}}</em></span></p>
             <p>优惠券: <span><em>- ¥{{couponAmount | NumFormat}}</em></span></p>
             <p v-if="balance.deductMoney>0">抵扣账户余额: <span><em>- ¥{{balance.deductMoney | NumFormat}}</em></span></p>
-            <p>总价: <span><em>¥{{payInfo.orderShouldPayFee | NumFormat}}</em></span></p>
+            <p>总价: <span><em>¥{{hanldShouldPayFee | NumFormat}}</em></span></p>
             <p class="pis" v-if="isBeansShow">
-                <span v-if="payInfo.freePostFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}元运费</span>
-                <span v-if="payInfo.freePostFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}运费</span>
+                <span v-if="hanldPostageFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}元运费</span>
+                <span v-if="hanldPostageFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}运费</span>
                 <span>
                     <label class="check">
                         <input v-model="balance.isFreight" name="useBalance" type="checkbox" @change="changeDeductibleFreight()">
@@ -346,24 +346,23 @@
             </div>
             <div class="right mfbt">
                 <div class="totalMoney">
-                    <div class="totalPrice" :class="totalDiscountAmount == 0 ? 'none' : ''">总价：<span>¥{{payInfo.orderShouldPayFee | NumFormat}}</span></div>
+                    <div class="totalPrice" :class="totalDiscountAmount == 0 ? 'none' : ''">总价：<span>¥{{hanldShouldPayFee | NumFormat}}</span></div>
                     <div class="totalCoupon" v-if="totalDiscountAmount > 0">共减：¥{{ totalDiscountAmount | NumFormat }}</div>
                 </div>
                 <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()" onclick="_czc.push(['_trackEvent','确认订单','点击','用户提交订单','','Um_Event_ConfirmOrder'])">提交订单</a>
             </div>
         </div>
     </div>
-
     <!--选择地址弹窗-->
     <div class="model-address-content" v-show="isShowAddressList">
         <div class="model-content">
             <div v-if="isPC" class="title"><p>选择地址</p><i class="icon mIcon" @click="closeAddressBox()"></i></div>
             <div class="content">
-                <div class="list" v-for="(item, index) in addressList" @click="chooseAddress(item.addressID)" :class="address.selectedId==item.addressID ? 'checked' : ''">
+                <div class="list" v-for="(item, index) in addressList" @click="chooseAddress(item.addressId)" :class="address.selectedId==item.addressId ? 'checked' : ''">
                     <div class="list-left">
-                        <p><span class="label">收货人:</span>{{item.shouHuoRen}}</p>
-                        <p><span class="label">联系方式:</span>{{item.mobile}}</p>
-                        <p><span class="label">收货地址:</span>{{item.province}}{{item.city}}{{item.town}}{{item.address}}</p>
+                        <p><span class="label">收货人:</span>{{ item.receiver }}</p>
+                        <p><span class="label">联系方式:</span>{{ item.mobile }}</p>
+                        <p><span class="label">收货地址:</span>{{ item.province }}{{ item.city }}{{ item.town }}{{ item.address }}</p>
                     </div>
                     <div class="list-right mfbt">
                         <div class="list-defalut" v-if="item.defaultFlag == 1">
@@ -371,9 +370,9 @@
                             <span class="span-s">默认地址</span>
                         </div>
                         <div class="list-defalut" v-else>
-                            <a href="javascript:void(0)" @click.stop="setDefaultAddress(item.addressID)">设为默认地址</a>
+                            <a href="javascript:void(0)" @click.stop="setDefaultAddress(item.addressId)">设为默认地址</a>
                         </div>
-                        <a class="list-btn" href="javascript:void(0)" @click.stop="deleteAddress(item.addressID)">删除</a>
+                        <a class="list-btn" href="javascript:void(0)" @click.stop="deleteAddress(item.addressId)">删除</a>
                     </div>
                     <div class="seclet"><i class="icon mIcon"></i></div>
                 </div>

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

@@ -224,17 +224,17 @@
                         </div>
                         <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
                             <div class="inner">
-                                <a class="btn primary confirm" href="javascript: void(0);" v-if="orderInfo.affirmPaymentFlag=='00'" @click="hanldConfirmFn(orderInfo.userID,orderInfo.orderID)"><p>确认</p>打款供应商</a>
-                                <a class="btn primary" href="javascript: void(0);" v-if="!orderInfo.payButton && ['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
-                                <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
-                                <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
-<!--                                <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>-->
-                                <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(orderInfo.status)!=-1 && orderInfo.secondHandOrderFlag!=1" @click="hanldQueryExpressFn()">查看物流</a>
-                                <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">
+                                <a class="btn primary confirm" href="javascript: void(0);" v-if="orderInfo.affirmPaymentFlag==10" @click="hanldConfirmFn()"><p>确认</p>打款供应商</a>
+                                <a class="btn primary" href="javascript: void(0);" v-if="!orderInfo.payButton && [11,12,13,21,22,23,111].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
+                                <a class="btn cancel" href="javascript: void(0);" v-if="[0,111].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
+                                <a class="btn primary" href="javascript: void(0);" v-if="[0].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
+<!--                                <a class="btn cancel" href="javascript: void(0);" v-if="[6].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>-->
+                                <a class="btn cancel" href="javascript: void(0);"  v-if="[4,5,12,13,33,22,23,32,77].indexOf(orderInfo.status)!=-1 && orderInfo.secondHandOrderFlag!=1" @click="hanldQueryExpressFn()">查看物流</a>
+                                <a class="btn primary" href="javascript: void(0);"  v-if="[33].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">
                                     确认收货
                                     <div class="tips">采美豆</div>
                                 </a>
-                                <div class="shopinfo" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1">
+                                <div class="shopinfo" v-if="[11,12,13,21,22,23,111].indexOf(orderInfo.status)!=-1">
                                     <p class="price-total" v-if="orderInfo.pendingPayments!=0">待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                             </div>

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

@@ -73,7 +73,7 @@
                                 <span class="bag" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</span>
                                 <span class="bag" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</span>
                                 <div class="title-name">
-                                    <p>订单编号(标识)：<span>{{order.orderNo}}({{order.orderID}})</span></p>
+                                    <p>订单编号(标识)：<span>{{order.orderNo}}({{order.orderId}})</span></p>
                                     <p class="state">{{order.status | stateExp}}</p>
                                 </div>
                                 <div class="title-type" v-if="order.secondHandOrderFlag == 1"></div>
@@ -89,7 +89,7 @@
                                     <p v-if="order.discountFee!=0">经理折扣：<span>￥{{order.discountFee | NumFormat}}</span> </p>
                                     <p>促销满减：<span>￥{{order.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数：<span>{{order.presentCount + order.promotionalGiftsCount}}</span></p>
-                                    <p class="confirm-text" v-if="order.affirmPaymentFlag==1">已确认打款供应商</p>
+                                    <p class="confirm-text" v-if="order.affirmPaymentFlag == 1 ">已确认打款供应商</p>
                                 </div>
                                 <div class="order-item">
                                     <p>订单总额：<span class="red">￥{{order.payTotalFee | NumFormat}}</span> </p>
@@ -100,14 +100,14 @@
                                     <p>待付金额：<span class="red">￥{{order.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                                 <div class="order-botton">
-                                    <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag=='00'" @click="hanldConfirmFn(order.userID,order.orderID)"><p>确认</p>打款供应商</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="!order.payButton && ['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderID)">支付订单</a>
-                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
-                                    <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderID)">取消订单</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderID)">确认订单</a>
-<!--                                    <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderID)">删除订单</a>-->
-                                    <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldQueryExpressFn(order.orderID)">查看物流</a>
-                                    <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldReceivingOrderFn(order.orderID)">
+                                    <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag== 10 " @click="hanldConfirmFn(order.userId,order.orderId)"><p>确认</p>打款供应商</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="!order.payButton && [11,12,13,21,22,23,111].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderId)">支付订单</a>
+                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderId)">订单详情</a>
+                                    <a class="btn cancel" href="javascript: void(0);" v-if="[0,111].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderId)">取消订单</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="[0].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderId)">确认订单</a>
+<!--                                    <a class="btn cancel" href="javascript: void(0);" v-if="[6].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderId)">删除订单</a>-->
+                                    <a class="btn cancel" href="javascript: void(0);"  v-if="[4,5,12,13,33,22,23,32,77].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldQueryExpressFn(order.orderId)">查看物流</a>
+                                    <a class="btn primary" href="javascript: void(0);"  v-if="[33].indexOf(order.status)!=-1 && order.secondHandOrderFlag !=1" @click="hanldReceivingOrderFn(order.orderId)">
                                         确认收货
                                         <div class="tips">采美豆</div>
                                     </a>