Merge remote-tracking branch 'origin/master'

app/hdl/hdl_data_center_generate_data.go

@@ -127,13 +127,13 @@ func GenerateDataDoing(c *gin.Context) {
 		e.OutErr(c, err1.Code, err1.Error())
 		return
 	}
-	res := svc.DataCenterGenerateDataDoing(c, req)
-	if res != nil {
-		fmt.Println(res.Error())
-		e.OutErr(c, 400, e.NewErr(400, "生成失败"))
+	err = svc.DataCenterGenerateDataDoing(c, req)
+	if err != nil {
+		fmt.Println(err.Error())
+		e.OutErr(c, e.ERR, err.Error())
 		return
 	}
-	e.OutSuc(c, res, nil)
+	e.OutSuc(c, "success", nil)
 	return
 }
 

app/svc/svc_wx_data.go

@@ -36,7 +36,7 @@ func GenerateWxAdData(req md.GenerateWxAdData) (err error, generateWxAdData mode
 		return
 	}
 	mediumDivisionStrategyWithAgentFlowDb := implement.NewMediumDivisionStrategyWithAgentFlowDb(db.Db)
-	mediumDivisionStrategyWithAgentFlows, err := mediumDivisionStrategyWithAgentFlowDb.FindMediumDivisionStrategyWithAgentFlowByStrategyId(mediumDivisionStrategy.MediumId)
+	mediumDivisionStrategyWithAgentFlows, err := mediumDivisionStrategyWithAgentFlowDb.FindMediumDivisionStrategyWithAgentFlowByStrategyId(mediumDivisionStrategy.Id)
 	if err != nil {
 		return
 	}
@@ -559,7 +559,7 @@ func CalcApplicationData(req md.CalcApplicationDataReq) (err error, resp md.Calc
 		return
 	}
 	mediumDivisionStrategyWithAgentFlowDb := implement.NewMediumDivisionStrategyWithAgentFlowDb(db.Db)
-	mediumDivisionStrategyWithAgentFlows, err := mediumDivisionStrategyWithAgentFlowDb.FindMediumDivisionStrategyWithAgentFlowByStrategyId(mediumDivisionStrategy.MediumId)
+	mediumDivisionStrategyWithAgentFlows, err := mediumDivisionStrategyWithAgentFlowDb.FindMediumDivisionStrategyWithAgentFlowByStrategyId(mediumDivisionStrategy.Id)
 	if err != nil {
 		return
 	}

go.mod

@@ -36,7 +36,7 @@ require (
 require (
 	code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5
 	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240830072333-a1980ffb256e
-	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241009031730-6c5d31eb7458
+	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241009095023-24f5079bb959
 	github.com/jinzhu/copier v0.4.0
 )