Merge branch 'dev/1.0.2_fu' of jianyu/personnelBehavior into feature/v1.0.2

internal/common/common.go

@@ -38,10 +38,10 @@ var (
 								refer  Nullable(String) DEFAULT NULL COMMENT '跳转前页面',
 								search_word  Nullable(String) DEFAULT NULL COMMENT '搜索词',
 								filter  Nullable(String) DEFAULT NULL COMMENT '搜索条件字段'
-								breakData  Nullable(String) DEFAULT NULL  COMMENT '额外数据',
-								appId  Nullable(String) DEFAULT NULL COMMENT 'appid',
-								appVersion  Nullable(String) DEFAULT NULL COMMENT '版本号',
-								miniProgramCode  Nullable(String) DEFAULT NULL COMMENT '来源';
+								break_data  Nullable(String) DEFAULT NULL  COMMENT '额外数据',
+								app_id  Nullable(String) DEFAULT NULL COMMENT 'appid',
+								app_version  Nullable(String) DEFAULT NULL COMMENT '版本号',
+								mini_program_code  Nullable(String) DEFAULT NULL COMMENT '来源';
 							)
 							ENGINE = MergeTree
 							ORDER BY date

internal/controller/personnel/personnel.go

@@ -38,10 +38,9 @@ func (p *personnel) Statistics(ctx context.Context, req *v1.PersonnelInsertReq)
 	in.Desc = common.If(req.Desc == "undefined", "", req.Desc).(string)
 	in.Source = common.If(req.Source == "undefined", "", req.Source).(string)
 	in.Url = common.If(req.Url == "undefined", "", req.Url).(string)
