fix

controllers/company_share.go

@@ -738,7 +738,7 @@ func (this *CompanyController) CompanyShareAddRemark() {
 // CompanyShareMark
 // @Title 新增客户标记
 // @Description 新增客户标记
-// @Param	request	body company.RemarkReq true "type json string"
+// @Param	request	body company.CompanyMarkReq true "type json string"
 // @Success 200 编辑成功
 // @router /share/mark [post]
 func (this *CompanyController) CompanyShareMark() {

controllers/official_user.go

@@ -71,15 +71,15 @@ func (this *OfficialUserController) OfficialUserList() {
 		condition += ` and (company_name LIKE '%` + keyWord + `%' OR phone LIKE '%` + keyWord + `%' OR email LIKE '%` + keyWord + `%' OR real_name LIKE '%` + keyWord + `%') `
 	}
 	if markGroup != "" {
-		condition += `AND mark_group = ` + markGroup
+		condition += `AND mark_group = `+"'"+markGroup+"'"
 	}
 	if startDate != "" {
 		startDate += " 00:00:00"
-		condition += ` AND y.create_time >= '` + startDate + `' `
+		condition += ` AND create_time >= '` + startDate + `' `
 	}
 	if endDate != "" {
 		endDate += " 23:59:59"
-		condition += ` AND y.create_time <= '` + endDate + `' `
+		condition += ` AND create_time <= '` + endDate + `' `
 	}
 
 	//获取总数据数
@@ -295,3 +295,51 @@ func (this *OfficialUserController) OfficialUserListExport() {
 	br.Success = true
 	br.Msg = "导出成功"
 }
+
+// @Title 官网试用用户确认
+// @Description 官网试用用户确认接口
+// @Param   Id   query   int  true       "申请记录id"
+// @Success Ret=200 确认成功
+// @router /official/user/mark_group [post]
+func (this *OfficialUserController) OfficialUserMarkGroup() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	//参数拼接
+	var req models.UserTrialApplyMarkGroupReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	id := req.Id
+
+	//查询记录信息，并做初步判断
+	info, err := models.GetOfficialApplyUserById(id)
+	if err != nil && err.Error() == utils.ErrNoRow() {
+		br.Msg = "确认失败"
+		br.ErrMsg = "确认失败，记录异常"
+		return
+	}
+	if info.Status != "待处理" {
+		br.Msg = "确认失败"
+		br.ErrMsg = "确认失败，当前记录状态信息异常，请刷新页面"
+		return
+	}
+	err = models.OfficialApplyUserMarkGroup(id, sysUser.AdminId, sysUser.RealName, req.GroupName)
+	if err != nil {
+		br.Msg = "确认失败"
+		br.ErrMsg = "确认失败，Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "标记成功"
+	//br.Data = resp
+}

models/company/company_product.go

@@ -379,7 +379,7 @@ func GetRemarkListByCompanyId(CompanyId string) (items []*CompanyProductRemark,
 // 更新备注标记
 func UpdateCompanyProductRemark(remarkId, mark int) (err error) {
 	o := orm.NewOrm()
-	sql := `UPDATE company_product_remark SET mark=? AND modify_time=NOW() WHERE company_product_remark_id=? `
+	sql := `UPDATE company_product_remark SET mark=? WHERE company_product_remark_id=? `
 	_, err = o.Raw(sql, mark, remarkId).Exec()
 	return
 }

models/user_trial_apply.go

@@ -115,3 +115,22 @@ func ConfirmOfficialApplyUser(id int, opUserId int, opUserName string) (err erro
 	_, err = orm.NewOrm().Raw(sql, "已处理", opUserId, opUserName, time.Now(), id).Exec()
 	return
 }
+
+type UserTrialApplyMarkGroupReq struct {
+	Id        int    `description:"申请记录ID"`
+	GroupName string `description:"分组名"`
+}
+
+// 标记分组
+func OfficialApplyUserMarkGroup(id int, opUserId int, opUserName,groupName string) (err error) {
+	sql := ` UPDATE user_trial_apply
+			SET
+			  status = ?,
+			  op_user_id = ?,
+			  op_user_name = ?,
+			  mark_group = ?,
+			  modify_time = ?
+			WHERE id = ? `
+	_, err = orm.NewOrm().Raw(sql, "已处理", opUserId, opUserName, groupName, time.Now(), id).Exec()
+	return
+}

routers/commentsRouter.go

@@ -9340,6 +9340,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:OfficialUserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:OfficialUserController"],
+        beego.ControllerComments{
+            Method: "OfficialUserMarkGroup",
+            Router: `/official/user/mark_group`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:PdfToImgCommonController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:PdfToImgCommonController"],
         beego.ControllerComments{
             Method: "PdfToImgConvert",