Merge branch 'crm_15.7' into debug

controller/public.go

@@ -522,7 +522,22 @@ func BannerHistoryList(c *gin.Context) {
 // @Failure 400 {string} string 请输入邮箱地址
 // @Router /banner/get_qrcode [get]
 func BannerGetQRCode(c *gin.Context) {
-	inviteCode := c.Query("InviteCode")
+	userId, _ := strconv.Atoi(c.Query("userId"))
+	wxUserInfo, err := wx_user.GetByUserId(userId)
+	if err != nil {
+		return
+	}
+	companyInfo, tmpErr := company.GetByCompanyId(wxUserInfo.CompanyID)
+	if tmpErr != nil {
+		err = tmpErr
+		if tmpErr == utils.ErrNoRow {
+			err = errors.New("找不到该客户")
+			return
+		}
+		return
+	}
+	companyName := companyInfo.CompanyName
+
 	userInfo := user.GetInfoByClaims(c)
 	userDetail, err, errMsg := userLogic.GetUserInfo(userInfo)
 	if err != nil {
@@ -533,10 +548,10 @@ func BannerGetQRCode(c *gin.Context) {
 		return
 	}
 	randStr := utils.GetRandStringNoSpecialChar(28)
-	filePath :=  "./static/" + randStr + ".png"
-	fileName :=  randStr + ".png"
-	url := "pages-report/signUpPage/signUpPage&RealName?%s&CompanyName?%s&Mobile?%sBannerId?%s&InviteCode?%s"
-	url = fmt.Sprintf(url, userDetail.RealName, userDetail.CompanyName, userDetail.Mobile, inviteCode)
+	filePath := "./static/" + randStr + ".png"
+	fileName := randStr + ".png"
+	url := "pages-report/signUpPage/signUpPage&RealName?%s&CompanyName?%s&Mobile?%sBannerId?%s"
+	url = fmt.Sprintf(url, wxUserInfo.RealName, companyName, userDetail.Mobile)
 
 	err = qrcode.WriteFile(url, qrcode.Medium, 256, filePath)
 	if err != nil {
@@ -556,7 +571,6 @@ func BannerGetQRCode(c *gin.Context) {
 	response.OkData("获取成功", resourceUrl, c)
 }
 
-
 // ResearchSignUp 报名
 // @Tags 公共模块
 // @Summary  banner图列表
@@ -573,7 +587,7 @@ func ResearchSignUp(c *gin.Context) {
 	realName := c.Query("RealName")
 	companyName := c.Query("CompanyName")
 	mobile := c.Query("Mobile")
-	bannerId,_ := strconv.Atoi(c.Query("BannerId"))
+	bannerId, _ := strconv.Atoi(c.Query("BannerId"))
 	customName := c.Query("CustomName")
 	customMobile := c.Query("CustomMobile")
 	customCompanyName := c.Query("CustomCompanyName")
@@ -587,14 +601,14 @@ func ResearchSignUp(c *gin.Context) {
 	//	return
 	//}
 	ob := &yb_research_signup_statistics.YbResearchSignupStatistics{
-		Mobile:                       mobile,
-		CustomCompanyName:            customCompanyName,
-		CompanyName:                  companyName,
-		BannerId:                     bannerId,
-		CustomName:                   customName,
-		RealName:                     realName,
-		CustomMobile:                 customMobile,
-		CreateTime:                   time.Now(),
+		Mobile:            mobile,
+		CustomCompanyName: customCompanyName,
+		CompanyName:       companyName,
+		BannerId:          bannerId,
+		CustomName:        customName,
+		RealName:          realName,
+		CustomMobile:      customMobile,
+		CreateTime:        time.Now(),
 	}
 	err := ob.Create()
 	if err != nil {
@@ -603,4 +617,4 @@ func ResearchSignUp(c *gin.Context) {
 	}
 
 	response.Ok("报名成功", c)
-}
+}