commit -m 余额抵扣逻辑修改

pages/seller/order/order-details.vue

@@ -386,13 +386,16 @@ export default {
 			//监听根据付款状态做操作
 			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
 				.then(response => {
-					let dataCode = response.data.code
-					this.payModelData = response.data
-					if (dataCode == -1) {
-						this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
-					} else {
-						this.isPayModel = true
-						this.modelType = 3
+					let data = this.payModelData = response.data
+					if(data.balanceFlag == 0){// 0可以走余额抵扣，1不能走余额抵扣
+						if (data.code == -1) {
+							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
+						} else {
+							this.isPayModel = true
+							this.modelType = 3
+						}
+					}else{
+						this.$util.modal('', '该订单已走线上支付流程,不能进行余额抵扣。', '确定', '', false, () => {})
 					}
 				})
 				.catch(error => {

pages/user/order/order-details.vue

@@ -296,10 +296,12 @@ export default {
 		},
 		getOrderPaymentValidation(data) {
 			//监听根据付款状态做操作
-			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
-				.then(response => {
-					let dataCode = response.data.code
-					this.payModelData = response.data
+			this.OrderService.OrderPaymentValidation({ orderId: data.orderId }).then(response => {
+				let data = response.data
+				this.payModelData = data
+				if(data.balanceFlag == 1){// 0可以走余额抵扣，1不能走余额抵扣
+					this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
+				}else{
 					switch (dataCode) {
 						case 1:
 							this.isPayModel = true
@@ -313,16 +315,17 @@ export default {
 							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
 							break
 						default:
-							if (response.data.onlinePayFlag == 1) {// 只能线下
+							if (data.onlinePayFlag == 1) {// 只能线下
 								this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.orderId}`)
 							} else {
 								this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
 							}
 					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+				}
+			})
+			.catch(error => {
+				this.$util.msg(error.msg, 2000)
+			})
 		},
 		hanldPaymentConfirm(data) {
 			//余额抵扣跳转
@@ -334,11 +337,7 @@ export default {
 							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
 						)
 					} else {
-						if (data.order.onlinePayFlag === 1) {
-							this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.order.orderId}`)
-						} else {
-							this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.order.orderId}`)
-						}
+						this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.order.orderId}`)
 					}
 				})
 				.catch(error => {

pages/user/order/order-list.vue

@@ -523,26 +523,30 @@ export default {
 			//监听根据付款状态做操作
 			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
 				.then(response => {
-					let dataCode = response.data.code
-					this.payModelData = response.data
-					switch (dataCode) {
-						case 1:
-							this.isPayModel = true
-							this.modelType = 1
-							break
-						case 2:
-							this.isPayModel = true
-							this.modelType = 2
-							break
-						case -1:
-							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
-							break
-						default:
-							if (response.data.onlinePayFlag == 1) {// 只能线下
-								this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.orderId}`)
-							} else {
-								this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
-							}
+					let data = response.data
+					this.payModelData = data
+					if(data.balanceFlag == 1){// 0可以走余额抵扣，1不能走余额抵扣
+						this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
+					}else{
+						switch (data.code) {
+							case 1:
+								this.isPayModel = true
+								this.modelType = 1
+								break
+							case 2:
+								this.isPayModel = true
+								this.modelType = 2
+								break
+							case -1:
+								this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
+								break
+							default:
+								if (data.onlinePayFlag == 1) {// 只能线下
+									this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.orderId}`)
+								} else {
+									this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
+								}
+						}
 					}
 				})
 				.catch(error => {
@@ -559,13 +563,7 @@ export default {
 							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
 						)
 					} else {
-						if (data.order.onlinePayFlag === 1) {
-							this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.order.orderId}`)
-						} else {
-							this.$api.navigateTo(
-								`/pages/user/order/order-pay-list?orderId=${data.order.orderId}`
-							)
-						}
+						this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${data.order.orderId}`)
 					}
 				})
 				.catch(error => {