commit-m 订单模块接口联调

components/cm-module/cart-components/index.vue

@@ -21,12 +21,12 @@
 							<view class="shoptitle">
 								<!--选择商店的全部商品"-->
 								<view class="checkbox-box" @click.stop="checkShop(item)">
-									<view class="checkbox iconfont" :class="[item.checked ?'icon-yixuanze':'icon-weixuanze']"></view>
+									<view class="checkbox iconfont" :class="[item.isChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
 								</view>
 								<view v-if="item.promotions" class="floor-item-act">
 									<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>	
 								</view>
-								<view class="text">{{item.name}}</view> 
+								<view class="text">{{item.shopName}}</view> 
 								<view class="text-coupon" @click="showPopup(0,item)" v-if="item.couponsLogo">领券</view>
 							</view>
 							<view class="productlist">
@@ -34,7 +34,7 @@
 									<view class="goods-pros-t">
 										<!--选择商品-->
 										<view class="checkbox-box" @click.stop="ischeck(item,pros)">
-											<view class="checkbox iconfont" :class="[pros.productsChecked ? 'icon-yixuanze':'icon-weixuanze']"></view>
+											<view class="checkbox iconfont" :class="[pros.isChecked ? 'icon-yixuanze':'icon-weixuanze']"></view>
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productId)"	><image :src="pros.image ? pros.image:''" alt="" /></view>
 										<view class="pros-product">
@@ -93,7 +93,7 @@
 									<!--选择商品-->
 									<view class="checkbox-box" @click.stop="ischeckFailure(failure)" v-if="isshowDelbtn">
 										<button class="checkbox iconfont" 
-												:class="[ failure.productsChecked ? 'icon-yixuanze':'icon-weixuanze']">
+												:class="[ failure.isChecked ? 'icon-yixuanze':'icon-weixuanze']">
 										</button>
 									</view>
 									<text class="img-tip">失效</text>