-	in.AppId = common.If(req.Url == "appId", "", req.AppId).(string)
-	in.BreakData = common.If(req.Url == "breakData", "", req.BreakData).(string)
-	in.AppVersion = common.If(req.Url == "appVersion", "", req.AppVersion).(string)
-	in.MiniProgramCode = common.If(req.Url == "miniProgramCode", "", req.MiniProgramCode).(string)
+	in.AppId = common.If(req.AppId == "undefined", "", req.AppId).(string)
+	in.BreakData = common.If(req.BreakData == "undefined", "", req.BreakData).(string)
+	in.AppVersion = common.If(req.AppVersion == "undefined", "", req.AppVersion).(string)
 
 	sessionGet, err := model.UserSessionCtx.Get(ctx)
 	if err == nil {
@@ -75,8 +74,9 @@ func (p *personnel) Statistics(ctx context.Context, req *v1.PersonnelInsertReq)
 	//A24112  新增字段
 	in.Port = utils.GetUserPort(r)                             // 行为端口 wx,Android,ios,pc,h5
 	in.Refer = g.RequestFromCtx(ctx).GetHeader("pageReferrer") // 跳转前页面
-	in.SearchWord = req.SearchWord                             // 搜索词
-	in.Filter = req.Filter                                     // 搜索条件
+	in.MiniProgramCode = g.RequestFromCtx(ctx).GetHeader("miniProgramCode")
+	in.SearchWord = req.SearchWord // 搜索词
+	in.Filter = req.Filter         // 搜索条件
 	err = service.Personnel().BatchInsertRecords(ctx, &in)
 	if err != nil {
 		res.Msg = err.Error()

internal/dao/internal/personnel.go

@@ -89,44 +89,44 @@ func (dao *PersonnelDao) BatchExecInsert(ctx context.Context, in []*model.Person
 			payTime, _ = time.Parse(date.Date_Full_Layout, i.PayTime)
 		}
 		insertData = append(insertData, g.Map{
-			"jy_trusted_id":   i.JYTrustedId,
-			"user_id":         i.UserId,
-			"position_id":     i.PositionId,
-			"phone":           i.Phone,
-			"ip":              i.Ip,
-			"platform":        i.Platform,
-			"os":              i.Os,
-			"os_version":      i.OsVersion,
-			"browser":         i.Browser,
-			"browser_version": i.BrowserVersion,
-			"date":            timeNow,
-			"action_id":       i.ActionId,
-			"action_type":     i.ActionType,
-			"breaker_id":      i.BreakerId,
-			"breaker_name":    i.BreakerName,
-			"click_time":      clickTime,
-			"order_id":        i.OrderId,
-			"order_time":      orderTIme,
-			"pay_time":        payTime,
-			"pay_way":         i.PayWay,
-			"price":           int32(i.Price),
-			"product":         i.Product,
-			"product_name":    i.ProductName,
-			"page_id":         i.PageId,
-			"page_name":       i.PageName,
-			"bidding_id":      i.BiddingId,
-			"desc":            i.Desc,
-			"url":             i.Url,
-			"source":          i.Source,
-			"user_agent":      i.UserAgent,
-			"port":            i.Port,
-			"refer":           i.Refer,
-			"search_word":     i.SearchWord,
-			"filter":          i.Filter,
-			"appId":           i.AppId,
-			"breakData":       i.BreakData,
-			"appVersion":      i.AppVersion,
-			"miniProgramCode": i.MiniProgramCode,
+			"jy_trusted_id":     i.JYTrustedId,
+			"user_id":           i.UserId,
+			"position_id":       i.PositionId,
+			"phone":             i.Phone,
+			"ip":                i.Ip,
+			"platform":          i.Platform,
+			"os":                i.Os,
+			"os_version":        i.OsVersion,
+			"browser":           i.Browser,
+			"browser_version":   i.BrowserVersion,
+			"date":              timeNow,
+			"action_id":         i.ActionId,
+			"action_type":       i.ActionType,
+			"breaker_id":        i.BreakerId,
+			"breaker_name":      i.BreakerName,
+			"click_time":        clickTime,
+			"order_id":          i.OrderId,
+			"order_time":        orderTIme,
+			"pay_time":          payTime,
+			"pay_way":           i.PayWay,
+			"price":             int32(i.Price),
+			"product":           i.Product,
+			"product_name":      i.ProductName,
+			"page_id":           i.PageId,
+			"page_name":         i.PageName,
+			"bidding_id":        i.BiddingId,
+			"desc":              i.Desc,
+			"url":               i.Url,
+			"source":            i.Source,
+			"user_agent":        i.UserAgent,
+			"port":              i.Port,
+			"refer":             i.Refer,
+			"search_word":       i.SearchWord,
+			"filter":            i.Filter,
+			"app_id":            i.AppId,
+			"break_data":        i.BreakData,
+			"app_version":       i.AppVersion,
+			"mini_program_code": i.MiniProgramCode,
 		})
 	}
 	_, err = g.DB().Model(dao.Model()).Data(insertData).Insert()
@@ -148,7 +148,7 @@ func (dao *PersonnelDao) ExecInsert(ctx context.Context, in model.PersonnelInser
 	dimSqlDML.WriteString(" (jy_trusted_id,user_id,position_id,phone,ip,platform,os,os_version,browser," +
 		"browser_version,date,action_id,action_type,breaker_id,breaker_name,click_time,order_id," +
 		"order_time,pay_time,pay_way,price,product,product_name,page_id,page_name,bidding_id,desc," +
-		"url,source,user_agent,port,refer,search_word,filter,appId,breakData,appVersion,miniProgramCode) values ( ")
+		"url,source,user_agent,port,refer,search_word,filter,appId,break_data,app_version,mini_program_code) values ( ")
 	dimSqlDML.WriteString("'" + in.JYTrustedId + "'")
 	dimSqlDML.WriteString(",")
 	dimSqlDML.WriteString("'" + in.UserId + "'")

test.http

@@ -1,4 +1,4 @@
-POST http://127.0.0.1:7072/personnel/statistics
+POST  https://jybx2-webtest.jydev.jianyu360.com/personnel/statistics
 Content-Type: application/json
 Apikey: HhYvHgAGQV9fWxEDLw8HFw==
 pageReferrer: 1111