opms_parent 错误统一输出

opms_parent/app/handler/base/distributor.go

@@ -22,7 +22,6 @@ func (p *DistributorHandler) GetList(ctx context.Context, req *model.BaseDistrib
 		return err
 	}
 	total, list, err := distributorServer.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -42,11 +41,9 @@ func (p *DistributorHandler) Create(ctx context.Context, req *model.AddDistribut
 
 		return err
 	}
-	distributorServer.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	_, err = distributorServer.Create(req)
 	if err != nil {
-
-		return err
+		return myerrors.CreateError(err, "经销商")
 	}
 	return nil
 }
@@ -63,7 +60,6 @@ func (p *DistributorHandler) GetEntityById(ctx context.Context, req *comm_def.Id
 		return err
 	}
 	list, err := distributorServer.GetEntityById(req.Id)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -83,8 +79,7 @@ func (p *DistributorHandler) UpdateById(ctx context.Context, req *model.UpdateDi
 
 		return err
 	}
-	distributorServer.UpdateById(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	err = distributorServer.UpdateById(req)
 	if err != nil {
 
 		return err
@@ -100,10 +95,7 @@ func (p *DistributorHandler) DeleteByIds(ctx context.Context, req *model.DeleteD
 		return err
 	}
 	err = distributorServer.DeleteByIds(req.Ids)
-
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil

opms_parent/app/handler/base/district.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 
 	server "dashoo.cn/micro/app/service/base"
@@ -19,7 +18,6 @@ func (d *DistrictHandler) GetList(ctx context.Context, req *comm_def.IdReq, rsp
 		return err
 	}
 	list, err := districtServer.GetProvincesList(req.Id)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -34,7 +32,6 @@ func (s *DistrictHandler) GetRegionList(ctx context.Context, req *comm_def.IdReq
 		return err
 	}
 	list, err := districtServer.GetRegionsProvinceList()
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -50,7 +47,7 @@ func (d *DistrictHandler) GetProvinceList(ctx context.Context, null, rsp *comm_d
 		return err
 	}
 	list, err := districtServer.GetProvinceList()
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+	//_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

opms_parent/app/handler/base/product.go

@@ -21,9 +21,7 @@ func (b *ProductHandler) GetList(ctx context.Context, req *model.ProductSearchRe
 		return err
 	}
 	total, list, err := s.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -41,7 +39,7 @@ func (b *ProductHandler) Create(ctx context.Context, req *model.AddProductReq, r
 		return err
 	}
 	_, err = s.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
 		return err
 	}
@@ -52,7 +50,7 @@ func (b *ProductHandler) Create(ctx context.Context, req *model.AddProductReq, r
 func (b *ProductHandler) DeleteByIds(ctx context.Context, req *model.DeIds, rsp *comm_def.CommonMsg) error {
 	// 参数校验
 	if len(req.Ids) == 0 {
-		return myerrors.NewMsgError(nil, "参数为空,操作失败")
+		return myerrors.ValidError("参数为空,操作失败!")
 	}
 	s, err := server.NewProductService(ctx)
 	if err != nil {
@@ -60,7 +58,6 @@ func (b *ProductHandler) DeleteByIds(ctx context.Context, req *model.DeIds, rsp
 		return err
 	}
 	err = s.DeleteByIds(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		g.Log().Error(err)
 		return err
@@ -72,14 +69,14 @@ func (b *ProductHandler) DeleteByIds(ctx context.Context, req *model.DeIds, rsp
 func (b *ProductHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
 	// 参数校验
 	if req.Id == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+
+		return myerrors.ValidError("参数有误!")
 	}
 	s, err := server.NewProductService(ctx)
 	if err != nil {
 		return err
 	}
 	product, err := s.GetEntityById(req.Id)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -96,7 +93,6 @@ func (b *ProductHandler) UpdateById(ctx context.Context, req *model.UpdateProduc
 		return err
 	}
 	err = s.UpdateById(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err

opms_parent/app/handler/base/region.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
-	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 
@@ -23,7 +21,6 @@ func (r *RegionHandler) GetList(ctx context.Context, req *model.SecBaseRegionDet
 		return err
 	}
 	total, list, err := regionServer.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -44,9 +41,7 @@ func (r *RegionHandler) Create(ctx context.Context, req *model.AddBaseRegionDeta
 		return err
 	}
 	err = productServer.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil
@@ -60,7 +55,6 @@ func (p *RegionHandler) GetRegion(ctx context.Context, null, rsp *comm_def.Commo
 		return err
 	}
 	list, err := regionServer.GetListRegion()
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -74,13 +68,10 @@ func (p *RegionHandler) GetRegion(ctx context.Context, null, rsp *comm_def.Commo
 func (p *RegionHandler) UpdateById(ctx context.Context, req *model.UpdateBaseRegionDetailReq, rsp *comm_def.CommonMsg) error {
 	regionServer, err := server.NewSalesRegionDetailService(ctx)
 	if err != nil {
-
-		return gerror.New("系统异常，请重新尝试")
+		return err
 	}
 	err = regionServer.UpdateById(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil
@@ -90,13 +81,11 @@ func (p *RegionHandler) UpdateById(ctx context.Context, req *model.UpdateBaseReg
 func (p *RegionHandler) CreateRegion(ctx context.Context, req *model.AddRegionReq, rsp *comm_def.CommonMsg) error {
 	regionServer, err := server.NewSalesRegionService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	err = regionServer.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil
@@ -109,10 +98,7 @@ func (p *RegionHandler) DeleteByIds(ctx context.Context, req *model.DeleteBaseRe
 		return err
 	}
 	err = regionDetailServer.DeleteByIds(req.Ids)
-
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-
 		return err
 	}
 	return nil

opms_parent/app/handler/contract/ctr_contract.go

@@ -2,11 +2,11 @@ package contract
 
 import (
 	"context"
+
 	model "dashoo.cn/micro/app/model/contract"
 	service "dashoo.cn/micro/app/service/contract"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 )
 
@@ -20,12 +20,13 @@ func (c *CtrContract) Get(ctx context.Context, req *model.IdRequiredReq, rsp *co
 		return err
 	}
 	ent, err := s.Get(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
+	//rsp.Data = ent
 	rsp.Data = ent
 	return nil
 }
@@ -38,19 +39,20 @@ func (c *CtrContract) List(ctx context.Context, req *model.CtrContractListReq, r
 		return err
 	}
 	total, ent, err := s.List(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	if ent == nil {
 		ent = []*model.CtrContract{}
 	}
-	rsp.Code = code
-	rsp.Msg = msg
-	rsp.Data = map[string]interface{}{
-		"total": total,
-		"list":  ent,
-	}
+	//rsp.Code = code
+	//rsp.Msg = msg
+	//rsp.Data = map[string]interface{}{
+	//	"total": total,
+	//	"list":  ent,
+	//}
+	rsp.Data = g.Map{"list": ent, "total": total}
 	return nil
 }
 
@@ -62,19 +64,20 @@ func (c *CtrContract) DynamicsList(ctx context.Context, req *model.CtrContractDy
 		return err
 	}
 	total, ent, err := s.DynamicsList(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	if ent == nil {
 		ent = []*model.CtrContract{}
 	}
-	rsp.Code = code
-	rsp.Msg = msg
-	rsp.Data = map[string]interface{}{
-		"total": total,
-		"list":  ent,
-	}
+	//rsp.Code = code
+	//rsp.Msg = msg
+	//rsp.Data = map[string]interface{}{
+	//	"total": total,
+	//	"list":  ent,
+	//}
+	rsp.Data = g.Map{"list": ent, "total": total}
 	return nil
 }
 
@@ -86,13 +89,14 @@ func (c *CtrContract) Add(ctx context.Context, req *model.CtrContractAddReq, rsp
 		return err
 	}
 	id, err := s.Add(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
-	rsp.Data = id
+	//rsp.Code = code
+	//rsp.Msg = msg
+	//rsp.Data = id
+	rsp.Data = g.Map{"list": id}
 	return nil
 }
 
@@ -104,12 +108,12 @@ func (c *CtrContract) Update(ctx context.Context, req *model.CtrContractUpdateRe
 		return err
 	}
 	err = s.Update(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//	_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }
 
@@ -121,12 +125,12 @@ func (c *CtrContract) Transfer(ctx context.Context, req *model.CtrContractTransf
 		return err
 	}
 	err = s.Transfer(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }
 
@@ -140,11 +144,11 @@ func (c *CtrContract) Delete(ctx context.Context, req *model.IdsReq, rsp *comm_d
 		return err
 	}
 	err = s.Delete(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }

opms_parent/app/handler/contract/ctr_contract_append.go

@@ -2,11 +2,11 @@ package contract
 
 import (
 	"context"
+
 	model "dashoo.cn/micro/app/model/contract"
 	service "dashoo.cn/micro/app/service/contract"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 )
 
@@ -20,15 +20,15 @@ func (c *CtrContractAppend) List(ctx context.Context, req *model.CtrContractAppe
 		return err
 	}
 	total, ent, err := s.List(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+
 	if err != nil {
 		return err
 	}
 	if ent == nil {
 		ent = []*model.CtrContractAppend{}
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = map[string]interface{}{
 		"total": total,
 		"list":  ent,
@@ -44,12 +44,12 @@ func (c *CtrContractAppend) Add(ctx context.Context, req *model.CtrContractAppen
 		return err
 	}
 	id, err := s.Add(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = id
 	return nil
 }
@@ -62,12 +62,12 @@ func (c *CtrContractAppend) Update(ctx context.Context, req *model.CtrContractAp
 		return err
 	}
 	err = s.Update(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }
 
@@ -79,11 +79,11 @@ func (c *CtrContractAppend) Delete(ctx context.Context, req *model.IdsReq, rsp *
 		return err
 	}
 	err = s.Delete(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }

opms_parent/app/handler/contract/ctr_contract_collection.go

@@ -2,11 +2,11 @@ package contract
 
 import (
 	"context"
+
 	model "dashoo.cn/micro/app/model/contract"
 	service "dashoo.cn/micro/app/service/contract"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 )
 
@@ -20,15 +20,15 @@ func (c *CtrContractCollection) List(ctx context.Context, req *model.CtrContract
 		return err
 	}
 	total, ent, err := s.List(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	if ent == nil {
 		ent = []*model.CtrContractCollection{}
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = map[string]interface{}{
 		"total": total,
 		"list":  ent,
@@ -44,12 +44,12 @@ func (c *CtrContractCollection) Add(ctx context.Context, req *model.CtrContractC
 		return err
 	}
 	id, err := s.Add(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = id
 	return nil
 }
@@ -62,12 +62,12 @@ func (c *CtrContractCollection) Update(ctx context.Context, req *model.CtrContra
 		return err
 	}
 	err = s.Update(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }
 
@@ -79,11 +79,11 @@ func (c *CtrContractCollection) Delete(ctx context.Context, req *model.IdsReq, r
 		return err
 	}
 	err = s.Delete(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }

opms_parent/app/handler/contract/ctr_contract_collection_plan.go

@@ -2,11 +2,11 @@ package contract
 
 import (
 	"context"
+
 	model "dashoo.cn/micro/app/model/contract"
 	service "dashoo.cn/micro/app/service/contract"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 )
 
@@ -20,12 +20,12 @@ func (c *CtrContractCollectionPlan) Get(ctx context.Context, req *model.IdRequir
 		return err
 	}
 	ent, err := s.Get(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
+	//	_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = ent
 	return nil
 }
@@ -38,15 +38,15 @@ func (c *CtrContractCollectionPlan) List(ctx context.Context, req *model.CtrCont
 		return err
 	}
 	total, ent, err := s.List(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	if ent == nil {
 		ent = []*model.CtrContractCollectionPlan{}
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = map[string]interface{}{
 		"total": total,
 		"list":  ent,
@@ -62,12 +62,12 @@ func (c *CtrContractCollectionPlan) Add(ctx context.Context, req *model.CtrContr
 		return err
 	}
 	id, err := s.Add(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = id
 	return nil
 }
@@ -80,12 +80,12 @@ func (c *CtrContractCollectionPlan) Update(ctx context.Context, req *model.CtrCo
 		return err
 	}
 	err = s.Update(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }
 
@@ -97,11 +97,11 @@ func (c *CtrContractCollectionPlan) Delete(ctx context.Context, req *model.IdsRe
 		return err
 	}
 	err = s.Delete(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	return nil
 }

opms_parent/app/handler/contract/ctr_contract_invoice.go

@@ -2,11 +2,11 @@ package contract
 
 import (
 	"context"
+
 	model "dashoo.cn/micro/app/model/contract"
 	service "dashoo.cn/micro/app/service/contract"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 )
 
@@ -20,15 +20,15 @@ func (c *CtrContractInvoice) List(ctx context.Context, req *model.CtrContractInv
 		return err
 	}
 	total, ent, err := s.List(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
 	if ent == nil {
 		ent = []*model.CtrContractInvoice{}
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = map[string]interface{}{
 		"total": total,
 		"list":  ent,
@@ -44,12 +44,12 @@ func (c *CtrContractInvoice) Add(ctx context.Context, req *model.CtrContractInvo
 		return err
 	}
 	id, err := s.Add(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
+	//_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
+	//rsp.Code = code
+	//rsp.Msg = msg
 	rsp.Data = id
 	return nil
 }
@@ -62,12 +62,9 @@ func (c *CtrContractInvoice) Update(ctx context.Context, req *model.CtrContractI
 		return err
 	}
 	err = s.Update(ctx, req)
-	_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
 	return nil
 }
 
@@ -79,11 +76,8 @@ func (c *CtrContractInvoice) Delete(ctx context.Context, req *model.IdsReq, rsp
 		return err
 	}
 	err = s.Delete(ctx, req.Id)
-	_, err, code, msg := myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
-	rsp.Code = code
-	rsp.Msg = msg
 	return nil
 }

opms_parent/app/handler/cust/belong.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"dashoo.cn/common_definition/comm_def"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 
@@ -24,7 +23,6 @@ func (c *CustBelongHeader) GetEntityById(ctx context.Context, req *model.ReqCust
 		return err
 	}
 	total, list, err := belongServer.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

opms_parent/app/handler/cust/contant.go

@@ -26,7 +26,7 @@ func (c *CustomerContantHeader) Create(ctx context.Context, req *model.CustCusto
 
 	}
 	err = contactService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
 
 		return err
@@ -47,7 +47,6 @@ func (c *CustomerContantHeader) UpdateById(ctx context.Context, req *model.Updat
 		return err
 	}
 	err = customerServer.UpdateById(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -66,7 +65,7 @@ func (c *CustomerContantHeader) GetList(ctx context.Context, req *model.ContactS
 		return err
 	}
 	total, list, err := customerServer.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
 		return err
 	}
@@ -77,14 +76,13 @@ func (c *CustomerContantHeader) GetList(ctx context.Context, req *model.ContactS
 //DeleteById 删除联系人
 func (c *CustomerContantHeader) DeleteById(ctx context.Context, req *model.DelCustomerContact, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误!")
 	}
 	customerServer, err := server.NewCustomerContactService(ctx)
 	if err != nil {
 		return err
 	}
 	err = customerServer.DeleteById(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

opms_parent/app/handler/cust/customer.go

@@ -24,7 +24,6 @@ func (c *CustomerHeader) GetList(ctx context.Context, req *model.CustCustomerSea
 		return err
 	}
 	total, list, err := customerServer.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -44,7 +43,6 @@ func (c *CustomerHeader) PublicGetList(ctx context.Context, req *model.CustCusto
 	req.IsPublic = noCustomer
 
 	total, list, err := customerServer.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -66,7 +64,6 @@ func (c *CustomerHeader) Create(ctx context.Context, req *model.CustomerAddSeq,
 
 	}
 	id, err := s.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -84,7 +81,6 @@ func (c *CustomerHeader) UpdateById(ctx context.Context, req *model.UpdateCustom
 		return err
 	}
 	err = s.UpdateById(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -96,7 +92,7 @@ func (c *CustomerHeader) UpdateById(ctx context.Context, req *model.UpdateCustom
 //GetEntityById  客户详情
 func (c *CustomerHeader) GetEntityById(ctx context.Context, req *comm_def.IdsReq, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误")
 	}
 	customerServer, err := server.NewCustomerService(ctx)
 	if err != nil {
@@ -104,7 +100,6 @@ func (c *CustomerHeader) GetEntityById(ctx context.Context, req *comm_def.IdsReq
 		return err
 	}
 	list, err := customerServer.GetEntityById(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -115,14 +110,13 @@ func (c *CustomerHeader) GetEntityById(ctx context.Context, req *comm_def.IdsReq
 //DeleteById 删除客户
 func (c *CustomerHeader) DeleteById(ctx context.Context, req *model.DelCustomer, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误")
 	}
 	s, err := server.NewCustomerService(ctx)
 	if err != nil {
 		return err
 	}
 	err = s.DeleteByIds(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -141,7 +135,6 @@ func (c *CustomerHeader) GetCustNameIsExist(ctx context.Context, req *model.IsEx
 		return err
 	}
 	exist, err := customerServer.GetCustNameIsExist(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -152,14 +145,13 @@ func (c *CustomerHeader) GetCustNameIsExist(ctx context.Context, req *model.IsEx
 //TransCustomer 转移客户
 func (c *CustomerHeader) TransCustomer(ctx context.Context, req *model.AssignCustomerReq, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 || req.SalesId == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误")
 	}
 	s, err := server.NewCustomerService(ctx)
 	if err != nil {
 		return err
 	}
 	err = s.TransCustomer(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -172,7 +164,7 @@ func (c *CustomerHeader) TransCustomer(ctx context.Context, req *model.AssignCus
 //AssignCustomer 分配,领取客户
 func (c *CustomerHeader) AssignCustomer(ctx context.Context, req *model.AssignCustomerReq, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 || req.SalesId == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误")
 	}
 	s, err := server.NewCustomerService(ctx)
 	if err != nil {
@@ -185,7 +177,6 @@ func (c *CustomerHeader) AssignCustomer(ctx context.Context, req *model.AssignCu
 		behavior = "领取"
 	}
 	err = s.AssignCustomer(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -197,14 +188,13 @@ func (c *CustomerHeader) AssignCustomer(ctx context.Context, req *model.AssignCu
 //MoveToPubic 移入公海
 func (c *CustomerHeader) MoveToPubic(ctx context.Context, req *model.MoveToPubicRep, rsp *comm_def.CommonMsg) error {
 	if len(req.Ids) == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误")
 	}
 	s, err := server.NewCustomerService(ctx)
 	if err != nil {
 		return err
 	}
 	err = s.MoveToPubic(req.Ids)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 
 		return err
@@ -223,7 +213,6 @@ func (c *CustomerHeader) GetDynamicsList(ctx context.Context, req *model.Custome
 		return err
 	}
 	total, list, err := customerServer.GetDynamicsList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -241,7 +230,6 @@ func (c *CustomerHeader) MergeCustomer(ctx context.Context, req *model.MergeCust
 		return err
 	}
 	err = s.MergeCustomer(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -253,14 +241,13 @@ func (c *CustomerHeader) MergeCustomer(ctx context.Context, req *model.MergeCust
 //GetCustAbstract 客户摘要
 func (c *CustomerHeader) GetCustAbstract(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
 	if req.Id == 0 {
-		return myerrors.NewMsgError(nil, "参数有误")
+		return myerrors.ValidError("参数有误")
 	}
 	customerServer, err := server.NewCustomerService(ctx)
 	if err != nil {
 		return err
 	}
 	list, err := customerServer.CustAbstract(req.Id)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}
@@ -275,7 +262,6 @@ func (c *CustomerHeader) Export(ctx context.Context, req *model.CustCustomerExpo
 		return err
 	} //Export
 	buffer, err := customerServer.Export(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		return err
 	}

opms_parent/app/handler/plat/followup.go

@@ -2,12 +2,13 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	model "dashoo.cn/micro/app/model/plat"
-	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	model "dashoo.cn/micro/app/model/plat"
+	server "dashoo.cn/micro/app/service/plat"
 )
 
 type FollowUpHandler struct{}
@@ -16,14 +17,12 @@ type FollowUpHandler struct{}
 func (h *FollowUpHandler) GetList(ctx context.Context, req *model.SearchPlatFollowupReq, rsp *comm_def.CommonMsg) error {
 	followupService, err := server.NewFollowupService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := followupService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
+
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -34,14 +33,10 @@ func (h *FollowUpHandler) GetList(ctx context.Context, req *model.SearchPlatFoll
 func (h *FollowUpHandler) GetListByDay(ctx context.Context, req *model.SearchPlatFollowupReq, rsp *comm_def.CommonMsg) error {
 	followupService, err := server.NewFollowupService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
-	g.Log().Info("搜索值", req)
 	total, list, err := followupService.GetListByDay(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -62,13 +57,10 @@ func (h *FollowUpHandler) Create(ctx context.Context, req *model.AddPlatFollowup
 	}
 	followupService, err := server.NewFollowupService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	err = followupService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil

opms_parent/app/handler/plat/followup_comment.go

@@ -2,12 +2,13 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	model "dashoo.cn/micro/app/model/plat"
-	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	model "dashoo.cn/micro/app/model/plat"
+	server "dashoo.cn/micro/app/service/plat"
 )
 
 type FollowUpCommentHandler struct{}
@@ -16,14 +17,13 @@ type FollowUpCommentHandler struct{}
 func (h *FollowUpCommentHandler) GetList(ctx context.Context, req *model.SearchPlatFollowupCommentReq, rsp *comm_def.CommonMsg) error {
 	followupCommentService, err := server.NewFollowupCommentService(ctx)
 	if err != nil {
-		g.Log().Error(err)
+	
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := followupCommentService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
+
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -38,13 +38,10 @@ func (h *FollowUpCommentHandler) Create(ctx context.Context, req *model.AddPlatF
 	}
 	followupCommentService, err := server.NewFollowupCommentService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	err = followupCommentService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil

opms_parent/app/handler/plat/followup_file.go

@@ -2,11 +2,12 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
+	"github.com/gogf/gf/frame/g"
+
 	model "dashoo.cn/micro/app/model/plat"
 	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
-	"github.com/gogf/gf/frame/g"
 )
 
 type FollowUpFileHandler struct{}
@@ -15,14 +16,11 @@ type FollowUpFileHandler struct{}
 func (h *FollowUpFileHandler) GetList(ctx context.Context, req *model.SearchPlatFollowupFileReq, rsp *comm_def.CommonMsg) error {
 	followupFileService, err := server.NewFollowupFileService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := followupFileService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}

opms_parent/app/handler/plat/task.go

@@ -2,12 +2,13 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	model "dashoo.cn/micro/app/model/plat"
-	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	model "dashoo.cn/micro/app/model/plat"
+	server "dashoo.cn/micro/app/service/plat"
 )
 
 type TaskHandler struct{}
@@ -16,14 +17,11 @@ type TaskHandler struct{}
 func (h *TaskHandler) GetList(ctx context.Context, req *model.SearchPlatTaskReq, rsp *comm_def.CommonMsg) error {
 	taskService, err := server.NewTaskService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := taskService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -45,9 +43,7 @@ func (h *TaskHandler) Create(ctx context.Context, req *model.AddPlatTaskReq, rsp
 		return err
 	}
 	err = taskService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil
@@ -61,11 +57,9 @@ func (h *TaskHandler) Handle(ctx context.Context, req *model.HandleReq, rsp *com
 	}
 	taskService, err := server.NewTaskService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	err = taskService.Handle(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		g.Log().Error(err)
 		return err
@@ -81,11 +75,9 @@ func (h *TaskHandler) ChangeStatus(ctx context.Context, req *model.ChangeStatusR
 	}
 	taskService, err := server.NewTaskService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	err = taskService.ChangeStatus(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		g.Log().Error(err)
 		return err
@@ -97,14 +89,11 @@ func (h *TaskHandler) ChangeStatus(ctx context.Context, req *model.ChangeStatusR
 func (h *TaskHandler) Export(ctx context.Context, req *model.ExportReq, rsp *comm_def.CommonMsg) error {
 	taskService, err := server.NewTaskService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	list, err := taskService.Export(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list}
@@ -115,14 +104,11 @@ func (h *TaskHandler) Export(ctx context.Context, req *model.ExportReq, rsp *com
 func (h *TaskHandler) StatisticsTaskNumber(ctx context.Context, req *model.SearchPlatTaskReq, rsp *comm_def.CommonMsg) error {
 	taskService, err := server.NewTaskService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	result, err := taskService.Statistics(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": result}

opms_parent/app/handler/plat/task_comment.go

@@ -2,12 +2,13 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	model "dashoo.cn/micro/app/model/plat"
-	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	model "dashoo.cn/micro/app/model/plat"
+	server "dashoo.cn/micro/app/service/plat"
 )
 
 type TaskCommentHandler struct{}
@@ -21,9 +22,7 @@ func (h *TaskCommentHandler) GetList(ctx context.Context, req *model.SearchPlatT
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := taskCommentService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -42,7 +41,6 @@ func (h *TaskCommentHandler) Create(ctx context.Context, req *model.AddPlatTaskC
 		return err
 	}
 	err = taskCommentService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
 		g.Log().Error(err)
 		return err

opms_parent/app/handler/plat/task_log.go

@@ -2,11 +2,12 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
+	"github.com/gogf/gf/frame/g"
+
 	model "dashoo.cn/micro/app/model/plat"
 	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
-	"github.com/gogf/gf/frame/g"
 )
 
 type TaskLogHandler struct{}
@@ -15,14 +16,11 @@ type TaskLogHandler struct{}
 func (h *TaskLogHandler) GetList(ctx context.Context, req *model.SearchPlatTaskLogReq, rsp *comm_def.CommonMsg) error {
 	taskLogService, err := server.NewTaskLogService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := taskLogService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}

opms_parent/app/handler/plat/task_progress.go

@@ -2,12 +2,13 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
-	model "dashoo.cn/micro/app/model/plat"
-	server "dashoo.cn/micro/app/service/plat"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
+
+	model "dashoo.cn/micro/app/model/plat"
+	server "dashoo.cn/micro/app/service/plat"
 )
 
 type TaskProgressHandler struct{}
@@ -21,9 +22,7 @@ func (h *TaskProgressHandler) GetList(ctx context.Context, req *model.SearchPlat
 	}
 	g.Log().Info("搜索值", req)
 	total, list, err := taskProgressService.GetList(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	rsp.Data = g.Map{"list": list, "total": total}
@@ -38,13 +37,10 @@ func (h *TaskProgressHandler) Create(ctx context.Context, req *model.AddPlatTask
 	}
 	taskProgressService, err := server.NewTaskProgressService(ctx)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	err = taskProgressService.Create(req)
-	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)
 	if err != nil {
-		g.Log().Error(err)
 		return err
 	}
 	return nil

opms_parent/app/service/base/base_distributor.go

@@ -46,11 +46,9 @@ func (s *distributorService) GetList(req *model.BaseDistributorSearchReq) (total
 	if req.ProvinceId > 0 {
 		distributorModel = distributorModel.Where(s.Dao.Columns.ProvinceId+" in (?)", req.ProvinceId)
 	}
-
-	g.Log().Info("搜索条件", req.ProvinceId)
 	total, err = distributorModel.Count()
 	if err != nil {
-		g.Log().Error(err)
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	err = distributorModel.Page(req.GetPage()).Order("id desc").Scan(&distributorList)
@@ -67,7 +65,7 @@ func (s *distributorService) Create(req *model.AddDistributor) (lastId int64, er
 	DistributorData.DistCode = gstr.SubStr(strconv.Itoa(int(gtime.Now().UnixNano()/1e6))+"Code", 0, -5)
 	lastId, err = s.Dao.InsertAndGetId(DistributorData)
 	if err != nil {
-		g.Log().Error(err)
+
 		return 0, err
 	}
 
@@ -78,7 +76,6 @@ func (s *distributorService) Create(req *model.AddDistributor) (lastId int64, er
 func (s *distributorService) GetEntityById(id int64) (distributorInfo *model.DistributorRonp, err error) {
 	err = s.Dao.Where(base.BaseProduct.Columns.Id, id).Scan(&distributorInfo)
 	if err != nil {
-		g.Log().Error(err)
 		return
 	}
 	return
@@ -93,7 +90,7 @@ func (s *distributorService) UpdateById(req *model.UpdateDistributorReq) (err er
 		return
 	}
 	if count == 0 {
-		err = myerrors.NewMsgError(nil, "无修改数据")
+		err = myerrors.TipsError("无修改数据")
 		return
 	}
 
@@ -120,7 +117,7 @@ func (s *distributorService) DeleteByIds(ids []int64) (err error) {
 			return err
 		}
 		if count == 0 {
-			return myerrors.NewMsgError(nil, "数据不存在或已被删除，请刷新页面")
+			return myerrors.TipsError("数据不存在或已被删除，请刷新页面")
 		}
 	} else {
 		_, err := s.Dao.WhereIn(s.Dao.Columns.Id, ids).LockShared().Count()
@@ -136,7 +133,7 @@ func (s *distributorService) DeleteByIds(ids []int64) (err error) {
 		rows, err := result.RowsAffected()
 		if err == nil {
 			if len(ids) != int(rows) {
-				return myerrors.NewMsgError(nil, fmt.Sprintf("应更新%s行，实际更新%s行", len(ids), int(rows)))
+				return myerrors.TipsError(fmt.Sprintf("应更新%s行，实际更新%s行", len(ids), int(rows)))
 			}
 		}
 	}

opms_parent/app/service/base/base_district.go

@@ -35,7 +35,7 @@ func (s *districtService) GetProvincesList(Id int64) (treeList []*model.Province
 	var distributorList []model.BaseDistrict
 	err = s.Dao.Order("id asc").Scan(&distributorList)
 	if err != nil {
-		g.Log().Error(err)
+
 		return
 	}
 

opms_parent/app/service/base/base_product.go

@@ -44,6 +44,7 @@ func (s *productService) GetList(req *model.ProductSearchReq) (total int, produc
 	total, err = Dao.Count()
 	if err != nil {
 		g.Log().Error(err)
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	if req.PageNum == 0 {
@@ -88,7 +89,7 @@ func (s *productService) UpdateById(req *model.UpdateProductReq) (err error) {
 		return err
 	}
 	if product == nil {
-		return myerrors.NewMsgError(nil, "产品信息不存在或已被删除")
+		return myerrors.TipsError("产品信息不存在或已被删除")
 	}
 	if err = gconv.Struct(req, product); err != nil {
 		return
@@ -111,7 +112,7 @@ func (s *productService) DeleteByIds(ids []int64) (err error) {
 			return err
 		}
 		if count == 0 {
-			return myerrors.NewMsgError(nil, "数据不存在或已被删除，请刷新页面")
+			return myerrors.TipsError("数据不存在或已被删除，请刷新页面")
 		}
 		_, err = s.Dao.WherePri(s.Dao.Columns.Id, ids[0]).Delete()
 		if err != nil {
@@ -133,7 +134,8 @@ func (s *productService) DeleteByIds(ids []int64) (err error) {
 		rows, err := result.RowsAffected()
 		if err == nil {
 			if len(ids) != int(rows) {
-				return myerrors.NewMsgError(nil, fmt.Sprintf("应更新%s行，实际更新%s行", len(ids), int(rows)))
+				return myerrors.TipsError(fmt.Sprintf("应更新%s行，实际更新%s行", len(ids), int(rows)))
+
 			}
 		}
 	}

opms_parent/app/service/base/base_sales_region_detail.go

@@ -14,17 +14,6 @@ import (
 	"dashoo.cn/micro/app/service"
 )
 
-var EgionDetailFieldEx = []interface{}{
-	"id", "created_by",
-	"created_name",
-	"created_time",
-	"province_code",
-	"remark",
-	"updated_by",
-	"updated_name",
-	"updated_time",
-}
-
 type salesRegionDetailService struct {
 	*service.ContextService
 	Dao         *base.BaseSalesRegionDetailDao
@@ -51,6 +40,7 @@ func (s *salesRegionDetailService) GetList(req *model.SecBaseRegionDetailReq) (t
 	total, err = Model.Count()
 	if err != nil {
 		g.Log().Error(err)
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	if req.PageNum == 0 {
@@ -68,18 +58,17 @@ func (s *salesRegionDetailService) GetList(req *model.SecBaseRegionDetailReq) (t
 	//CustModel := p.CustomerDao.M
 	CustModel := s.CustomerDao.M.Fields("count(*) as count,cust_dist_code").Where("cust_dist_code in (?)", districtList)
 	if req.CustName != "" {
-		g.Log().Info("custName", req.CustName)
 
 		CustModel = CustModel.Where(s.CustomerDao.Columns.CustName+" like ?", "%"+req.CustName+"%")
 	}
 	if req.CustCode != "" {
-		g.Log().Info("客户编码搜索", req)
+
 		CustModel = CustModel.Where(s.CustomerDao.Columns.CustCode+" like ?", "%"+req.CustCode+"%")
 	}
 	if req.CustIndustry != "" {
 		CustModel = CustModel.Where(s.CustomerDao.Columns.CustIndustry+" like ?", "%"+req.CustIndustry+"%")
 	}
-	
+
 	dist, _ := s.District.Fields("dist_name,dist_code").Where("dist_code in (?)", districtList).All()
 	custDist, _ := CustModel.Group("cust_dist_code").All()
 
@@ -96,7 +85,7 @@ func (s *salesRegionDetailService) GetList(req *model.SecBaseRegionDetailReq) (t
 			}
 		}
 	}
-	g.Log().Info("List", RegionList)
+
 	return
 }
 
@@ -111,6 +100,7 @@ func (s *salesRegionDetailService) Create(req *model.AddBaseRegionDetailReq) (er
 	service.SetCreatedInfo(detailData, s.GetCxtUserId(), s.GetCxtUserName())
 	_, err = s.Dao.Insert(detailData)
 	if err != nil {
+		g.Log().Error(err)
 		return err
 	}
 	return nil
@@ -125,7 +115,7 @@ func (s *salesRegionDetailService) UpdateById(req *model.UpdateBaseRegionDetailR
 		return
 	}
 	if count == 0 {
-		err = myerrors.NewMsgError(nil, "无修改数据")
+		err = myerrors.TipsError("无修改数据")
 		return
 	}
 
@@ -154,7 +144,7 @@ func (s *salesRegionDetailService) DeleteByIds(ids []int64) (err error) {
 			return err
 		}
 		if count == 0 {
-			return myerrors.NewMsgError(nil, "数据不存在或已被删除，请刷新页面")
+			return myerrors.TipsError("数据不存在或已被删除，请刷新页面")
 		}
 	} else {
 		_, err := s.Dao.WhereIn(s.Dao.Columns.Id, ids).LockShared().Count()
@@ -170,7 +160,7 @@ func (s *salesRegionDetailService) DeleteByIds(ids []int64) (err error) {
 		rows, err := result.RowsAffected()
 		if err == nil {
 			if len(ids) != int(rows) {
-				return myerrors.NewMsgError(nil, fmt.Sprintf("应更新%s行，实际更新%s行", len(ids), int(rows)))
+				return myerrors.TipsError(fmt.Sprintf("应更新%s行，实际更新%s行", len(ids), int(rows)))
 			}
 		}
 	}

opms_parent/app/service/contract/ctr_contract.go

@@ -39,7 +39,8 @@ type CtrContractService struct {
 func NewCtrContractService(ctx context.Context) (*CtrContractService, error) {
 	tenant, err := micro_srv.GetTenant(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取组合码异常：%s", err.Error())
+		err = myerrors.TipsError(fmt.Sprintf("获取组合码异常：%s", err.Error()))
+		return nil, err //fmt.Errorf("获取组合码异常：%s", err.Error())
 	}
 	// 获取用户信息
 	userInfo, err := micro_srv.GetUserInfo(ctx)
@@ -65,7 +66,7 @@ func (s CtrContractService) Get(ctx context.Context, id int) (*model.CtrContract
 		return nil, err
 	}
 	if ent == nil {
-		return nil, myerrors.NewMsgError(nil, "合同不存在")
+		return nil, myerrors.TipsError("合同不存在")
 	}
 	product, err := s.CtrProductDao.Where("contract_id = ?", id).All()
 	if err != nil {
@@ -244,7 +245,7 @@ func (s CtrContractService) BindProduct(tx *gdb.TX, id int, product []model.CtrA
 			return err
 		}
 		if product == nil {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("产品: %d 不存在", p.ProdId))
+			return myerrors.TipsError(fmt.Sprintf("产品: %d 不存在", p.ProdId))
 		}
 		tocreate = append(tocreate, model.CtrContractProduct{
 			ContractId:    id,
@@ -303,7 +304,7 @@ func (s CtrContractService) AddDynamicsByCurrentUser(tx *gdb.TX, contractId int,
 func (s CtrContractService) Add(ctx context.Context, req *model.CtrContractAddReq) (int, error) {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return 0, myerrors.NewMsgError(nil, validErr.Current().Error())
+		return 0, myerrors.TipsError(validErr.Current().Error())
 	}
 
 	if req.ContractCode == "" {
@@ -315,21 +316,21 @@ func (s CtrContractService) Add(ctx context.Context, req *model.CtrContractAddRe
 		return 0, err
 	}
 	if c != nil {
-		return 0, myerrors.NewMsgError(nil, fmt.Sprintf("合同编号:%s 已存在", req.ContractCode))
+		return 0, myerrors.TipsError(fmt.Sprintf("合同编号:%s 已存在", req.ContractCode))
 	}
 	c, err = s.Dao.Where("contract_name = ?", req.ContractName).One()
 	if err != nil {
 		return 0, err
 	}
 	if c != nil {
-		return 0, myerrors.NewMsgError(nil, fmt.Sprintf("合同名称:%s 已存在", req.ContractName))
+		return 0, myerrors.TipsError(fmt.Sprintf("合同名称:%s 已存在", req.ContractName))
 	}
 	nbo, err := s.ProjBusinessDao.Where("id = ?", req.NboId).One()
 	if err != nil {
 		return 0, err
 	}
 	if nbo == nil {
-		return 0, myerrors.NewMsgError(nil, "项目不存在")
+		return 0, myerrors.TipsError("项目不存在")
 	}
 	var contractAmount float64
 	for _, p := range req.Product {
@@ -391,7 +392,7 @@ func (s CtrContractService) Add(ctx context.Context, req *model.CtrContractAddRe
 func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUpdateReq) error {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return myerrors.NewMsgError(nil, validErr.Current().Error())
+		return myerrors.TipsError(validErr.Current().Error())
 	}
 
 	ent, err := s.Dao.Where("id = ?", req.Id).One()
@@ -399,7 +400,7 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
 		return err
 	}
 	if ent == nil {
-		return myerrors.NewMsgError(nil, fmt.Sprintf("合同不存在: %d", req.Id))
+		return myerrors.TipsError(fmt.Sprintf("合同不存在: %d", req.Id))
 	}
 
 	// if req.ContractCode != "" {
@@ -417,7 +418,7 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
 			return err
 		}
 		if exist != nil && exist.Id != req.Id {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("合同名称:%s 已存在", req.ContractName))
+			return myerrors.TipsError(fmt.Sprintf("合同名称:%s 已存在", req.ContractName))
 		}
 	}
 
@@ -428,7 +429,7 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
 			return err
 		}
 		if nbo == nil {
-			return myerrors.NewMsgError(nil, "项目不存在")
+			return myerrors.TipsError("项目不存在")
 		}
 	}
 
@@ -537,7 +538,7 @@ func (s CtrContractService) Transfer(ctx context.Context, req *model.CtrContract
 			return err
 		}
 		if ent == nil {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("合同不存在: %d", req.Id))
+			return myerrors.TipsError(fmt.Sprintf("合同不存在: %d", req.Id))
 		}
 		ents[ent.Id] = ent
 	}
@@ -577,7 +578,7 @@ func (s CtrContractService) UpdateInvoiceAmount(tx *gdb.TX, id int) error {
 	ctr := model.CtrContract{}
 	err := tx.GetStruct(&ctr, "select * from ctr_contract where id = ?", id)
 	if err == sql.ErrNoRows {
-		return myerrors.NewMsgError(err, fmt.Sprintf("合同不存在 %d", id))
+		return myerrors.TipsError(fmt.Sprintf("合同不存在 %d", id))
 	}
 	if err != nil {
 		return err
@@ -603,7 +604,7 @@ func (s CtrContractService) UpdateCollectedAmount(tx *gdb.TX, id int) error {
 	ctr := model.CtrContract{}
 	err := tx.GetStruct(&ctr, "select * from ctr_contract where id = ?", id)
 	if err == sql.ErrNoRows {
-		return myerrors.NewMsgError(err, fmt.Sprintf("合同不存在 %d", id))
+		return myerrors.TipsError(fmt.Sprintf("合同不存在 %d", id))
 	}
 	if err != nil {
 		return err

opms_parent/app/service/contract/ctr_contract_append.go

@@ -27,12 +27,14 @@ type CtrContractAppendService struct {
 func NewCtrContractAppendService(ctx context.Context) (*CtrContractAppendService, error) {
 	tenant, err := micro_srv.GetTenant(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取组合码异常：%s", err.Error())
+		err = myerrors.TipsError(fmt.Sprintf("获取组合码异常：%s", err.Error()))
+		return nil, err //fmt.Errorf("获取组合码异常：%s", err.Error())
 	}
 	// 获取用户信息
 	userInfo, err := micro_srv.GetUserInfo(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取用户信息异常：%s", err.Error())
+		err = myerrors.TipsError(fmt.Sprintf("获取用户信息异常：%s", err.Error()))
+		return nil, err //fmt.Errorf("获取用户信息异常：%s", err.Error())
 	}
 	ctrSrv, err := NewCtrContractService(ctx)
 	if err != nil {
@@ -87,7 +89,7 @@ func (s CtrContractAppendService) List(ctx context.Context, req *model.CtrContra
 func (s CtrContractAppendService) Add(ctx context.Context, req *model.CtrContractAppendAddReq) (int, error) {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return 0, myerrors.NewMsgError(nil, validErr.Current().Error())
+		return 0, myerrors.TipsError(validErr.Current().Error())
 	}
 
 	ent, err := s.ContractDao.Where("id = ?", req.ContractId).One()
@@ -95,7 +97,7 @@ func (s CtrContractAppendService) Add(ctx context.Context, req *model.CtrContrac
 		return 0, err
 	}
 	if ent == nil {
-		return 0, myerrors.NewMsgError(nil, fmt.Sprintf("合同不存在: %d", req.ContractId))
+		return 0, myerrors.TipsError(fmt.Sprintf("合同不存在: %d", req.ContractId))
 	}
 
 	contractAppend := model.CtrContractAppend{
@@ -137,7 +139,7 @@ func (s CtrContractAppendService) Add(ctx context.Context, req *model.CtrContrac
 func (s CtrContractAppendService) Update(ctx context.Context, req *model.CtrContractAppendUpdateReq) error {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return myerrors.NewMsgError(nil, validErr.Current().Error())
+		return myerrors.TipsError(validErr.Current().Error())
 	}
 
 	ent, err := s.Dao.Where("id = ?", req.Id).One()
@@ -145,7 +147,7 @@ func (s CtrContractAppendService) Update(ctx context.Context, req *model.CtrCont
 		return err
 	}
 	if ent == nil {
-		return myerrors.NewMsgError(nil, fmt.Sprintf("合同附件不存在: %d", req.Id))
+		return myerrors.TipsError(fmt.Sprintf("合同附件不存在: %d", req.Id))
 	}
 
 	if req.ContractId != 0 {
@@ -154,7 +156,7 @@ func (s CtrContractAppendService) Update(ctx context.Context, req *model.CtrCont
 			return err
 		}
 		if ent == nil {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("合同不存在: %d", req.ContractId))
+			return myerrors.TipsError(fmt.Sprintf("合同不存在: %d", req.ContractId))
 		}
 	}
 

opms_parent/app/service/contract/ctr_contract_collection.go

@@ -29,12 +29,14 @@ type CtrContractCollectionService struct {
 func NewCtrContractCollectionService(ctx context.Context) (*CtrContractCollectionService, error) {
 	tenant, err := micro_srv.GetTenant(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取组合码异常：%s", err.Error())
+		err = myerrors.TipsError(fmt.Sprintf("获取组合码异常：%s", err.Error()))
+		return nil, err // fmt.Errorf("获取组合码异常：%s", err.Error())
 	}
 	// 获取用户信息
 	userInfo, err := micro_srv.GetUserInfo(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取用户信息异常：%s", err.Error())
+		err = myerrors.TipsError(fmt.Sprintf("获取用户信息异常：%s", err.Error()))
+		return nil, err //fmt.Errorf("获取用户信息异常：%s", err.Error())
 	}
 	planSrv, err := NewCtrContractCollectionPlanService(ctx)
 	if err != nil {
@@ -114,7 +116,7 @@ func (s CtrContractCollectionService) List(ctx context.Context, req *model.CtrCo
 func (s CtrContractCollectionService) Add(ctx context.Context, req *model.CtrContractCollectionAddReq) (int, error) {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return 0, myerrors.NewMsgError(nil, validErr.Current().Error())
+		return 0, myerrors.TipsError(validErr.Current().Error())
 	}
 
 	c, err := s.ContractDao.Where("id = ?", req.ContractId).One()
@@ -122,7 +124,7 @@ func (s CtrContractCollectionService) Add(ctx context.Context, req *model.CtrCon
 		return 0, err
 	}
 	if c == nil {
-		return 0, myerrors.NewMsgError(nil, fmt.Sprintf("合同:%d 不存在", req.ContractId))
+		return 0, myerrors.TipsError(fmt.Sprintf("合同:%d 不存在", req.ContractId))
 	}
 
 	ent := model.CtrContractCollection{
@@ -170,7 +172,7 @@ func (s CtrContractCollectionService) UpdateAmount(tx *gdb.TX, id int) error {
 	ent := model.CtrContractCollection{}
 	err := tx.GetStruct(&ent, "select * from ctr_contract_collection where id = ?", id)
 	if err == sql.ErrNoRows {
-		return myerrors.NewMsgError(err, fmt.Sprintf("回款不存在 %d", id))
+		return myerrors.TipsError(fmt.Sprintf("回款不存在 %d", id))
 	}
 	if err != nil {
 		return err
@@ -188,7 +190,7 @@ func (s CtrContractCollectionService) UpdateAmount(tx *gdb.TX, id int) error {
 func (s CtrContractCollectionService) Update(ctx context.Context, req *model.CtrContractCollectionUpdateReq) error {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return myerrors.NewMsgError(nil, validErr.Current().Error())
+		return myerrors.TipsError(validErr.Current().Error())
 	}
 
 	ent, err := s.Dao.Where("id = ?", req.Id).One()
@@ -196,7 +198,7 @@ func (s CtrContractCollectionService) Update(ctx context.Context, req *model.Ctr
 		return err
 	}
 	if ent == nil {
-		return myerrors.NewMsgError(nil, fmt.Sprintf("回款:%d 不存在", req.Id))
+		return myerrors.TipsError(fmt.Sprintf("回款:%d 不存在", req.Id))
 	}
 
 	// var c *model.CtrContract

opms_parent/app/service/contract/ctr_contract_collection_plan.go

@@ -29,12 +29,15 @@ type CtrContractCollectionPlanService struct {
 func NewCtrContractCollectionPlanService(ctx context.Context) (*CtrContractCollectionPlanService, error) {
 	tenant, err := micro_srv.GetTenant(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取组合码异常：%s", err.Error())
+		err = myerrors.TipsError(fmt.Sprintf("获取组合码异常：%s", err.Error()))
+		return nil, err //fmt.Errorf("获取组合码异常：%s", err.Error())
 	}
 	// 获取用户信息
 	userInfo, err := micro_srv.GetUserInfo(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取用户信息异常：%s", err.Error())
+
+		err = myerrors.TipsError(fmt.Sprintf("获取用户信息异常：%s", err.Error()))
+		return nil, err //fmt.Errorf("获取用户信息异常：%s", err.Error())
 	}
 	ctrSrv, err := NewCtrContractService(ctx)
 	if err != nil {
@@ -56,7 +59,7 @@ func (s CtrContractCollectionPlanService) Get(ctx context.Context, id int) (*mod
 		return nil, err
 	}
 	if ent == nil {
-		return nil, myerrors.NewMsgError(nil, "回款计划不存在")
+		return nil, myerrors.TipsError("回款计划不存在")
 	}
 	c, err := s.CollectionDao.Where("plan_id = ?", id).All()
 	if err != nil {
@@ -125,7 +128,7 @@ func (s CtrContractCollectionPlanService) List(ctx context.Context, req *model.C
 func (s CtrContractCollectionPlanService) Add(ctx context.Context, req *model.CtrContractCollectionPlanAddReq) (int, error) {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return 0, myerrors.NewMsgError(nil, validErr.Current().Error())
+		return 0, myerrors.TipsError(validErr.Current().Error())
 	}
 
 	c, err := s.ContractDao.Where("id = ?", req.ContractId).One()
@@ -133,7 +136,7 @@ func (s CtrContractCollectionPlanService) Add(ctx context.Context, req *model.Ct
 		return 0, err
 	}
 	if c == nil {
-		return 0, myerrors.NewMsgError(nil, fmt.Sprintf("合同:%d 不存在", req.ContractId))
+		return 0, myerrors.TipsError(fmt.Sprintf("合同:%d 不存在", req.ContractId))
 	}
 
 	ent := model.CtrContractCollectionPlan{
@@ -179,15 +182,16 @@ func (s CtrContractCollectionPlanService) Add(ctx context.Context, req *model.Ct
 func (s CtrContractCollectionPlanService) Update(ctx context.Context, req *model.CtrContractCollectionPlanUpdateReq) error {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return myerrors.NewMsgError(nil, validErr.Current().Error())
+		return myerrors.TipsError(validErr.Current().Error())
 	}
 
 	p, err := s.Dao.Where("id = ?", req.Id).One()
 	if err != nil {
+		//g.Log().Error(err)
 		return err
 	}
 	if p == nil {
-		return myerrors.NewMsgError(nil, fmt.Sprintf("回款计划:%d 不存在", req.Id))
+		return myerrors.TipsError(fmt.Sprintf("回款计划:%d 不存在", req.Id))
 	}
 
 	// var c *model.CtrContract
@@ -240,7 +244,7 @@ func (s CtrContractCollectionPlanService) UpdateCashedAmount(tx *gdb.TX, id int)
 	plan := model.CtrContractCollectionPlan{}
 	err := tx.GetStruct(&plan, "select * from ctr_contract_collection_plan where id = ?", id)
 	if err == sql.ErrNoRows {
-		return myerrors.NewMsgError(err, fmt.Sprintf("回款计划不存在 %d", id))
+		return myerrors.TipsError(fmt.Sprintf("回款计划不存在 %d", id))
 	}
 	if err != nil {
 		return err

opms_parent/app/service/contract/ctr_contract_invoice.go

@@ -27,12 +27,13 @@ type CtrContractInvoiceService struct {
 func NewCtrContractInvoiceService(ctx context.Context) (*CtrContractInvoiceService, error) {
 	tenant, err := micro_srv.GetTenant(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取组合码异常：%s", err.Error())
+
+		return nil, myerrors.TipsError(fmt.Sprintf("获取组合码异常：%s", err.Error())) //fmt.Errorf("获取组合码异常：%s", err.Error())
 	}
 	// 获取用户信息
 	userInfo, err := micro_srv.GetUserInfo(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("获取用户信息异常：%s", err.Error())
+		return nil, myerrors.TipsError(fmt.Sprintf("获取用户信息异常：%s", err.Error())) //fmt.Errorf("获取用户信息异常：%s", err.Error())
 	}
 	ctrSrv, err := NewCtrContractService(ctx)
 	if err != nil {
@@ -111,7 +112,7 @@ func (s CtrContractInvoiceService) List(ctx context.Context, req *model.CtrContr
 func (s CtrContractInvoiceService) Add(ctx context.Context, req *model.CtrContractInvoiceAddReq) (int, error) {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return 0, myerrors.NewMsgError(nil, validErr.Current().Error())
+		return 0, myerrors.TipsError(validErr.Current().Error())
 	}
 
 	c, err := s.ContractDao.Where("id = ?", req.ContractId).One()
@@ -119,7 +120,7 @@ func (s CtrContractInvoiceService) Add(ctx context.Context, req *model.CtrContra
 		return 0, err
 	}
 	if c == nil {
-		return 0, myerrors.NewMsgError(nil, fmt.Sprintf("合同:%d 不存在", req.ContractId))
+		return 0, myerrors.TipsError(fmt.Sprintf("合同:%d 不存在", req.ContractId))
 	}
 
 	if req.InvoiceCode != "" {
@@ -128,7 +129,7 @@ func (s CtrContractInvoiceService) Add(ctx context.Context, req *model.CtrContra
 			return 0, err
 		}
 		if ent != nil {
-			return 0, myerrors.NewMsgError(nil, fmt.Sprintf("发票号码:%s 已存在", req.InvoiceCode))
+			return 0, myerrors.TipsError(fmt.Sprintf("发票号码:%s 已存在", req.InvoiceCode))
 		}
 	}
 	if req.CourierCode != "" {
@@ -137,7 +138,7 @@ func (s CtrContractInvoiceService) Add(ctx context.Context, req *model.CtrContra
 			return 0, err
 		}
 		if ent != nil {
-			return 0, myerrors.NewMsgError(nil, fmt.Sprintf("快递单号:%s 已存在", req.CourierCode))
+			return 0, myerrors.TipsError(fmt.Sprintf("快递单号:%s 已存在", req.CourierCode))
 		}
 	}
 
@@ -190,7 +191,7 @@ func (s CtrContractInvoiceService) Add(ctx context.Context, req *model.CtrContra
 func (s CtrContractInvoiceService) Update(ctx context.Context, req *model.CtrContractInvoiceUpdateReq) error {
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return myerrors.NewMsgError(nil, validErr.Current().Error())
+		return myerrors.TipsError(validErr.Current().Error())
 	}
 
 	ent, err := s.Dao.Where("id = ?", req.Id).One()
@@ -198,7 +199,7 @@ func (s CtrContractInvoiceService) Update(ctx context.Context, req *model.CtrCon
 		return err
 	}
 	if ent == nil {
-		return myerrors.NewMsgError(nil, fmt.Sprintf("发票不存在: %d", req.Id))
+		return myerrors.TipsError(fmt.Sprintf("发票不存在: %d", req.Id))
 	}
 
 	if req.InvoiceCode != "" {
@@ -207,7 +208,7 @@ func (s CtrContractInvoiceService) Update(ctx context.Context, req *model.CtrCon
 			return err
 		}
 		if exist != nil && exist.Id != req.Id {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("发票号码: %s 已存在", req.InvoiceCode))
+			return myerrors.TipsError(fmt.Sprintf("发票号码: %s 已存在", req.InvoiceCode))
 		}
 	}
 	if req.CourierCode != "" {
@@ -216,7 +217,7 @@ func (s CtrContractInvoiceService) Update(ctx context.Context, req *model.CtrCon
 			return err
 		}
 		if exist != nil && exist.Id != req.Id {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("快递单号: %s 已存在", req.CourierCode))
+			return myerrors.TipsError(fmt.Sprintf("快递单号: %s 已存在", req.CourierCode))
 		}
 	}
 

opms_parent/app/service/cust/cust_customer.go

@@ -86,11 +86,6 @@ func (s *CustomerService) GetList(req *model.CustCustomerSearchReq) (total int,
 	if req.FollowUpDate != "" {
 		Model = Model.Where(s.Dao.Columns.FollowUpDate+" like ? ", req.FollowUpDate+"%")
 	}
-	total, err = Model.Count()
-	if err != nil {
-		g.Log().Error(err)
-		return
-	}
 
 	if req.IsRemovePage {
 
@@ -98,6 +93,12 @@ func (s *CustomerService) GetList(req *model.CustCustomerSearchReq) (total int,
 	} else {
 		Model = Model.Page(req.GetPage())
 	}
+	total, err = Model.Count()
+	if err != nil {
+		g.Log().Error(err)
+		err = myerrors.DbError("获取总行数失败。")
+		return
+	}
 	err = Model.Order("id desc").Scan(&customerList)
 	if err != nil {
 		g.Log().Error(err)
@@ -115,7 +116,7 @@ func (s *CustomerService) Create(req *model.CustomerAddSeq) (insertId int64, err
 		return
 	}
 	if count > 0 {
-		return 0, myerrors.NewMsgError(nil, "该客户信息已存在,不可重复添加")
+		return 0, myerrors.TipsError("该客户信息已存在,不可重复添加")
 	}
 
 	if err = gconv.Struct(req, cusTomer); err != nil {
@@ -130,6 +131,7 @@ func (s *CustomerService) Create(req *model.CustomerAddSeq) (insertId int64, err
 	for _, v := range roles {
 		if v == "Sales" { // 销售角色
 			isSales = true
+			break
 		}
 	}
 	// 销售角色
@@ -178,28 +180,33 @@ func (s *CustomerService) DeleteByIds(Ids []int64) (err error) {
 		return
 	}
 	if customerCount == 0 {
-		err = myerrors.NewMsgError(nil, "客户信息不存在")
+		err = myerrors.TipsError("客户信息不存在")
 		return
 	}
 
 	//删除客户表
-	_, err = s.Dao.Where("id in (?) ", Ids).Delete()
-	if err == nil {
+	s.Dao.Transaction(context.TODO(), func(ctx context.Context, tx *gdb.TX) error {
+		//客户表
+		_, err = s.Dao.TX(tx).Where("id in (?)", Ids).Delete()
+		if err != nil {
+			g.Log().Error(err)
+			return err
+		}
+		//客户联系人表
 		_, err = s.ContactDao.Where("cust_id in (?)", Ids).Delete()
-		if err == nil {
-			_, err = s.BelongDao.Where("cust_id in (?)", Ids).Delete()
-			if err != nil {
-				g.Log().Error(err)
-				return
-			}
-		} else {
+		if err != nil {
 			g.Log().Error(err)
-			return
+			return err
 		}
-	} else {
-		g.Log().Error(err)
-		return
-	}
+		//客户归属表
+		_, err = s.BelongDao.Where("cust_id in (?)", Ids).Delete()
+		if err != nil {
+			g.Log().Error(err)
+			return err
+		}
+
+		return nil
+	})
 	return
 }
 
@@ -223,7 +230,7 @@ func (s *CustomerService) UpdateById(req *model.UpdateCustomer) (err error) {
 
 	}
 	if num > 0 {
-		return myerrors.NewMsgError(nil, fmt.Sprintf("客户名称[%s]已存在", req.CustName))
+		return myerrors.TipsError(fmt.Sprintf("客户名称[%s]已存在", req.CustName))
 	}
 
 	CustomertData := new(model.CustomerAddSeq)
@@ -248,7 +255,7 @@ func (s *CustomerService) MoveToPubic(Ids []int64) (err error) {
 		return
 	}
 	if count == 0 {
-		err = myerrors.NewMsgError(nil, "没有要移除的数据")
+		err = myerrors.TipsError("没有要移除的数据")
 		return
 	}
 	userName := s.GetCxtUserName()
@@ -293,12 +300,12 @@ func (s *CustomerService) AssignCustomer(req *model.AssignCustomerReq) (err erro
 		return
 	}
 	if len(data) == 0 {
-		return myerrors.NewMsgError(nil, "无可分配客户")
+		return myerrors.TipsError("无可分配客户")
 	}
 
 	for _, v := range data {
 		if v.SalesId != 0 {
-			return myerrors.NewMsgError(nil, fmt.Sprintf("客户名称[%s]已被领取或分配", v.CustName))
+			return myerrors.TipsError(fmt.Sprintf("客户名称[%s]已被领取或分配", v.CustName))
 		}
 	}
 
@@ -361,7 +368,7 @@ func (s *CustomerService) CustAbstract(Id int64) (followInfo *model.Follow, err
 		return
 	}
 	if followTime == nil {
-		err = myerrors.NewMsgError(nil, "获取客户信息不存在")
+		err = myerrors.TipsError("获取客户信息不存在")
 		return
 	}
 	now := gtime.Now()
@@ -390,7 +397,7 @@ func (s *CustomerService) TransCustomer(req *model.AssignCustomerReq) (err error
 	}
 
 	if len(data) == 0 {
-		return myerrors.NewMsgError(nil, "数据不存在")
+		return myerrors.TipsError("数据不存在")
 	}
 	err = s.ChangeCustBelong(req.Ids, req.SalesId, req.SalesName)
 	if err != nil {
@@ -484,7 +491,7 @@ func (s *CustomerService) MergeCustomer(req *model.MergeCustomerRep) (err error)
 		return
 	}
 	if customer == nil {
-		return myerrors.NewMsgError(nil, "该客户不存在")
+		return myerrors.TipsError("该客户不存在")
 	}
 	_, err = s.ContactDao.Where(" cust_id in (?)", req.ChooseId).Delete()
 	if err != nil {
@@ -540,8 +547,8 @@ func (s *CustomerService) MergeCustomer(req *model.MergeCustomerRep) (err error)
 	return
 }
 
-// Createcontact 联系人（合并）预留
-func (s *CustomerService) Createcontact(Ids []int64, req *model.CustCustomerContactSeq) (err error) {
+// CreateContact 联系人（合并）预留
+func (s *CustomerService) CreateContact(Ids []int64, req *model.CustCustomerContactSeq) (err error) {
 	_, err = s.ContactDao.Where(" cust_id in (?)", Ids).Delete()
 	if err != nil {
 		g.Log().Error(err)

opms_parent/app/service/cust/cust_customer_belong.go

@@ -3,6 +3,7 @@ package cust
 import (
 	"context"
 
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
@@ -36,6 +37,7 @@ func (s *CustomerbelongService) GetList(req *model.ReqCustomerBelongReq) (total
 	total, err = s.Dao.Where("cust_id = ", req.CustId).Count()
 	if err != nil {
 		g.Log().Error(err)
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 	return

opms_parent/app/service/cust/cust_customer_contact.go

@@ -34,7 +34,7 @@ func NewCustomerContactService(ctx context.Context) (svc *CustomercontactService
 func (s *CustomercontactService) Create(req *model.CustCustomerContactSeq) (err error) {
 	contact := new(model.CustCustomerContact)
 	if err = gconv.Struct(req, contact); err != nil {
-		err = myerrors.NewMsgError(nil, "添加联系人 验证失败")
+		err = myerrors.TipsError("添加联系人 验证失败")
 		return
 	}
 	service.SetCreatedInfo(contact, s.GetCxtUserId(), s.GetCxtUserName())
@@ -54,7 +54,7 @@ func (s *CustomercontactService) UpdateById(req *model.UpdateCustCustomerContact
 		return
 	}
 	if count == 0 {
-		err = myerrors.NewMsgError(nil, "修改联系人信息不存在")
+		err = myerrors.TipsError("修改联系人信息不存在")
 		return
 	}
 	CustomertData := new(model.CustCustomerContact)
@@ -88,6 +88,7 @@ func (s *CustomercontactService) GetList(req *model.ContactSeq) (total int, list
 	total, err = contactDao.Count()
 	if err != nil {
 		g.Log().Error(err)
+		err = myerrors.TipsError("获取总行数失败。")
 		return
 	}
 	return
@@ -95,6 +96,13 @@ func (s *CustomercontactService) GetList(req *model.ContactSeq) (total int, list
 
 //删除联系人
 func (s *CustomercontactService) DeleteById(Ids []int64) (err error) {
+	result, err := s.Dao.Where(" id  in (?) ", Ids).Count()
+	if err != nil {
+		return err
+	}
+	if result == 0 {
+		return myerrors.TipsError("联系人不存在")
+	}
 	// 删除客户联系人表
 	_, err = s.Dao.Where("id in (?) ", Ids).Delete()
 	if err != nil {

opms_parent/app/service/plat/plat_followup.go

@@ -2,17 +2,19 @@ package plat
 
 import (
 	"context"
-	"dashoo.cn/micro/app/dao/plat"
-	model "dashoo.cn/micro/app/model/plat"
-	"dashoo.cn/micro/app/service"
 	"database/sql"
 	"fmt"
-	"github.com/gogf/gf/errors/gerror"
+	"strconv"
+	"strings"
+
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
-	"strconv"
-	"strings"
+
+	"dashoo.cn/micro/app/dao/plat"
+	model "dashoo.cn/micro/app/model/plat"
+	"dashoo.cn/micro/app/service"
 )
 
 type followupService struct {
@@ -51,7 +53,7 @@ func (s *followupService) GetList(req *model.SearchPlatFollowupReq) (total int,
 	total, err = followupModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 

opms_parent/app/service/plat/plat_followup_comment.go

@@ -2,12 +2,14 @@ package plat
 
 import (
 	"context"
+
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+
 	"dashoo.cn/micro/app/dao/plat"
 	model "dashoo.cn/micro/app/model/plat"
 	"dashoo.cn/micro/app/service"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/util/gconv"
 )
 
 type followupCommentService struct {
@@ -38,7 +40,7 @@ func (s *followupCommentService) GetList(req *model.SearchPlatFollowupCommentReq
 	total, err = followupCommentModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 

opms_parent/app/service/plat/plat_followup_file.go

@@ -2,11 +2,13 @@ package plat
 
 import (
 	"context"
+
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+
 	"dashoo.cn/micro/app/dao/plat"
 	model "dashoo.cn/micro/app/model/plat"
 	"dashoo.cn/micro/app/service"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
 )
 
 type followupFileService struct {
@@ -34,7 +36,7 @@ func (s *followupFileService) GetList(req *model.SearchPlatFollowupFileReq) (tot
 	total, err = followupFileModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 

opms_parent/app/service/plat/plat_task.go

@@ -3,18 +3,20 @@ package plat
 import (
 	"bytes"
 	"context"
-	"dashoo.cn/micro/app/dao/plat"
-	model "dashoo.cn/micro/app/model/plat"
-	"dashoo.cn/micro/app/service"
 	"database/sql"
 	"fmt"
+	"strconv"
+	"strings"
+
+	"dashoo.cn/opms_libary/myerrors"
 	"github.com/360EntSecGroup-Skylar/excelize"
-	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
-	"strconv"
-	"strings"
+
+	"dashoo.cn/micro/app/dao/plat"
+	model "dashoo.cn/micro/app/model/plat"
+	"dashoo.cn/micro/app/service"
 )
 
 type taskService struct {
@@ -74,7 +76,7 @@ func (s *taskService) GetList(req *model.SearchPlatTaskReq) (total int, TaskList
 	total, err = TaskModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 
@@ -261,7 +263,8 @@ func (s *taskService) ChangeStatus(req *model.ChangeStatusReq) (err error) {
 		}
 		data = fmt.Sprintf("is_overdue='%v'", req.NowStatus)
 	} else {
-		return fmt.Errorf("类型不匹配，请仔细检查")
+		err = myerrors.TipsError("类型不匹配，请仔细检查。")
+		return err
 	}
 	// 读取现有数据
 	task, err := s.Dao.Where(where).FindOne()
@@ -269,11 +272,13 @@ func (s *taskService) ChangeStatus(req *model.ChangeStatusReq) (err error) {
 		return err
 	}
 	if task == nil {
-		return fmt.Errorf("数据异常，无匹配数据")
+		err = myerrors.TipsError("数据异常，无匹配数据。")
+		return err
 	}
 	// 状态数据一致性判断
 	if (req.Type == "TaskStatus" && task.TaskStatus != req.OldStatus) || (req.Type == "IsOverdue" && task.IsOverdue != req.OldStatus) {
-		return fmt.Errorf("状态不匹配，进行该操作")
+		err = myerrors.TipsError("状态不匹配，进行该操作")
+		return err
 	}
 	// 更新数据
 	_, err = s.Dao.Update(data, where)
@@ -300,7 +305,8 @@ func (s *taskService) Handle(req *model.HandleReq) (err error) {
 		err = s.Dao.DB.Model("plat_task_handle").Where(fmt.Sprintf("task_id='%v' AND step=%v AND task_status='10' AND (main_user_id=%v OR FIND_IN_SET(%v, owner_user_id))", req.TaskId, req.Step, s.GetCxtUserId(), s.GetCxtUserId())).Scan(&taskHandle)
 		if err != nil {
 			if err == sql.ErrNoRows {
-				return fmt.Errorf("数据不匹配，刷新数据重试")
+				err = myerrors.TipsError("数据不匹配，刷新数据重试")
+				return err
 			}
 			return err
 		}
@@ -317,29 +323,30 @@ func (s *taskService) Handle(req *model.HandleReq) (err error) {
 			return err
 		}
 	} else {
-		var nextHandle = new (model.PlatTaskHandle)
+		var nextHandle = new(model.PlatTaskHandle)
 		task, err := s.Dao.Where("id", req.TaskId).FindOne()
 		if err != nil {
 			return err
 		}
 		if task == nil {
-			return fmt.Errorf("数据异常，无匹配数据")
+			err = myerrors.TipsError("数据异常，无匹配数据")
+			return err
 		}
 		// 构造更新数据
 		handleData := g.Map{
-			"task_status":      "20",
-			"handle_user_id":   s.GetCxtUserId(),
-			"handle_date":   	now.Format("Y-m-d H:i:s"),
-			"handle_status":    req.HandleStatus,
-			"handle_desc":      req.HandleDesc,
-			"updated_by":       s.GetCxtUserId(),
-			"updated_name":     s.GetCxtUserName(),
-			"updated_time":     now.Format("Y-m-d H:i:s"),
+			"task_status":    "20",
+			"handle_user_id": s.GetCxtUserId(),
+			"handle_date":    now.Format("Y-m-d H:i:s"),
+			"handle_status":  req.HandleStatus,
+			"handle_desc":    req.HandleDesc,
+			"updated_by":     s.GetCxtUserId(),
+			"updated_name":   s.GetCxtUserName(),
+			"updated_time":   now.Format("Y-m-d H:i:s"),
 		}
 		taskData := g.Map{
-			"updated_by":      s.GetCxtUserId(),
-			"updated_name":    s.GetCxtUserName(),
-			"updated_time":    now.Format("Y-m-d H:i:s"),
+			"updated_by":   s.GetCxtUserId(),
+			"updated_name": s.GetCxtUserName(),
+			"updated_time": now.Format("Y-m-d H:i:s"),
 		}
 		// 督办任务接收
 		if req.Step == 10 {
@@ -391,7 +398,8 @@ func (s *taskService) Handle(req *model.HandleReq) (err error) {
 				nextHandle = createNextTaskHandel(s, task, 20)
 			}
 		} else {
-			return fmt.Errorf("未知步骤，无法操作")
+			err = myerrors.TipsError("未知步骤，无法操作")
+			return err
 		}
 
 		// 更新数据
@@ -531,4 +539,4 @@ func (s *taskService) saveProgressList(req *model.HandleReq, now *gtime.Time) (e
 	}
 
 	return nil
-}
+}

opms_parent/app/service/plat/plat_task_comment.go

@@ -2,12 +2,14 @@ package plat
 
 import (
 	"context"
+
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+
 	"dashoo.cn/micro/app/dao/plat"
 	model "dashoo.cn/micro/app/model/plat"
 	"dashoo.cn/micro/app/service"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/util/gconv"
 )
 
 type taskCommentService struct {
@@ -38,7 +40,7 @@ func (s *taskCommentService) GetList(req *model.SearchPlatTaskCommentReq) (total
 	total, err = TaskCommentModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 

opms_parent/app/service/plat/plat_task_log.go

@@ -2,11 +2,13 @@ package plat
 
 import (
 	"context"
+
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+
 	"dashoo.cn/micro/app/dao/plat"
 	model "dashoo.cn/micro/app/model/plat"
 	"dashoo.cn/micro/app/service"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
 )
 
 type taskLogService struct {
@@ -34,7 +36,7 @@ func (s *taskLogService) GetList(req *model.SearchPlatTaskLogReq) (total int, Ta
 	total, err = TaskLogModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}
 

opms_parent/app/service/plat/plat_task_progress.go

@@ -2,12 +2,14 @@ package plat
 
 import (
 	"context"
+
+	"dashoo.cn/opms_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+
 	"dashoo.cn/micro/app/dao/plat"
 	model "dashoo.cn/micro/app/model/plat"
 	"dashoo.cn/micro/app/service"
-	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/util/gconv"
 )
 
 type taskProgressService struct {
@@ -35,7 +37,7 @@ func (s *taskProgressService) GetList(req *model.SearchPlatTaskProgressReq) (tot
 	total, err = taskProgressModel.Count()
 	if err != nil {
 		g.Log().Error(err)
-		err = gerror.New("获取总行数失败")
+		err = myerrors.DbError("获取总行数失败。")
 		return
 	}