Browse Source

更新报名修改用户

lex 1 year ago
parent
commit
c3cdac72ff

+ 124 - 7
src/views/student-register/index.tsx

@@ -509,6 +509,7 @@ export default defineComponent({
 
       // 判断是否为同一个学校
       if (
+        forms.studentItem.schoolId &&
         forms.studentItem.schoolId !== forms.registerDetails.schoolId &&
         !forms.isChangeSchool &&
         forms.isRegister === 'update'
@@ -637,6 +638,44 @@ export default defineComponent({
       }
     };
 
+    const updateStudentInfo = async () => {
+      try {
+        const { extra, username } = studentInfo;
+        const registerResult = await request.post('/edu-app/student/register', {
+          data: {
+            schoolId: forms.schoolId,
+            clientType: 'STUDENT',
+            ...extra,
+            giftVipDay:
+              forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
+            mobile: username,
+            newRegUser: forms.isRegister === 'create' ? true : false
+          }
+        });
+
+        if (registerResult.code !== 200) {
+          if (registerResult.code === 5436) {
+            forms.showTips = true;
+            forms.showMessage = '二维码已经失效,详情请咨询学校老师';
+            forms.showButton = false;
+          } else if (registerResult.code === 5435) {
+            forms.showTips = true;
+            forms.showMessage = registerResult.message;
+            forms.showButton = true;
+          } else if (registerResult.code === 5437) {
+            forms.showTips = true;
+            forms.showMessage = '团购时间已截止,感谢您的参与'; //result.message;
+            forms.showButton = false;
+          }
+          console.log('-----');
+          return false;
+        } else {
+          console.log('=====');
+          return true;
+        }
+      } catch {}
+    };
+
     // 登记成功之后购买
     const onRegisterSubmit = async () => {
       try {
@@ -650,6 +689,9 @@ export default defineComponent({
 
         // 传统方式
         if (forms.joinType === 'tradition') {
+          const updateStatus = await updateStudentInfo();
+          if (!updateStatus) return;
+
           setTimeout(() => {
             showToast('报名成功');
             // router.push('/download');
@@ -666,9 +708,6 @@ export default defineComponent({
 
         if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
           // forms.dialogConfirmStatus = true;
-
-          // 15907121011
-
           otherParams.showOtherMessage = `该学员已购买会员,是否确认购买?`;
           otherParams.showOtherSchool = true;
           otherParams.showCloseButton = false;
@@ -774,6 +813,8 @@ export default defineComponent({
 
           // 判断是否有完成订单 并且选择 自备
           if (isFinal && forms.joinType === 'tradition') {
+            const studentResult = await updateStudentInfo();
+            if (!studentResult) return;
             setTimeout(() => {
               showToast('您已通过数字化方式报名成功');
             }, 100);
@@ -793,9 +834,9 @@ export default defineComponent({
           }
           if (isPadding && forms.joinType === 'digitalize') {
             // 会选判断逻辑 -
-            await request.get(
-              '/edu-app/userPaymentOrder/registerStatus/' + forms.schoolId
-            );
+            // await request.get(
+            //   '/edu-app/userPaymentOrder/registerStatus/' + forms.schoolId
+            // );
             // const vipList = studentRegisterStore.getVip;
 
             // if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
@@ -805,6 +846,8 @@ export default defineComponent({
             // 最终确认,有待支付订单直接去支付,没有则才会创建订单
             state.config = paddingConfig?.paymentConfig;
             state.orderNo = paddingConfig?.orderNo;
+            const updateStatus = await updateStudentInfo();
+            if (!updateStatus) return;
             await lastSubmit();
             return true;
           }
@@ -872,6 +915,66 @@ export default defineComponent({
           });
         });
         // 创建订单
+        // const { extra, username } = studentInfo;
+        // const result = await request.post('/edu-app/student/register', {
+        //   data: {
+        //     schoolId: forms.schoolId,
+        //     clientType: 'STUDENT',
+        //     ...extra,
+        //     giftVipDay:
+        //       forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
+        //     mobile: username,
+        //     newRegUser: forms.isRegister === 'create' ? true : false,
+        //     orderReq: {
+        //       buryId: forms.saveUserId,
+        //       registerType: forms.registerType,
+        //       paymentType: forms.paymentType,
+        //       bizId: forms.schoolId, // 乐团编号
+        //       orderType: 'SCHOOL_REGISTER',
+        //       paymentCashAmount: calcPrice.value.amount || 0,
+        //       paymentCouponAmount: 0,
+        //       goodsInfos: params,
+        //       orderName: '学生登记',
+        //       orderDesc: '学生登记'
+        //     }
+        //   }
+        // });
+
+        // if (result !== 200) {
+        //   if (result.code === 5436) {
+        //     forms.showTips = true;
+        //     forms.showMessage = '二维码已经失效,详情请咨询学校老师';
+        //     forms.showButton = false;
+        //   } else if (result.code === 5435) {
+        //     forms.showTips = true;
+        //     forms.showMessage = result.message;
+        //     forms.showButton = true;
+        //   } else if (result.code === 5437) {
+        //     forms.showTips = true;
+        //     forms.showMessage = '团购时间已截止,感谢您的参与'; //result.message;
+        //     forms.showButton = false;
+        //   } else if (result.code === 5436) {
+        //     forms.showTips = true;
+        //     forms.showMessage = '二维码已经失效,详情请咨询学校老师';
+        //     forms.showButton = false;
+        //   } else if (result.code === 5435) {
+        //     forms.showTips = true;
+        //     forms.showMessage = result.message;
+        //     forms.showButton = true;
+        //   }
+        // } else {
+        //   console.log(result.data, 1);
+        //   state.config = {
+        //     ...result.data.paymentConfig,
+        //     paymentType: result.data.paymentType
+        //   };
+        //   state.orderNo = result.data.orderNo;
+        //   await lastSubmit();
+        // }
+        const updateStatus = await updateStudentInfo();
+        console.log(updateStatus, 'updateStatus');
+        if (!updateStatus) return;
+
         const result = await request.post(
           '/edu-app/userPaymentOrder/executeOrder',
           {
@@ -1823,6 +1926,9 @@ export default defineComponent({
               const paymentConfig = forms.dialogConfig;
               state.config = paymentConfig?.paymentConfig;
               state.orderNo = paymentConfig?.orderNo;
+
+              const updateStatus = await updateStudentInfo();
+              if (!updateStatus) return;
               await lastSubmit();
             }
           }}
@@ -1898,13 +2004,15 @@ export default defineComponent({
           confirmButtonColor={otherParams.confirmButtonColor}
           confirmButtonText={otherParams.confirmButtonText}
           onClose={() => (otherParams.showOtherSchool = false)}
-          onCancel={() => {
+          onCancel={async () => {
             otherParams.showOtherSchool = false;
             if (otherParams.otherType === 'nickname') {
               forms.isRegister = 'create'; // 新建
               changeTipStatus(false, false);
               onSubmit();
             } else if (otherParams.otherType === 'member') {
+              const updateStatus = await updateStudentInfo();
+              if (!updateStatus) return;
               //取消支付,判断是否有结束时间,是否已经结束
               if (forms.registerExpireTime && forms.activeOverStatus) {
                 applyOver();
@@ -1963,6 +2071,11 @@ export default defineComponent({
                 const firstStudent = val;
                 studentInfo.extra.nickname = firstStudent.nickname;
                 const tempGrade: any = forms.gradeList || [];
+                if (!firstStudent.currentGradeNum) {
+                  studentInfo.extra.currentGradeNum = null;
+                  forms.gradeNumText = '';
+                  forms.instrumentCode = '';
+                }
                 tempGrade?.forEach((i: any) => {
                   if (i.value === firstStudent.currentGradeNum) {
                     forms.instrumentCode = i.instrumentCode;
@@ -1974,6 +2087,10 @@ export default defineComponent({
                     }
                   }
                 });
+                if (!firstStudent.currentClass) {
+                  studentInfo.extra.currentClass = null;
+                  forms.currentClassText = '';
+                }
                 forms.classList.forEach((i: any) => {
                   if (i.value === firstStudent.currentClass) {
                     forms.currentClassText = i.text;

+ 28 - 0
src/views/student-register/register-member/index.tsx

@@ -206,6 +206,33 @@ export default defineComponent({
           forms.showMessage = '报名信息更新,请刷新后重新提交';
           forms.showButton = true;
         } else {
+          const { extra, username } = studentInfo;
+          const registerResult = await request.post(
+            '/edu-app/student/register',
+            {
+              data: {
+                schoolId: forms.schoolId,
+                clientType: 'STUDENT',
+                ...extra,
+                mobile: username,
+                newRegUser: forms.isRegister === 'create' ? true : false
+              }
+            }
+          );
+
+          if (registerResult !== 200) {
+            if (registerResult.code === 5436) {
+              forms.showTips = true;
+              forms.showMessage = '二维码已经失效,详情请咨询学校老师';
+              forms.showButton = false;
+            } else if (registerResult.code === 5435) {
+              forms.showTips = true;
+              forms.showMessage = registerResult.message;
+              forms.showButton = true;
+            }
+            return;
+          }
+
           setTimeout(() => {
             showToast('报名成功');
             // router.push('/download');
@@ -337,6 +364,7 @@ export default defineComponent({
 
       // 判断是否为同一个学校
       if (
+        forms.studentItem.schoolId &&
         forms.studentItem.schoolId !== forms.details.id &&
         !forms.isChangeSchool &&
         forms.isRegister === 'update'

+ 25 - 3
src/views/student-register/register-new/index.tsx

@@ -135,8 +135,7 @@ export default defineComponent({
         currentClass: '',
         gender: 1,
         registerType: '', // 报名类型
-        giftVipDay: 0, // 赠送会员天数
-        clientType: 'TEACHER'
+        giftVipDay: 0 // 赠送会员天数
       },
       grant_type: 'password',
       loginType: 'SMS',
@@ -311,6 +310,7 @@ export default defineComponent({
 
       // 判断是否为同一个学校
       if (
+        forms.studentItem.schoolId &&
         forms.studentItem.schoolId !== forms.details.id &&
         !forms.isChangeSchool &&
         forms.isRegister === 'update'
@@ -378,9 +378,31 @@ export default defineComponent({
           forms.showMessage = '报名信息更新,请刷新后重新提交';
           forms.showButton = true;
         } else {
+          const { extra, username } = studentInfo;
+          const registerResult = await request.post(
+            '/edu-app/student/register',
+            {
+              data: {
+                schoolId: forms.schoolId,
+                clientType: 'STUDENT',
+                ...extra,
+                mobile: username,
+                newRegUser: forms.isRegister === 'create' ? true : false
+              }
+            }
+          );
+
+          if (registerResult !== 200) {
+            if (result.code === 5435 || result.code === 5436) {
+              forms.showTips = true;
+              forms.showMessage = '报名信息更新,请刷新后重新提交';
+              forms.showButton = true;
+            }
+            return;
+          }
+
           setTimeout(() => {
             showToast('报名成功');
-            // router.push('/download');
           }, 100);
           setTimeout(() => {
             if (browser().weixin) {