Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/user.go

@@ -1201,13 +1201,14 @@ func (this *UserController) ApplyTryOut() {
 		}
 	} else {
 		//获取销售信息
-		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		//sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 1)
+		ficcCount, err := models.GetCompanyProductCount(user.CompanyId, utils.COMPANY_PRODUCT_FICC_ID)
+		if err != nil {
 			br.Msg = "申请失败"
 			br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
 			return
 		}
-		if sellerItem != nil {
+		if ficcCount > 0 {
 			CompanyIdType = 3
 			applyMethod = "FICC客户"
 		} else {
@@ -1920,9 +1921,13 @@ func (this *UserController) ApplyDetail() {
 	}
 	switch detail.RegisterPlatform {
 	case 1:
-		detail.ApplicationSource = "小程序"
+		detail.ApplicationSource = "查研观向小程序"
 	case 2:
-		detail.ApplicationSource = "网页版"
+		detail.ApplicationSource = "查研观向网页版"
+	case 5:
+		detail.ApplicationSource = "买方研选小程序"
+	case 6:
+		detail.ApplicationSource = "买方研选网页版"
 	}
 
 	switch detail.InviteCompanySource {

services/wx_category_template_msg.go

@@ -85,15 +85,14 @@ func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, com
 			err = errors.New("GetCompanyProductCount, Err: " + e.Error())
 			return
 		}
-		if raiCount == 0 {
-			return
-		}
-		sealldetail, e := models.GetRaiSellerByCompanyId(companyId)
-		if e != nil {
-			err = errors.New("GetRaiSellerByCompanyId, Err: " + e.Error())
-			return
+		if raiCount > 0 {
+			sealldetail, e := models.GetRaiSellerByCompanyId(companyId)
+			if e != nil {
+				err = errors.New("GetRaiSellerByCompanyId, Err: " + e.Error())
+				return
+			}
+			mobileOpneid = sealldetail.Mobile
 		}
-		mobileOpneid = sealldetail.Mobile
 	}
 
 	openIdList, e := models.GetMfyxWxOpenIdByMobileList(mobileOpneid)