Ethan il y a 4 mois
Parent
commit
664e4c98ef

+ 1 - 1
app/controller/account_controller.go

@@ -18,7 +18,7 @@ func (t AccountController) OCRIdentify(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reviewService := review_service.GetConfig()

+ 6 - 6
app/controller/bill_controller.go

@@ -15,7 +15,7 @@ func (f BillController) SelectionBillList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.BillService{}.GetBillSelectionTaskList(param)
@@ -33,7 +33,7 @@ func (f BillController) SelectionPay(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err1 := service.BillService{}.PaySelection(param)
@@ -59,7 +59,7 @@ func (f BillController) ProjectBillList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.BillService{}.GetBillProjectTaskList(param)
@@ -77,7 +77,7 @@ func (f BillController) ProjectPay(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err1 := service.BillService{}.PayProject(param)
@@ -103,7 +103,7 @@ func (f BillController) LocalLifeBillList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.BillService{}.GetBillLocalLifeTaskList(param)
@@ -121,7 +121,7 @@ func (f BillController) LocalLifePay(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err1 := service.BillService{}.PayLocalLife(param)

+ 13 - 13
app/controller/cooperation_controller.go

@@ -23,7 +23,7 @@ func (o CooperationController) SearchSupplier(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || "" == param.FieldName {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reSupplierPreviews, err := service.CooperationService{}.SearchSupplier(param)
@@ -41,7 +41,7 @@ func (o CooperationController) InviteSupplier(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err1 := service.CooperationService{}.InviteSupplier(param)
@@ -59,7 +59,7 @@ func (o CooperationController) GetEnterprisePoolList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || "" == param.EnterpriseId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err1 := service.CooperationService{}.GetEnterprisePoolList(param)
@@ -77,7 +77,7 @@ func (o CooperationController) GetSupplierConfirmingList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || "" == param.EnterpriseId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err1 := service.CooperationService{}.GetSupplierConfirmingList(param)
@@ -95,7 +95,7 @@ func (o CooperationController) GetStoreDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || 0 == param.StoreId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reStoreInfo, err := service.StoreService{}.GetStoreDetail(param)
@@ -113,7 +113,7 @@ func (o CooperationController) UpdateStore(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	storeId, err := service.StoreService{}.UpdateStore(param)
@@ -133,7 +133,7 @@ func (o CooperationController) DeleteStore(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	storeId, err := service.StoreService{}.DeleteStore(param)
@@ -153,7 +153,7 @@ func (o CooperationController) GetTeamBuyingDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || 0 == param.TeamBuyingId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reTeamBuyingInfo, err := service.TeamBuyingService{}.GetTeamBuyingDetail(param)
@@ -171,7 +171,7 @@ func (o CooperationController) UpdateTeamBuying(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	teamBuyingId, err := service.TeamBuyingService{}.UpdateTeamBuying(param)
@@ -191,7 +191,7 @@ func (o CooperationController) DeleteTeamBuying(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	teamBuyingId, err := service.TeamBuyingService{}.DeleteTeamBuying(param)
@@ -211,7 +211,7 @@ func (o CooperationController) GetProductDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || 0 == param.ProductId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reStoreInfo, err := service.ProductService{}.GetProductDetail(param)
@@ -229,7 +229,7 @@ func (o CooperationController) UpdateProduct(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	productId, err := service.ProductService{}.UpdateProduct(param)
@@ -249,7 +249,7 @@ func (o CooperationController) DeleteProduct(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	productId, err := service.ProductService{}.DeleteProduct(param)

+ 13 - 13
app/controller/finance_controller.go

@@ -16,13 +16,13 @@ func (f FinanceController) TransferToPublic(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	rechargeId, err := service.RechargeService{}.TransferToPublic(param)
 	if err != nil {
 		logrus.Errorf("[TransferToPublic] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -36,7 +36,7 @@ func (f FinanceController) GetCodeUrl(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	tradeId := util.GenerateDateRelatedUUID(16)
@@ -60,7 +60,7 @@ func (f FinanceController) QueryOrderByTradeId(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	tradeState, err := service.RechargeService{}.QueryOrderByTradeId(param.EnterpriseId, param.SubAccountId, param.TradeId)
@@ -80,7 +80,7 @@ func (f FinanceController) ShowBalance(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reBalanceShow, err := service.RechargeService{}.ShowBalance(param)
@@ -98,7 +98,7 @@ func (f FinanceController) FrozenInfoList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.RechargeService{}.FrozenInfoList(param)
@@ -116,7 +116,7 @@ func (f FinanceController) ShowRecharge(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reRechargeShow, err := service.RechargeService{}.ShowRecharge(param)
@@ -134,7 +134,7 @@ func (f FinanceController) RechargeInfoList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.RechargeService{}.RechargeInfoList(param)
@@ -152,7 +152,7 @@ func (f FinanceController) UpdateInvoiceDefault(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	invoiceId, err := service.InvoiceService{}.UpdateInvoiceDefault(param)
@@ -172,7 +172,7 @@ func (f FinanceController) GetInvoiceDefault(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	reInvoiceInfo, err := service.InvoiceService{}.GetInvoiceDefault(param)
@@ -190,7 +190,7 @@ func (f FinanceController) BillInvoice(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || len(param.TaskIds) != 3 {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	billingId, err := service.InvoiceService{}.BillInvoice(param)
@@ -210,7 +210,7 @@ func (f FinanceController) GetBillList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.InvoiceService{}.GetBillList(param)
@@ -228,7 +228,7 @@ func (f FinanceController) GetBillableList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.InvoiceService{}.GetBillableList(param)

+ 64 - 64
app/controller/task_controller.go

@@ -33,7 +33,7 @@ func (t TaskController) GetAllProduct(c *gin.Context) {
 	err := c.BindJSON(&search)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	var result vo.ResultVO
@@ -53,7 +53,7 @@ func (t TaskController) CreateProduct(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	productId, err := service.ProductService{}.CreateProduct(data)
@@ -74,13 +74,13 @@ func (t TaskController) CreateSelection(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	selectionId, err := service.SelectionInfoService{}.CreateSelectionInfo(data)
 	if err != nil {
 		logrus.Errorf("[CreateSelection] call CreateSelection err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -94,13 +94,13 @@ func (t TaskController) UpdateSelection(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	selectionId, err := service.SelectionInfoService{}.UpdateSelectionInfo(data)
 	if err != nil {
 		logrus.Errorf("[UpdateSelection] call UpdateSelection err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -114,13 +114,13 @@ func (t TaskController) GetSelectionDetail(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.SelectionInfoService{}.GetSelectionDetail(data.SelectionId)
 	if err != nil {
 		logrus.Errorf("[GetSelectionDetail] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -133,13 +133,13 @@ func (t TaskController) SelectionToReview(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil || data.SelectionID == "" {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	selectionId, err := service.SelectionInfoService{}.SelectionToReview(data)
 	if err != nil {
 		logrus.Errorf("[SelectionToReview] call SelectionToReview err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -153,13 +153,13 @@ func (t TaskController) SelectionTaskList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.SelectionInfoService{}.GetSelectionTaskList(param)
 	if err != nil {
 		logrus.Errorf("[SelectionTaskList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -172,13 +172,13 @@ func (t TaskController) SelectionDel(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	selectionId, err := service.SelectionInfoService{}.DeleteSelection(param.SelectionId)
 	if err != nil {
 		logrus.Errorf("[SelectionDel] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -192,7 +192,7 @@ func (t TaskController) CreateProject(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	projectId, err := service.ProjectService{}.CreateProject(data)
@@ -212,7 +212,7 @@ func (t TaskController) UpdateProject(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	projectId, err := service.ProjectService{}.UpdateProject(data)
@@ -232,7 +232,7 @@ func (t TaskController) UpdateProjectTarget(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	projectId, err := service.ProjectService{}.UpdateProjectTarget(data)
@@ -252,7 +252,7 @@ func (t TaskController) GetProjectDetail(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.ProjectService{}.GetProjectDetail(data.ProjectId)
@@ -271,13 +271,13 @@ func (t TaskController) ProjectToReview(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil || data.ProjectID == "" {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	projectId, err := service.ProjectService{}.ProjectToReview(data)
 	if err != nil {
 		logrus.Errorf("[ProjectToReview] call ProjectToReview err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -291,13 +291,13 @@ func (t TaskController) ProjectTaskList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.ProjectService{}.GetProjectTaskList(param)
 	if err != nil {
 		logrus.Errorf("[ProjectTaskList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -310,13 +310,13 @@ func (t TaskController) ProjectDel(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	projectId, err := service.ProjectService{}.DeleteProject(param.ProjectId)
 	if err != nil {
 		logrus.Errorf("[ProjectDel] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -330,13 +330,13 @@ func (t TaskController) GetSelectionDraftList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.SelectionInfoService{}.GetSelectionDraftList(param)
 	if err != nil {
 		logrus.Errorf("[SelectionTaskList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -349,13 +349,13 @@ func (t TaskController) GetProjectDraftList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.ProjectService{}.GetProjectDraftList(param)
 	if err != nil {
 		logrus.Errorf("[ProjectTaskList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -368,13 +368,13 @@ func (t TaskController) GetLocalLifeDraftList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.LocalLifeService{}.GetLocalLifeDraftList(param)
 	if err != nil {
 		logrus.Errorf("[LocalLifeTaskList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -387,13 +387,13 @@ func (t TaskController) GetPublicDefaultList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.DefaultService{}.GetPublicDefaultList(param)
 	if err != nil {
 		logrus.Errorf("[GetPublicDefaultList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -406,13 +406,13 @@ func (t TaskController) GetTargetDefaultList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.DefaultService{}.GetTargetDefaultList(param)
 	if err != nil {
 		logrus.Errorf("[GetTargetDefaultList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -425,13 +425,13 @@ func (t TaskController) GetPublicDefaultTalentList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.DefaultService{}.GetPublicDefaultTalentList(param)
 	if err != nil {
 		logrus.Errorf("[GetPublicDefaultTalentList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -444,13 +444,13 @@ func (t TaskController) GetTargetDefaultTalentList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.DefaultService{}.GetTargetDefaultTalentList(param)
 	if err != nil {
 		logrus.Errorf("[GetTargetDefaultTalentList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -463,13 +463,13 @@ func (t TaskController) CancelTalent(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || param.TaskId == "" {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err = service.DefaultService{}.CancelTalent(param)
 	if err != nil {
 		logrus.Errorf("[CancelTalent] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string]string)
@@ -483,13 +483,13 @@ func (t TaskController) CancelTalentList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || param.TaskIds == nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err = service.DefaultService{}.CancelTalentList(param)
 	if err != nil {
 		logrus.Errorf("[CancelTalentList] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 	resultMap := make(map[string][]string)
@@ -503,7 +503,7 @@ func (o TaskController) GetSupplierInTargetTaskList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || "" == param.EnterpriseId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err1 := service.CooperationService{}.GetSupplierInTargetTaskList(param)
@@ -521,7 +521,7 @@ func (o TaskController) InviteSupplier(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err1 := service.CooperationService{}.InviteSupplierInTargetTask(param)
@@ -538,7 +538,7 @@ func (t TaskController) GetStoreCategory(c *gin.Context) {
 	res, err := service.StoreService{}.GetStoreCategory()
 	if err != nil {
 		logrus.Errorf("[GetStoreCategory] call Show err:%+v\n", err)
-		returnError(c, 40000, "error")
+		returnError(c, 40000, err.Error())
 		return
 	}
 
@@ -551,7 +551,7 @@ func (t TaskController) GetAllStore(c *gin.Context) {
 	err := c.BindJSON(&search)
 	if err != nil || search.EnterpriseId == "" {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	var result vo.ResultVO
@@ -570,7 +570,7 @@ func (t TaskController) CreateStore(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	storeId, err := service.StoreService{}.CreateStore(param)
@@ -590,7 +590,7 @@ func (t TaskController) GetAllTeamBuying(c *gin.Context) {
 	err := c.BindJSON(&search)
 	if err != nil || search.StoreId == 0 {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	var result vo.ResultVO
@@ -609,7 +609,7 @@ func (t TaskController) CreateTeamBuying(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	teamBuyingId, err := service.TeamBuyingService{}.CreateTeamBuying(param)
@@ -629,7 +629,7 @@ func (t TaskController) CreateLocalLife(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	localId, err := service.LocalLifeService{}.CreateLocalLife(data)
@@ -649,7 +649,7 @@ func (t TaskController) UpdateLocalLife(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	localId, err := service.LocalLifeService{}.UpdateLocal(data)
@@ -669,7 +669,7 @@ func (t TaskController) UpdateLocalLifeTarget(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	localId, err := service.LocalLifeService{}.UpdateLocalTarget(data)
@@ -689,7 +689,7 @@ func (t TaskController) GetLocalLifeDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.LocalLifeService{}.GetLocalLifeDetail(param.LocalLifeId)
@@ -708,7 +708,7 @@ func (t TaskController) LocalLifeToReview(c *gin.Context) {
 	err := c.BindJSON(data)
 	if err != nil || data.LocalID == "" {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	localId, err := service.LocalLifeService{}.LocalLifeToReview(data)
@@ -728,7 +728,7 @@ func (t TaskController) LogisticsTalentList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || "" == param.ProjectId {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.TaskInfoService{}.LogisticsTalentList(param)
@@ -747,7 +747,7 @@ func (t TaskController) LocalLifeTaskList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.LocalLifeService{}.GetLocalLifeTaskList(param)
@@ -766,7 +766,7 @@ func (t TaskController) LocalLifeDel(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	localId, err := service.LocalLifeService{}.DeleteLocalLife(param.LocalId)
@@ -786,7 +786,7 @@ func (t TaskController) StoreExploreList(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.LocalLifeService{}.GetStoreExploreList(param)
@@ -804,7 +804,7 @@ func (t TaskController) StoreExploreInfo(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.LocalLifeService{}.GetStoreExploreInfo(param)
@@ -822,7 +822,7 @@ func (t TaskController) StoreExploreOver(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || param.TaskId == "" {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	res, err := service.LocalLifeService{}.StoreExploreOver(param)
@@ -840,7 +840,7 @@ func (t TaskController) StoreExploreOperate(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil || param.TaskIds == nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	err = service.LocalLifeService{}.StoreExploreOperate(param)
@@ -858,7 +858,7 @@ func (t TaskController) TalentDataDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.ViewDataService{}.SelectionTalentDataDetail(param)
@@ -878,7 +878,7 @@ func (t TaskController) SampleDataDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.ViewDataService{}.SelectionSampleDataDetail(param)
@@ -898,7 +898,7 @@ func (t TaskController) SelectionDataDetail(c *gin.Context) {
 	err := c.BindJSON(param)
 	if err != nil {
 		logrus.Errorf("Request bind err:%+v\n", err)
-		returnError(c, 40000, "参数错误")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result, err := service.ViewDataService{}.SelectionDataDetail(param)

+ 1 - 1
app/controller/workspace_controller.go

@@ -16,7 +16,7 @@ func (w WorkspaceController) GetTakegoodsInfo(c *gin.Context) {
 	search := &GetTakegoodsInfoParam{}
 	err := c.BindJSON(&search)
 	if err != nil {
-		returnError(c, 40000, "error")
+		returnError(c, 40000, "Parameter Error: "+err.Error())
 		return
 	}
 	result := service.EnterpriseService{}.GetEnterpriseTakegoodsInfo(search.EnterpriseId, search.DateRange)

+ 1 - 1
app/service/local_life_service.go

@@ -19,7 +19,7 @@ type LocalLifeService struct{}
 // 创建本地生活任务
 func (s LocalLifeService) CreateLocalLife(localCreateParam *vo.LocalCreateParam) (*string, error) {
 	// a) 生成本地生活项目id
-	localId := string(util.GenerateUUID(10))
+	localId := strings.ReplaceAll(util.GenerateUUID(11), "-", "")
 	// b) 查找关联门店信息
 	product, err := dao.StoreDao{}.GetStoreByID(localCreateParam.StoreId)
 	if err != nil {

+ 1 - 1
app/service/project_service.go

@@ -19,7 +19,7 @@ type ProjectService struct{}
 // 创建种草任务
 func (s ProjectService) CreateProject(projectCreateParam *vo.ProjectCreateParam) (*string, error) {
 	// a) 生成种草项目id
-	projectId := string(util.GenerateUUID(10))
+	projectId := strings.ReplaceAll(util.GenerateUUID(11), "-", "")
 	// b) 查找关联商品信息
 	product, err := dao.ProductDAO{}.GetProductByID(projectCreateParam.ProductId)
 	if err != nil {

+ 1 - 1
app/service/selection_info_service.go

@@ -55,7 +55,7 @@ type SelectionInfoService struct{}
 // 创建带货任务
 func (s SelectionInfoService) CreateSelectionInfo(selectionCreateParam *vo.SelectionInfoCreateParam) (*string, error) {
 	// 1. 生成选品id
-	selectionId := string(util.GenerateUUID(10))
+	selectionId := strings.ReplaceAll(util.GenerateUUID(11), "-", "")
 	// 2. 数据准备
 	// 查找关联商品信息
 	product, err := dao.ProductDAO{}.GetProductByID(selectionCreateParam.ProductId)

+ 1 - 1
service/login_auth.go

@@ -163,7 +163,7 @@ func (l *loginAuth) AuthCode(ctx context.Context, phone string, code string) (st
 			UserId:               userData.ID,
 			Token:                token,
 			Role:                 userData.Role,
-			SubAccountId:         -1,
+			SubAccountId:         0,
 			JobName:              "-1",
 			EnterpriseId:         enterpriseUser.EnterpriseID,
 			WorkshopPermission:   "-1",