浏览代码

需求优化

gmy 5 月之前
父节点
当前提交
e597ef7a7b
共有 1 个文件被更改,包括 63 次插入61 次删除
  1. 63 61
      controllers/eta_trial.go

+ 63 - 61
controllers/eta_trial.go

@@ -443,8 +443,8 @@ func (this *ETATrialController) ApplyEnable() {
 		return
 	}
 
-	var req eta_trial.ETAAddEnableReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	var reqList []eta_trial.ETAAddEnableReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqList)
 	if err != nil {
 		br.Msg = "参数解析异常!"
 		br.ErrMsg = "参数解析失败,Err:" + err.Error()
@@ -457,72 +457,74 @@ func (this *ETATrialController) ApplyEnable() {
 		return
 	}
 
-	approval, err := eta_trial.GetETATrialApprovalByMobile(req.Mobile)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败!"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		return
-	}
-
-	var approvalId int64
-	if approval != nil && (approval.ApprovalStatus == "驳回" || approval.ApprovalStatus == "已撤回") && req.Mobile == approval.Mobile {
-		//若是被驳回或撤回后申请且手机号相同的,更新审批记录
-		err = eta_trial.ResubmitTrial(approval.ApprovalId, req.ApplyReasons)
-		if err != nil {
-			br.Msg = "更新失败!"
-			br.ErrMsg = "更新失败,Err:" + err.Error()
+	for _, req := range reqList {
+		approval, err := eta_trial.GetETATrialApprovalByMobile(req.Mobile)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败!"
+			br.ErrMsg = "获取失败,Err:" + err.Error()
 			return
 		}
-		approvalId = int64(approval.ApprovalId)
-	} else if approval != nil && approval.ApprovalStatus == "待审批" && approval.ApprovalContent == "申请启用" {
-		br.Msg = "该客户已在审批中!"
-		br.ErrMsg = "该客户已在审批中!"
-		return
-	} else {
-		//加入审批列表
-		approvalItem := eta_trial.EtaTrialApproval{
-			UserName:        req.UserName,
-			CompanyName:     req.CompanyName,
-			Position:        req.Position,
-			Mobile:          req.Mobile,
-			SellerId:        seller.AdminId,
-			Seller:          seller.RealName,
-			CreateTime:      time.Now(),
-			ModifyTime:      time.Now(),
-			ApprovalContent: "申请启用",
-			ApplyMethod:     2,
-			ApprovalStatus:  "待审批",
-			ApplyReasons:    req.ApplyReasons,
-		}
 
-		approvalId, e = eta_trial.AddETATrialApproval(&approvalItem)
-		if e != nil {
-			err = e
+		var approvalId int64
+		if approval != nil && (approval.ApprovalStatus == "驳回" || approval.ApprovalStatus == "已撤回") && req.Mobile == approval.Mobile {
+			//若是被驳回或撤回后申请且手机号相同的,更新审批记录
+			err = eta_trial.ResubmitTrial(approval.ApprovalId, req.ApplyReasons)
+			if err != nil {
+				br.Msg = "更新失败!"
+				br.ErrMsg = "更新失败,Err:" + err.Error()
+				return
+			}
+			approvalId = int64(approval.ApprovalId)
+		} else if approval != nil && approval.ApprovalStatus == "待审批" && approval.ApprovalContent == "申请启用" {
+			br.Msg = "该客户已在审批中!"
+			br.ErrMsg = "该客户已在审批中!"
 			return
+		} else {
+			//加入审批列表
+			approvalItem := eta_trial.EtaTrialApproval{
+				UserName:        req.UserName,
+				CompanyName:     req.CompanyName,
+				Position:        req.Position,
+				Mobile:          req.Mobile,
+				SellerId:        seller.AdminId,
+				Seller:          seller.RealName,
+				CreateTime:      time.Now(),
+				ModifyTime:      time.Now(),
+				ApprovalContent: "申请启用",
+				ApplyMethod:     2,
+				ApprovalStatus:  "待审批",
+				ApplyReasons:    req.ApplyReasons,
+			}
+
+			approvalId, e = eta_trial.AddETATrialApproval(&approvalItem)
+			if e != nil {
+				err = e
+				return
+			}
 		}
-	}
 
-	//新增待办消息
-	msgItem := new(company.CompanyApprovalMessage)
-	msgItem.CreateUserId = sysUser.AdminId
-	msgItem.ReceiveUserId = -1
-	msgItem.MessageStatus = 1 // 已读, 不再亮红点, 但是消息要有
-	msgItem.Remark = seller.RealName + "申请账号启用"
-	msgItem.Content = seller.RealName + "申请账号启用"
-	msgItem.CompanyName = req.CompanyName
-	msgItem.CreateTime = time.Now()
-	msgItem.ModifyTime = time.Now()
-	msgItem.CompanyApprovalId = int(approvalId)
-	msgItem.OperationStatus = 1
-	msgItem.MessageType = 1    //1:申请消息,2:审批结果,3:文字消息
-	msgItem.SourceType = 9     //消息来源
-	msgItem.ApprovalStatus = 1 //审批状态,1:待审批,2:已审批,3:已驳回
-	err = company.AddCompanyApprovalMessage(msgItem)
+		//新增待办消息
+		msgItem := new(company.CompanyApprovalMessage)
+		msgItem.CreateUserId = sysUser.AdminId
+		msgItem.ReceiveUserId = -1
+		msgItem.MessageStatus = 1 // 已读, 不再亮红点, 但是消息要有
+		msgItem.Remark = seller.RealName + "申请账号启用"
+		msgItem.Content = seller.RealName + "申请账号启用"
+		msgItem.CompanyName = req.CompanyName
+		msgItem.CreateTime = time.Now()
+		msgItem.ModifyTime = time.Now()
+		msgItem.CompanyApprovalId = int(approvalId)
+		msgItem.OperationStatus = 1
+		msgItem.MessageType = 1    //1:申请消息,2:审批结果,3:文字消息
+		msgItem.SourceType = 9     //消息来源
+		msgItem.ApprovalStatus = 1 //审批状态,1:待审批,2:已审批,3:已驳回
+		err = company.AddCompanyApprovalMessage(msgItem)
 
-	// 2023-08-01默认审批通过, 不再进行人工审批
-	go func() {
-		_ = services.ApprovalApply(int(approvalId))
-	}()
+		// 2023-08-01默认审批通过, 不再进行人工审批
+		go func() {
+			_ = services.ApprovalApply(int(approvalId))
+		}()
+	}
 
 	br.Ret = 200
 	br.Success = true