Merge remote-tracking branch 'origin/feature/v4.10.2' into feature/v4.10.2

src/jfw/modules/bigmember/src/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20250507035343-3c1137179fde
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.33.12
+	app.yhyue.com/moapp/jypkg v1.33.13
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/donnie4w/go-logger v0.0.0-20230316073421-36a48f87a69a

src/jfw/modules/bigmember/src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250507035343-3c1137179fde/go.mod h1:OEtMbsn7
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.33.12 h1:EZq2so8acvizZ7thq99ClBdn/SgVoRaXzyeJ/+LAcCE=
-app.yhyue.com/moapp/jypkg v1.33.12/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.13 h1:uym9U+WjiOzZ/U03bjTxiwuMmggFfbodgMmNA4Qfyds=
+app.yhyue.com/moapp/jypkg v1.33.13/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

src/jfw/modules/bigmember/src/service/follow/projectPdf.go

@@ -186,7 +186,7 @@ func getPdfPageApi(pid string) (finalDate map[string]interface{}, err error) {
 				if err != nil {
 					log.Println(_id, "从oss代理服务获取正文出错", err)
 				} else if ossResult != nil {
-					m["detail"] = ossResult.Data.(string)
+					detailMap[_id], _ = ossResult.Data.(string)
 				}
 			}
 		}

src/jfw/modules/subscribepay/src/entity/dataReportStruct.go

@@ -49,13 +49,7 @@ func (this *dataReportStruct) PayCallBack(param *CallBackParam) (update bool) {
 					return false
 				}
 				service_starttime := now.Format(time.DateTime)
-				service_endtime := now.Format(time.DateTime)
-				if vip_endtime := qutil.ObjToString((*orderdata)["vip_endtime"]); vip_endtime != "" {
-					service_endtime = vip_endtime
-				}
-				if vip_starttime := qutil.ObjToString((*orderdata)["vip_starttime"]); vip_starttime != "" {
-					service_starttime = vip_starttime
-				}
+				service_endtime := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local).Format(time.DateTime)
 				if !util.Mysql.UpdateByTx(tx, "jy_order_detail", g.Map{
 					"order_code": orderCode,
 				}, map[string]interface{}{

src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -102,16 +102,8 @@ func (d *dataExportStruct) PayCallBack(param *CallBackParam) bool {
 				}, updateMap) {
 					return false
 				}
-				nowFormat := FormatDate(&now, Date_Full_Layout)
-				service_starttime := nowFormat
-				service_endtime := nowFormat
-				if vip_endtime := qutil.ObjToString((*orderdata)["vip_endtime"]); vip_endtime != "" {
-					service_endtime = vip_endtime
-				}
-				if vip_starttime := qutil.ObjToString((*orderdata)["vip_starttime"]); vip_starttime != "" {
-					service_starttime = vip_starttime
-				}
-
+				service_starttime := now.Format(time.DateTime)
+				service_endtime := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local).Format(time.DateTime)
 				if !util.Mysql.UpdateByTx(tx, "jy_order_detail", g.Map{
 					"order_code": orderCode,
 				}, map[string]interface{}{

src/jfw/modules/subscribepay/src/entity/integral.go

@@ -81,13 +81,7 @@ func (b *integral) PayCallBack(param *CallBackParam) bool {
 					return false
 				}
 				service_starttime := now.Format(time.DateTime)
-				service_endtime := now.Format(time.DateTime)
-				if vip_endtime := qutil.ObjToString((*orderdata)["vip_endtime"]); vip_endtime != "" {
-					service_endtime = vip_endtime
-				}
-				if vip_starttime := qutil.ObjToString((*orderdata)["vip_starttime"]); vip_starttime != "" {
-					service_starttime = vip_starttime
-				}
+				service_endtime := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local).Format(time.DateTime)
 				if !util.Mysql.UpdateByTx(tx, "jy_order_detail", g.Map{
 					"order_code": order_code,
 				}, map[string]interface{}{

src/jfw/modules/subscribepay/src/entity/reWardStruct.go

@@ -33,6 +33,7 @@ func (r *reWardStruct) PayCallBack(param *CallBackParam) bool {
 	}
 	var (
 		filter, _ = json.Marshal(filterMap)
+		now       = time.Now()
 		orderCode = fmt.Sprintf("%s%s", time.Now().Format("150405"), qutil.GetRandom(6))
 	)
 	if !util.Mysql.ExecTx("打赏数据保存", func(tx *sql.Tx) bool {
@@ -41,12 +42,12 @@ func (r *reWardStruct) PayCallBack(param *CallBackParam) bool {
 			"order_code":           orderCode,
 			"order_money":          param.TotalFee,
 			"pay_money":            param.CashFee,
-			"pay_time":             time.Now().Format("2006-01-02 15:04:05"),
+			"pay_time":             now.Format("2006-01-02 15:04:05"),
 			"filter":               string(filter),
 			"order_status":         1,
 			"service_status":       0,
 			"product_type":         "打赏",
-			"create_time":          time.Now().Format("2006-01-02 15:04:05"),
+			"create_time":          now.Format("2006-01-02 15:04:05"),
 			"distribution_channel": "x01",    //销售渠道
 			"order_channel":        "xdqd01", //下单渠道
 			"saleDep":              "040000",
@@ -58,16 +59,20 @@ func (r *reWardStruct) PayCallBack(param *CallBackParam) bool {
 			return false
 		}
 
+		service_starttime := now.Format(time.DateTime)
+		service_endtime := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local).Format(time.DateTime)
 		if util.Mysql.InsertByTx(tx, "jy_order_detail", map[string]interface{}{
-			"order_code":     orderCode,
-			"product_type":   "打赏",
-			"original_price": param.CashFee,
-			"final_price":    param.TotalFee,
-			"product_code":   "ds001",
-			"tactics":        1, //1购买 2赠送
-			"service_type":   1, //1:购买 2:续费 3:升级 4:试用
-			"is_master":      1,
-			"filter":         gconv.String(g.Map{}),
+			"order_code":        orderCode,
+			"product_type":      "打赏",
+			"original_price":    param.CashFee,
+			"final_price":       param.TotalFee,
+			"product_code":      "ds001",
+			"tactics":           1, //1购买 2赠送
+			"service_type":      1, //1:购买 2:续费 3:升级 4:试用
+			"is_master":         1,
+			"service_starttime": service_starttime,
+			"service_endtime":   service_endtime,
+			"filter":            gconv.String(g.Map{}),
 		}) <= 0 {
 			return false
 		}