Kaynağa Gözat

修改电影票订单状态

wenjie 9 ay önce
ebeveyn
işleme
416cdc9c3b

+ 2 - 2
src/api/goods.js

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-09 11:35:30
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-08-19 14:51:04
+ * @LastEditTime: 2024-08-30 10:10:11
  * @FilePath: \admin-manage\src\api\goods.js
  * @Description: 
  * 
@@ -231,7 +231,7 @@ export function listHidden(params) {
 // 首页商品列表
 export function homeGoodsList(params) {
   return request({
-    url: '/productcenterserver/search/v1/list',
+    url: '/productcenterserver/search/v2/list',
     method: 'get',
     params
   })

+ 10 - 2
src/views/operationManage/orderManage/index.vue

@@ -244,11 +244,19 @@ export default {
 				}else if(val.goodsState == 'APPLY_REFUNDING'){
 					return '退款中'
 				}else if(val.goodsState == 'USED'){
-					return '订单已完成'
+          if(val.jobFlowMap == 'YPP'){
+						return '已出票'
+					}else{
+						return '订单已完成'
+					}
 				}else if(val.goodsState == 'WAIT_PAYMENT'){
 					return '待付款'
 				}else if(val.goodsState == 'WAIT_USE'){
-					return '待使用'
+          if(val.jobFlowMap == 'YPP'){
+						return '出票中'
+					}else{
+						return '待使用'
+					}
 				}else{
 					return ''
 				}

+ 11 - 3
src/views/operationManage/orderManage/list.vue

@@ -311,7 +311,7 @@ export default {
 				if(val.refundLog&&val.refundLog.refund == 'REFUSAL_REFUND'&&!val.change){
 					return '拒绝退款'
 				}
-                else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
+        else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
 					return val.extend.orderInfo.orderStatus
 				}
 				else if(val.goodsState == 'APPLY_REFUND'){
@@ -325,11 +325,19 @@ export default {
 				}else if(val.goodsState == 'APPLY_REFUNDING'){
 					return '退款中'
 				}else if(val.goodsState == 'USED'){
-					return '订单已完成'
+          if(val.jobFlowMap == 'YPP'){
+						return '已出票'
+					}else{
+						return '订单已完成'
+					}
 				}else if(val.goodsState == 'WAIT_PAYMENT'){
 					return '待付款'
 				}else if(val.goodsState == 'WAIT_USE'){
-					return '待使用'
+          if(val.jobFlowMap == 'YPP'){
+						return '出票中'
+					}else{
+						return '待使用'
+					}
 				}else{
 					return ''
 				}

+ 11 - 3
src/views/operationManage/orderManage/orderDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-01 14:21:43
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-08-26 16:07:32
+ * @LastEditTime: 2024-08-29 14:14:58
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\orderDetail.vue
  * @Description:
  *
@@ -350,11 +350,19 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
 				}else if(val.goodsState == 'APPLY_REFUNDING'){
 					return '退款中'
 				}else if(val.goodsState == 'USED'){
-					return '订单已完成'
+					if(val.jobFlowMap == 'YPP'){
+						return '已出票'
+					}else{
+						return '订单已完成'
+					}
 				}else if(val.goodsState == 'WAIT_PAYMENT'){
 					return '待付款'
 				}else if(val.goodsState == 'WAIT_USE'){
-					return '待使用'
+					if(val.jobFlowMap == 'YPP'){
+						return '出票中'
+					}else{
+						return '待使用'
+					}
 				}else{
 					return ''
 				}

+ 11 - 3
src/views/operationManage/orderManage/payDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-01 14:21:43
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-08-26 16:08:54
+ * @LastEditTime: 2024-08-29 14:15:40
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\payDetail.vue
  * @Description:
  *
@@ -168,11 +168,19 @@ export default {
 				}else if(val.goodsState == 'APPLY_REFUNDING'){
 					return '退款中'
 				}else if(val.goodsState == 'USED'){
-					return '订单已完成'
+					if(val.jobFlowMap == 'YPP'){
+						return '已出票'
+					}else{
+						return '订单已完成'
+					}
 				}else if(val.goodsState == 'WAIT_PAYMENT'){
 					return '待付款'
 				}else if(val.goodsState == 'WAIT_USE'){
-					return '待使用'
+					if(val.jobFlowMap == 'YPP'){
+						return '出票中'
+					}else{
+						return '待使用'
+					}
 				}else{
 					return ''
 				}

+ 1 - 1
src/views/userManage/memberManage/index.vue

@@ -90,7 +90,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ scope.row.setMealId | filterMeal(that) }}
+          {{ scope.row.setMealCode | filterMeal(that) }}
         </template>
       </el-table-column>
       <el-table-column