订单修复

src/views/order/AddOrder.vue

@@ -813,15 +813,33 @@ export default {
                 let form = res.orderDetails.order;// 基本信息
                 let contract = res.orderDetails.contractInformation ? res.orderDetails.contractInformation : {}; // 合同
                 const { orderOther } = res.orderDetails
-                const productId = orderOther.map(e => e.dataOrCourseId)
+                if (orderOther.find(e => e.authority)) {
                     this.$post(this.api.renew, {
-                    authority: orderOther[0].authority,
+                        authority: 1,
                         customerId: form.customerId,
-                    productId
+                        productId: orderOther.filter(e => e.authority).map(e => e.dataOrCourseId)
                     }).then(res => {
                         const renewList = res.orderOthers
+                        if (orderOther.find(e => !e.authority)) {
+                            this.$post(this.api.renew, {
+                                authority: 0,
+                                customerId: form.customerId,
+                                productId: orderOther.filter(e => !e.authority).map(e => e.dataOrCourseId)
+                            }).then(res => {
+                                renewList.push(...res.orderOthers)
+                                this.setStartDate(renewList, contract, form, orderOther)
+                            }).catch(err => {})
+                        } else {
+                            this.setStartDate(renewList, contract, form, orderOther)
+                        }
+                    }).catch(err => {})
+                }
+            });
+        },
+        setStartDate(renewList, contract, form, orderOther) {
+            console.log(33, renewList, contract, form)
             let list = orderOther.map(e => {
-                        const item = renewList.find(n => n.dataOrCourseId === e.dataOrCourseId)
+                const item = renewList.find(n => n.dataOrCourseId === e.dataOrCourseId && n.authority === e.authority)
                 if (item) {
                     // 处于续费
                     if (this.renewDisabled) {
@@ -844,6 +862,7 @@ export default {
                 }
                 return e;
             });// 俩列表
+
             if (this.renewDisabled) { // 续费状态下，清空上个订单合同信息
                 this.contract = {
                     contractName: "",
@@ -892,9 +911,6 @@ export default {
                     this.getCityData()
                 }
             });
-                }).catch(err => {})
-                
-            });
         },
         // 新增订单
         submitOrder() {
@@ -1102,7 +1118,7 @@ export default {
                 await this.$post(this.api.renew, params).then(res => {
                     this.coursePermissions.map(e => {
                         res.orderOthers.map(el => {
-                            if (el.dataOrCourseId === e.dataOrCourseId) {
+                            if (el.dataOrCourseId === e.dataOrCourseId && el.authority) {
                                 let time = el.endTime.split(" ")[0];
                                 let arr = time.split("-");
                                 e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
@@ -1174,7 +1190,7 @@ export default {
                         dataOrCourseId: e.id,// id
                         productName: e.productName,// 名称
                         periodOfUse: "",// 使用期限
-                        startTime: "",// 开始
+                        startTime: new Date(),// 开始
                         endTime: "", // 终止
                         remainingPeriod: "",// 剩余期限
                         marketValue: e.market,// 市场价
@@ -1214,7 +1230,7 @@ export default {
                 await this.$post(this.api.renew, params).then(res => {
                     this.dataPlatformPermissions.map(e => {
                         res.orderOthers.map(el => {
-                            if (el.dataOrCourseId === e.dataOrCourseId) {
+                            if (el.dataOrCourseId === e.dataOrCourseId && !el.authority) {
                                 let time = el.endTime.split(" ")[0];
                                 let arr = time.split("-");
                                 e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
@@ -1331,10 +1347,12 @@ export default {
                     id: row.dataOrCourseId,
                     startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
                 }).then(res => {
+                    if (res.endTime) {
                         orderRepeat.includes(row.id) && orderRepeat.splice(orderRepeat.findIndex(e => e === row.id), 1)
                         let time = new Date(res.endTime)
                         time = new Date(time.setDate(time.getDate() + 1))
                         row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+                    }
                 }).catch(res => {
                     this.repeatMsg = res.message
                     orderRepeat.includes(row.id) || orderRepeat.push(row.id)