Merge branch 'bugfix_8/25' into debug

# Conflicts:
#	models/wx_user.go

models/wx_user.go

@@ -36,6 +36,7 @@ type WxUser struct {
 	FiccLastViewTime    string    `description:"ficc报告最近一次阅读时间"`
 	RaiViewTotal        int       `description:"权益报告的阅读次数"`
 	RaiLastViewTime     string    `description:"权益报告的最近一次阅读时间"`
+	MarkGroup           string    `description:"标记分组"`
 }
 
 func AddWxUser(item *WxUser) (lastId int64, err error) {

models/yb/apply_record.go

@@ -158,7 +158,7 @@ SELECT
 	y.is_move,
 	y.source,
 	y.from_page,
-	y.mark_group,
+	IF(y.mark_group = '' OR y.mark_group IS NULL, a.mark_group, y.mark_group) AS mark_group,
     y.company_name as user_company_name
     #bp.seller_id,
 	#bp.seller_name

services/yb/apply_record.go

@@ -319,9 +319,10 @@ func MarkGroupApplyRecord(applyRecordId, adminId, userId int, groupName string)
 	// 未处理过则进行标记
 	if wxUser.IsDeal == 0 {
 		wxUser.IsDeal = 1
+		wxUser.MarkGroup = groupName
 		wxUser.LastUpdatedTime = time.Now()
 		userUpdateCols := make([]string, 0)
-		userUpdateCols = append(userUpdateCols, "IsDeal", "LastUpdatedTime")
+		userUpdateCols = append(userUpdateCols, "IsDeal", "MarkGroup", "LastUpdatedTime")
 		err = wxUser.Update(userUpdateCols)
 		if err != nil {
 			err = errors.New(fmt.Sprint("对应用户信息标记失败", err))