no message

controllers/company_seller.go

@@ -7664,7 +7664,7 @@ func (this *CompanySellerController) ActivityFiccList() {
 		utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_DEPARTMENT, utils.ROLE_TYPE_CODE_FICC_GROUP,
 		utils.ROLE_TYPE_CODE_FICC_TEAM, utils.ROLE_TYPE_CODE_FICC_SELLER,
 	}
-	cond := fmt.Sprintf(` AND role_type_code IN (%s) AND enabled = 1`, utils.GetOrmInReplace(len(roleArr)))
+	cond := fmt.Sprintf(` AND role_type_code IN (%s) AND enabled = 1 `, utils.GetOrmInReplace(len(roleArr)))
 	pars := make([]interface{}, 0)
 	pars = append(pars, roleArr)
 	sellers, e := system.GetSysUserItemsOrderByCreated(cond, pars)

controllers/roadshow/activity.go

@@ -101,6 +101,14 @@ func (this *ActivityController) Add() {
 	startDateTime := req.StartDate + " " + req.StartTime
 	endDateTime := req.EndDate + " " + req.EndTime
 
+	startP, _ := time.ParseInLocation(utils.FormatDateTime, startDateTime, time.Local)
+	endP, _ := time.ParseInLocation(utils.FormatDateTime, endDateTime, time.Local)
+
+	if endP.Before(startP) {
+		br.Msg = "结束时间不得早于开始时间！"
+		return
+	}
+
 	sellerList, err := system.GetSysAdminByIds(req.SellerId)
 	if err != nil {
 		br.Msg = "保存失败！"
@@ -177,7 +185,7 @@ func (this *ActivityController) Add() {
 		}
 		openIdList = append(openIdList, openIdObj)
 	}
-	go services.SendWxMsgWithRoadshowSellerActivity(req.CompanyName, "参会", "已添加", time.Now().Format(utils.FormatDateTime), openIdList, int(rsActivityId))
+	go services.SendWxMsgWithRoadshowSellerActivity(req.CompanyName, rsActivity.ActivityType, "已添加", time.Now().Format(utils.FormatDateTime), openIdList, int(rsActivityId))
 
 	br.Ret = 200
 	br.Success = true

controllers/roadshow/calendar.go

@@ -1315,6 +1315,7 @@ func (this *CalendarController) CalendarList() {
 				item.Theme = v.Theme
 				item.CreateTime = v.CreateTime
 				item.SysUserRealName = v.SysUserRealName
+				item.EnglishCompany = v.EnglishCompany
 				resp.List = append(resp.List, item)
 			}
 		} else {

models/roadshow/activity.go

@@ -105,6 +105,7 @@ type RsActivitySellerResp struct {
 	CreateTime         string `description:"创建时间"`
 	SysUserRealName    string `description:"创建人名称"`
 	RoadshowType       string `description:"路演形式"`
+	EnglishCompany     int    `description:"是否为英文客户: 0-否; 1-是"`
 }
 
 type RsActivitySellerListResp struct {
@@ -119,6 +120,7 @@ func GetRsActivitySellerList(condition string, pars []interface{}, startSize, pa
 			b.theme,
 			b.activity_type,
 			b.company_id,
+			b.english_company,
 			b.company_name 
 		FROM
 			rs_activity_seller AS a

models/roadshow/company.go

@@ -64,10 +64,10 @@ func CompanySearchV2(sellerId, groupId int, keyWord, roleTypeCode string) (list
 			     1=1 
 			     AND IF  ( b.product_id = 1 , b.status IN ('正式', '试用', '永续') ,1=1 )  
 			     AND IF  ( b.product_id = 2 , b.status IN ('正式', '试用', '永续', '冻结', '流失') ,1=1 )  
-				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
+				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND ( a.company_name LIKE ?  OR a.credit_code LIKE  ? )
 			GROUP BY
 				b.company_id `
-		_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord).QueryRows(&companies)
+		_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord, keyWord).QueryRows(&companies)
 		if err != nil {
 			return
 		}