wip:问题修改提交

run/flushDb/pdfFlushPower/config.yaml

@@ -1,6 +1,7 @@
 database:
   default:
-    link: "mysql:readuser:jyTi_R202403@tcp(192.168.3.71:4003)/jianyu"
+    #link: "mysql:readuser:jyTi_R202403@tcp(192.168.3.71:4003)/jianyu"
+    link: "mysql:root:=PDT49#80Z!RVv52_z@tcp(192.168.3.217:4000)/jianyu"
     debug: true
   jy_user_center:
     link: "mysql:root:=PDT49#80Z!RVv52_z@tcp(192.168.3.217:4000)/jy_user_center"
@@ -11,8 +12,8 @@ logger:
   path: "logs" # 日志文件路径。默认为空，表示关闭，仅输出到终端
   file: "{Y-m-d}.log" # 日志文件格式。默认为"{Y-m-d}.log"
 
-flushEndTime: "2025-08-01"
-flushCreateTime: "2024-08-01 00:00:01"
+flushEndTime: "2025-07-23"
+flushCreateTime: "2024-07-23 00:00:01" #流水生成时间
 #查询企业权限
 #entListQuery: "SELECT DISTINCT(ent_id) as entId FROM entniche_wait_empower WHERE end_time > ? and ent_id =25879"
 entListQuery: "SELECT DISTINCT(ent_id) as entId FROM entniche_wait_empower WHERE end_time > ? and ent_id >0 and product_type like '%大会员%'"
@@ -26,4 +27,4 @@ entUserDetailQuery: "select h.product_type,a.id,a.wait_empower_id,c.phone from e
 		where a.status = 1 and a.ent_id = ?  and wait_empower_id= ? and h.end_time >= ?"
 queryPosId: "SELECT b.id as positionId,u.phone  FROM base_service.base_user u INNER JOIN base_service.base_position b on(u.id=b.user_id  AND b.ent_id = ? AND u.phone in ('%s'))"
 
-personalQuery: "SELECT user_id,filter,vip_endtime,order_code FROM dataexport_order WHERE product_type='大会员' AND vip_starttime < '2099-01-01 00:00:00' AND vip_endtime>? AND buy_subject!=2 AND order_status=1 AND filter like '%comboId%'"
+personalQuery: "SELECT user_id,filter,vip_endtime,order_code,buy_count FROM dataexport_order WHERE product_type='大会员' AND vip_starttime < '2099-01-01 00:00:00' AND vip_endtime>? AND buy_subject!=2 AND order_status=1 AND filter like '%comboId%'"

run/flushDb/pdfFlushPower/flushEnt.go

@@ -264,11 +264,11 @@ func (p *packNum) InsertDb(companyId, endTime string, positionId ...string) erro
 				balance = append(balance, t2)
 			}
 
-			res_1, err_1 := tx.Insert("account_resources_tmp", balance, 10)
+			res_1, err_1 := tx.Insert("account_resources", balance, 10)
 			if err_1 != nil {
 				return err_1
 			}
-			res_2, err_2 := tx.Insert("consume_record_tmp", sources, 10)
+			res_2, err_2 := tx.Insert("consume_record", sources, 10)
 			if err_2 != nil {
 				return err_2
 			}
@@ -285,12 +285,12 @@ func (p *packNum) InsertDb(companyId, endTime string, positionId ...string) erro
 			}
 		}
 		if p.EntNum > 0 {
-			if err := insert("企业中标分析报告下载包", p.BuyNum); err != nil {
+			if err := insert("企业中标分析报告下载包", p.EntNum); err != nil {
 				return err
 			}
 		}
 		if p.MarketNum > 0 {
-			if err := insert("市场分析定制报告下载包", p.BuyNum); err != nil {
+			if err := insert("市场分析定制报告下载包", p.MarketNum); err != nil {
 				return err
 			}
 		}

run/flushDb/pdfFlushPower/flushPersonal.go

@@ -19,11 +19,11 @@ func flushPersonal(ctx context.Context) error {
 			g.Log().Infof(ctx, "个人数据进度【%d/%d】", i, len(personalList.List()))
 		}
 		var (
-			userId      = gconv.String(m["user_id"])
-			filterMap   = gconv.Map(m["filter"])
-			vip_endtime = gconv.String(m["vip_endtime"])
-			order_code  = gconv.String(m["order_code"])
-			companyId   string
+			userId             = gconv.String(m["user_id"])
+			filterMap          = gconv.Map(m["filter"])
+			vip_endtime        = gconv.String(m["vip_endtime"])
+			order_code         = gconv.String(m["order_code"])
+			finalUserId string = userId
 		)
 		pack, err := getPersonalPackNum(filterMap, vip_endtime)
 		if err != nil {
@@ -38,10 +38,10 @@ func flushPersonal(ctx context.Context) error {
 			eTime = arr[0]
 		}
 
-		if gconv.Int(m["pay_sub_num"]) > 0 { //个人版主张号共享额度
-			companyId = fmt.Sprintf("p_share_%s", userId)
+		if gconv.Int(m["buy_count"]) > 0 { //个人版主张号共享额度
+			finalUserId = fmt.Sprintf("p_share_%s", userId)
 		}
-		if err := pack.InsertDb(companyId, eTime, userId); err != nil {
+		if err := pack.InsertDb("", eTime, finalUserId); err != nil {
 			g.Log().Errorf(ctx, "flushPersonal插入权益包异常%s %s %v", userId, order_code, err)
 		}
 	}