@@ -456,7 +456,7 @@
 						this.goodsList = data.list;
 						this.goodsList.forEach((item,index) => {
 							item.cartList.forEach(pros => {
-								pros.shopID = item.shopID;
+								pros.shopId = item.shopId;
 								pros.isStep = false
 								if(pros.step === 2){ 
 									if(pros.number % pros.min != 0){
@@ -490,12 +490,12 @@
 				})
 			},		
 			ischeckFailure(failure){
-				failure.productsChecked = !failure.productsChecked
+				failure.isChecked = !failure.isChecked
 				this.updateCheckAllBtn()
 			},
 			ischeck(item,pro){//为未选中的时候改变为true，反之为true
-				pro.productsChecked = !pro.productsChecked;
-				if(pro.productsChecked) {
+				pro.isChecked = !pro.isChecked;
+				if(pro.isChecked) {
 					if(!this.submitIds.includes(pro.productID*1)){
 						this.submitIds.push(pro.productID);
 					}
@@ -515,30 +515,30 @@
 					disabledLength = 0;
 				if(this.isshowDelbtn) {
 					productsList.forEach(pros => {
-						if(pros.productsChecked) {
+						if(pros.isChecked) {
 							productsCheckedLength++;
 						}
 					})
 				} else {
 					productsList.forEach(pros => {
-						if(pros.productsChecked) {
+						if(pros.isChecked) {
 							productsCheckedLength++;
 						}
 					})
 				}
-				item.checked = productsCheckedLength === productsList.length;
+				item.isChecked = productsCheckedLength === productsList.length;
 			},
 			updateCheckAllBtn() {// 全选勾选判断
 				let goodsCheckedLength = 0,
 					goodsList = this.goodsList,
 					failureList = this.failureList;
 				goodsList.forEach(item => {
-					if(item.checked) {
+					if(item.isChecked) {
 						goodsCheckedLength++;
 					}
 				})
 				failureList.forEach(failureItem=>{
-					if(failureItem.productsChecked){
+					if(failureItem.isChecked){
 						goodsCheckedLength++;
 					}
 				})
@@ -549,19 +549,19 @@
 				}
 			},
 			checkShop(item){//与单选商品类似
-				item.checked = !item.checked;
+				item.isChecked = !item.isChecked;
 				this.setProductChecked(item);
 				this.updateCheckAllBtn();
 			},
 			setProductChecked(item) {
 				item.cartList.forEach(pros=>{
-					if(item.checked) {
-						pros.productsChecked = true;
+					if(item.isChecked) {
+						pros.isChecked = true;
 						if(!this.submitIds.includes(pros.productId*1)){
 							this.submitIds.push(pros.productId);
 						}
 					} else {
-						pros.productsChecked = false;
+						pros.isChecked = false;
 						var lent = this.submitIds.indexOf(pros.productId*1);
 						if(lent >=0 ){
 							this.submitIds.splice(lent, 1);
@@ -573,16 +573,16 @@
 				if(this.isshowDelbtn) {
 					// 当管理删除按钮出现时,失效的商品可被选择
 					this.goodsList.forEach((item)=>{
-						item.checked = this.isCheckAll;
+						item.isChecked = this.isCheckAll;
 						this.setProductChecked(item);
 					})
 					//删除按钮 全选包括失效商品勾选
 					this.failureList.forEach(failureItem=>{
-						failureItem.productsChecked = this.isCheckAll;
+						failureItem.isChecked = this.isCheckAll;
 					})
 				} else {
 					this.goodsList.forEach((item)=>{
-						item.checked = this.isCheckAll && !item.isDisabled;
+						item.isChecked = this.isCheckAll && !item.isDisabled;
 						this.setProductChecked(item);
 					})
 				}
@@ -649,7 +649,7 @@
 					item.reducedprice = 0;
 					item.originalprice = 0;
 					item.cartList.forEach(pros=>{	
-						if(pros.productsChecked){								
+						if(pros.isChecked){								
 							supplierPrice += pros.price*pros.number;
 							// 单品满减
 							if(pros.promotions && pros.promotions.type*1===1 && pros.promotions.mode*1===2){
@@ -698,6 +698,9 @@
 				this.reducedPrice = reducedPrice;
 				// 最终合计价格 = 	店铺满减合计 + 单品满减  + 正常合计 + 凑单满减			
 				this.allPrice = totalPrice ;
+				console.log('totalOriginalPrice',this.totalOriginalPrice)
+				console.log('reducedPrice',this.reducedPrice)
+				console.log('allPrice',this.allPrice)
 				// 计算优惠券
 				if(this.totalCouponList.length>0){
 					let eligibleCoupons = this.calculationCoupon()
@@ -711,6 +714,7 @@
 				}
 				// 最后满减金额 = 店铺减去金额 + 单品减去金额 + 凑单减去金额
 				this.totalDiscountAmount = this.reducedPrice + this.couponPrice;
+				console.log('totalDiscountAmount',this.totalDiscountAmount)
 				// 控制显示优惠明细
 				if(this.totalDiscountAmount > 0 ){
 					this.isDiscount = true
@@ -727,7 +731,7 @@
 			    this.goodsList.forEach(item=>{
 					productsList = item.cartList
 					productsList.forEach(pros=>{
-						if(pros.productsChecked){
+						if(pros.isChecked){
 							prosAllCount+=parseInt(pros.number);
 							this.allCount = prosAllCount
 						}
@@ -738,7 +742,7 @@
 				let eligibleCoupons = []
 				this.goodsList.forEach(shop=>{ 
 					shop.cartList.forEach(pros=>{
-						if(pros.productsChecked){		
+						if(pros.isChecked){		
 							this.totalCouponList.forEach(coupon=>{//循环优惠券
 								switch(coupon.couponType){
 									case 0:// 活动券
@@ -842,7 +846,7 @@
 			},
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
 				let ladderPriceList = pros.ladderPrices;
-				if(pros.ladderFlag == '0' || pros.actStatus == 1){
+				if(pros.ladderFlag == 0 || pros.actStatus == 1){
 					pros.price = pros.price
 				}else{
 					ladderPriceList.forEach((item,index)=>{
@@ -872,7 +876,7 @@
 				this.goodsList.forEach(res=>{
 					let products = res.cartList
 					products.forEach(pros=>{
-						if(pros.productsChecked){
+						if(pros.isChecked){
 						    setGoodsList.push(pros.productId)
 						}
 					})
@@ -884,7 +888,7 @@
 					this.isNoConfim = false
 					this.goodsList.forEach(el=>{
 						el.cartList.forEach(pros=>{
-							if(pros.productsChecked){
+							if(pros.isChecked){
 							   if(pros.number<pros.min){
 								   this.isNoConfim = true
 							   }
@@ -895,20 +899,15 @@
 						this.$util.modal('','有商品的购买量没达到最小起订量，请修改数量后再次提交结算','去修改','',false,() =>{})
 						return;
 					}
-					let productID = '';
+					let productIds = '';
 					this.goodsList.forEach(el=>{//获取勾选的商品ID拼接字符串逗号隔开，最后一个逗号去掉
 						el.cartList.forEach(pros=>{
-							if(pros.productsChecked){
-							   productID += pros.productId+','
+							if(pros.isChecked){
+							   productIds += pros.productId+','
 							}
 						})
 					})
-					let cartPramsData={
-							allPrice:this.allPrice,
-							allCount:this.allCount,
-							productID:productID.substring(0,productID.lastIndexOf(',')),
-							productCount:''
-						}
+					let cartPramsData={ productIds:productIds.substring(0,productIds.lastIndexOf(',')) }
 					// 友盟埋点购物车去结算点击事件
 					if(process.env.NODE_ENV != 'development'){
 						this.$uma.trackEvent('Um_Event_shoppingCartConfirmOrder', {
@@ -925,9 +924,9 @@
 					this.updateBothCheckBtn();	
 				} else {
 					this.goodsList.forEach(item => {
-						if(item.checked) {
+						if(item.isChecked) {
 							item.cartList.forEach(pros => {
-								pros.productsChecked = true;
+								pros.isChecked = true;
 							})
 						}
 					})
@@ -949,11 +948,11 @@
 					// 失效商品取消勾选
 					this.goodsList.forEach(item => {
 						if(item.isDisabled) {
-							item.checked = false;
+							item.isChecked = false;
 						}
 						item.cartList.forEach(pros => {
 							if(pros.validFlag == 3) {
-								pros.productsChecked = false;
+								pros.isChecked = false;
 							}
 						})
 					})
@@ -974,13 +973,13 @@
 				this.goodsList.forEach(delitem=>{
 					let products = delitem.cartList
 					products.forEach(pros=>{
-						if(pros.productsChecked){
+						if(pros.isChecked){
 						    this.delGoodsList += pros.productId+','
 						}
 					})
 				})
 				this.failureList.forEach(failure=>{
-					if(failure.productsChecked){
+					if(failure.isChecked){
 						this.delGoodsList += failure.productId+','
 					}
 				})
@@ -989,7 +988,12 @@
 					return
 				}else{			
 					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
-						this.ProductService.ShoppingCartDelete({userID:this.userId,productIDs:this.delGoodsList}).then(response =>{
+						this.ProductService.ShoppingCartDelete(
+							{
+								userId:this.userId,
+								productIds:this.delGoodsList,
+							}
+						).then(response =>{
 							this.$util.msg('删除成功',2000);
 							setTimeout(()=>{
 								this.isshowDelbtn = false;
@@ -1004,7 +1008,12 @@
 			deletefailureList(){
 				this.failureList.forEach(failure=>{ this.delGoodsList += failure.productId+',' })
 				this.$util.modal('','确定清空全部失效商品吗？','确定','取消',true,() =>{
-					this.ProductService.ShoppingCartDelete({userID:this.userId,productIDs:this.delGoodsList}).then(response =>{
+					this.ProductService.ShoppingCartDelete(
+						{
+							userId:this.userId,
+							productIds:this.delGoodsList,
+						}
+					).then(response =>{
 						this.$util.msg('删除成功',2000);
 						setTimeout(()=>{
 							this.isshowDelbtn = false;
@@ -1124,7 +1133,7 @@
 					case 0:
 						this.currentTab = 0
 						this.couponParam.status = 1
-						this.couponParam.shopId = shop.id
+						this.couponParam.shopId = shop.shopId
 						this.queryPopupCoupons()
 						this.popupShow0 = true
 						break;

components/cm-module/creatOrder/goodsList.vue

@@ -7,7 +7,7 @@
 					<view v-if="item.promotions" class="floor-item-act">
 						<view class="floor-tags">{{item.promotions.name}}</view>	
 					</view>
-					<view class="title-text">{{item.name}}</view> 
+					<view class="title-text">{{item.shopName}}</view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.cartList" :key="idx">
 					<view class="goods-pros-t">

pages/goods/product.vue

@@ -826,9 +826,7 @@
 			toConfirmation(){//跳转确认订单页面
 				this.specClass = 'hide';
 				let productStp ={
-						allPrice:this.number*this.buyRetailPrice,
-						allCount:this.number,
-						productID:this.product.productId,
+						productIds:this.product.productId,
 						productCount:this.number
 				}	
 				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)

pages/user/order/create-order.vue

@@ -115,7 +115,22 @@
 	import exchangeCoupon from '@/components/cm-module/creatOrder/exchangeCoupon'
 	import freight from '@/components/cm-module/creatOrder/freight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert'
-
+	const defaultProductParam = {
+			productCount:0,
+			productId:0,
+			source:2,
+			userId:0
+		};
+	const defaultCartParam = {
+			productIds:0,
+			source:2,
+			userId:0
+		};
+	const defaultPostageParam = {
+			productIds:0,
+			userId:0,
+			townId:0
+		};
 	export default {
 		components:{
 			choiceAddress,
@@ -130,12 +145,14 @@
 			return {
 				isIphoneX:this.$store.state.isIphoneX,
 				isSubLoading:false,
+				confirmType:1,
 				orderID:0,
+				cartParam: Object.assign({}, defaultCartParam), 				 // 购物车立即结算确认订单参数
+				productParam: Object.assign({}, defaultProductParam), 			 // 商品立即购买确认订单参数
+				postageParam: Object.assign({}, defaultPostageParam),			 // 邮费计算参数
 				productIds:'',			  // 获取上一级页面商品信息
-				productCount:'',		  // 获取上一级页面商品数量
 				classifyIDS:'',			  // 获取上一级页面商品分类
-				userID:'',				  // 用户ID
-				cartType:'',			  // 购买类型（1购物车提交，2直接购买提交）
+				clubId:'',				  // 用户ID
 				submitState:'',  		  // 提交状态
 				balanceDeductionFlag:2,   // 勾选余额的状态(1使用，2不使用)
 				allCount:1,				  // 订单提交总数量
@@ -147,8 +164,7 @@
 				surplusMoney:0.00,		  // 显示勾选后的剩余抵扣
 				userMoney:0.00,			  // 显示可使用余额
 				deductMoney:0.00,		  // 显示已使用的余额
-				addressID:'',			  // 地址ID
-				townID:'',				  // 区ID
+				addressId:'',			  // 地址ID
 				isRequest:false,		  // 是否加载完成渲染子组件
 				isFreight:false,		  // 是否加载完成渲染子组件
 				isAddress:false,		  // 是否加载完成地址
@@ -176,18 +192,22 @@
 		},
 		onLoad(option){//商品数据
 			let data = JSON.parse(option.data);
-			if(option.type =='prodcut'){
-				this.cartType = 2
-				this.productCount = data.data.productCount
-				this.productIds = data.data.productID
-			}else{
-				this.cartType = 1
-				this.productCount = data.data.productCount
-				this.productIds = data.data.productID
-			}
+			console.log('infodata',data)
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
-				this.getInitCrearOrder();
+				this.productParam.userId = this.cartParam.userId = this.postageParam.userId = resolve.userId ? resolve.userId : 0
+				this.clubId = resolve.clubId ? resolve.clubId : 0
+				if(option.type =='prodcut'){
+					this.confirmType = 1
+					this.productParam.productCount = data.data.productCount
+					this.productParam.productId = data.data.productIds
+					this.productIds = this.postageParam.productIds = data.data.productIds
+					this.getProductCreateOrderInfo()
+				}else{
+					this.confirmType = 2
+					this.productIds = this.cartParam.productIds = this.postageParam.productIds = data.data.productIds
+					this.CartCreateOrderInfo()
+				}
+
 			})
 		},
 		filters:{
@@ -196,14 +216,30 @@
 			},
 		},	
 		methods: {
-			getInitCrearOrder(){//获取订单商品信息
-				this.OrderService.CreateOrderInfo({
-					userId:this.userID,
-					count:this.productCount,
-					productIds:this.productIds,
-					unionId:uni.getStorageSync('unionId')
+			getProductCreateOrderInfo(){// 商品立即购买确认订单数据初始化
+				this.OrderService.ProductCreateOrderInfo(this.productParam).then(response =>{
+					let data = response.data
+					this.isRequest = true
+					this.goodsData = data.list
+					this.couponList = data.couponList
+					this.userMoney = data.userMoney
+					this.reducedPrice = data.reducedPrice
+					this.allPrice = data.totalPrice
+					this.rechargeGoods = data.rechargeGoods
+					if(this.couponList.length>0){
+						this.isCouponShow = true
+						this.couponAmount = data.couponList[0].couponAmount
+						this.clubCouponId = data.couponList[0].clubCouponId 
+						this.payAllPrice = this.allPrice - this.couponAmount
+					}
+					this.totalDiscountAmount = this.reducedPrice + this.couponAmount
 				})
-				.then(response =>{
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			CartCreateOrderInfo(){// 购物车去结算确认订单数据初始化
+				this.OrderService.CartCreateOrderInfo(this.cartParam).then(response =>{
 					let data = response.data
 					this.isRequest = true
 					this.goodsData = data.list
@@ -224,19 +260,13 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			getFreightData(){//获取邮费信息
+			getFreightData(){// 获取邮费信息
 				this.isFreight = false
-				let params ={
-						userId:this.userID,
-						productIds:this.productIds,
-						totalPrice:this.allPrice,
-						townId:this.addressData.townID
-					}
-				this.OrderService.GetOrderPostage(params).then(response =>{
+				this.OrderService.GetOrderPostage(this.postageParam).then(response =>{
 					this.isFreight = true
 					this.isCheckedBeans = false
 					this.freightData = response.data
-					this.hanldFreePostFlag = response.data.freePostFlag
+					this.hanldFreePostFlag = response.data.postageFlag
 					this.hanldFreight = response.data.freight
 					if(this.hanldFreePostFlag == 1){
 						if( this.freightData.userBeans > 0 ){
@@ -261,13 +291,14 @@
 			},
 			getAddressData(){//获取地址信息
 				this.$api.getStorage().then((resolve) => {
-					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userID:resolve.userId}).then(response =>{
+					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userId:resolve.userId}).then(response =>{
+						let data = response.data
 						this.isAddress = true
 						this.addressData = {}
-						if(response.data.results != ''){
-							this.addressID = response.data.results[0].addressID;
-							this.townID = response.data.results[0].townID;
-							this.addressData = response.data.results[0];
+						if( data.list && data.list.length > 0 ){
+							this.addressId = data.list[0].addressId;
+							this.postageParam.townId = data.list[0].townId;
+							this.addressData = data.list[0];
 							this.getFreightData()
 						}else{
 							this.addressData = this.addressData;
@@ -430,7 +461,7 @@
 			},
 			orderSubmitMit(){// 提交订单
 				if(this.isSubLoading){ return; }
-				if(this.addressID == ''){
+				if(this.addressId == ''){
 					this.$util.msg('请先添加收货地址～',2000)
 					return
 				}
@@ -459,8 +490,7 @@
 						clubCouponId:this.clubCouponId,
 						orderSource:6,
 						clubUserId:this.userID,
-						cartType:this.cartType,
-						addressId:this.addressID,
+						addressId:this.addressId,
 						orderInfo:this.orderInfo,
 						payInfo:this.payInfo,	//订单信息
 						orderInvoice:this.invoiceData
@@ -503,6 +533,11 @@
 			},
 			handleClickCancel(){// 关闭优惠券弹窗
 				this.isCouponModel = false;
+				if(this.confirmType == 1){
+					
+				}else{
+					
+				}
 				this.getInitCrearOrder();
 			},
 			hideFreight(){//关闭邮费弹窗
@@ -516,7 +551,8 @@
 			if(currPage.data.select =='select'){
 				this.isAddress = true
 				let SelectData = uni.getStorageSync('selectAddress');
-				this.addressID = SelectData.addressID;
+				this.addressId = SelectData.addressId;
+				this.postageParam.townId = SelectData.townId 
 				this.addressData = SelectData
 				this.getFreightData()
 			}else{

services/order.service.js

@@ -73,13 +73,33 @@ export default class OrderService {
 		return this.AjaxService.get({ url:'/order/searchHistory/delete', data, isLoading: true })
 	}
 	/**
-	 *@机构-确认订单初始化数据
+	 *@机构-商品立即购买确认订单初始化数据
 	 *@param userId 用户ID
-	 *@param count	商品数量
+	 *@param productCount	商品数量
+	 *@param productId 商品ID
+	 *@param source 来源
+	 */
+	ProductCreateOrderInfo (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/order/club/product/settlement', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
+	}
+	/**
+	 *@机构-购物车去结算确认订单初始化数据
+	 *@param userId 用户ID
+	 *@param source	来源
 	 *@param productIds 商品IDs
 	 */
-	CreateOrderInfo (data = {}) {
-		return this.AjaxService.get({ url:'/order/confirm', data, isLoading: true })
+	CartCreateOrderInfo (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/order/club/cart/settlement', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *@确认订单-获取邮费信息
@@ -89,7 +109,12 @@ export default class OrderService {
 	 *@param townID		地址区ID
 	 */
 	GetOrderPostage (data = {}) {
-		return this.AjaxService.get({ url:'/order/postage', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/order/club/postage', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/**
 	 *@确认订单-获取发票信息

services/product.service.js

@@ -150,7 +150,12 @@ export default class ProductService {
 	 * @param:userId 用户ID(必填)
 	 */
 	ShoppingCartUpdate (data = {}) {
-		return this.AjaxService.post({ url:'/shoppingCart/update', data, isLoading: false })
+		return this.AjaxService.post({ 
+			url:'/order/club/cart/update', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	
 	/**
@@ -161,7 +166,12 @@ export default class ProductService {
 	 * @param:status 状态 1 未领取 2已领取
 	 */
 	ShoppingCartGetCoupon(data = {}) {
-		return this.AjaxService.get({ url:'/shoppingCart/get/coupon', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/coupon', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 * @删除购物车商品
@@ -169,7 +179,12 @@ export default class ProductService {
 	 * @param:productIDs 商品ID(用','号拼接)
 	 */
 	ShoppingCartDelete (data = {}) {
-		return this.AjaxService.post({ url:'/shoppingCart/delete', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/club/cart/delete', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 二级列表 */
 	GetPageTopic (data = {}) {