更改代码结构

opms_parent/app/handler/cust/customer.go

@@ -279,8 +279,7 @@ func (c *CustomerHeader) CustAbstract(ctx context.Context, req *comm_def.IdReq,
 	}
 	customerServer, err := server.NewCustomerService(ctx)
 	if err != nil {
-
-		return myerrors.New("系统异常，请重新尝试", err)
+		return err
 	}
 	list, err := customerServer.CustAbstract(req.Id)
 	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)

opms_parent/app/service/cust/cust_customer.go

@@ -164,15 +164,15 @@ func (s *CustomerService) CreateBelong(custId int) (insertId int64, err error) {
 }
 
 //删除客户
-func (s *CustomerService) DeleteByIds(Ids []int64) error {
+func (s *CustomerService) DeleteByIds(Ids []int64) (err error) {
 	customerCount, err := s.Dao.Where(" id in (?)", Ids).Count()
 	if err != nil {
 		g.Log().Error(err)
-		return err
+		return
 	}
 	if customerCount == 0 {
 		err = myerrors.NewMsgError(nil, "客户信息不存在")
-		return err
+		return
 	}
 
 	//删除客户表
@@ -183,17 +183,17 @@ func (s *CustomerService) DeleteByIds(Ids []int64) error {
 			_, err = s.BelongDao.Where("cust_id in (?)", Ids).Delete()
 			if err != nil {
 				g.Log().Error(err)
-				return err
+				return
 			}
 		} else {
 			g.Log().Error(err)
-			return err
+			return
 		}
 	} else {
 		g.Log().Error(err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 //UpdateById 修改客户
@@ -228,7 +228,7 @@ func (s *CustomerService) UpdateById(req *model.UpdateCustomer) (err error) {
 		WherePri(s.Dao.Columns.Id, req.Id).Update(CustomertData)
 	if err != nil {
 		g.Log().Error(err)
-		return err
+		return
 	}
 	return
 }
@@ -367,25 +367,25 @@ func (s *CustomerService) TransCustomer(req *model.AssignCustomerReq) (err error
 }
 
 //ChangeCustBelong 变更客户所属关系
-func (s *CustomerService) ChangeCustBelong(ids []int64, salesId int64, salesName string) error {
-	_, err := s.Dao.Data(g.Map{
+func (s *CustomerService) ChangeCustBelong(Ids []int64, salesId int64, salesName string) (err error) {
+	_, err = s.Dao.Data(g.Map{
 		"sales_id":     salesId,
 		"is_public":    noPublic,
 		"sales_name":   salesName,
 		"updated_by":   s.GetCxtUserId(),
 		"updated_name": s.GetCxtUserName(),
 		"updated_time": gtime.Now(),
-	}).Where("id in (?)", ids).Update()
+	}).Where("id in (?)", Ids).Update()
 
 	if err != nil {
 		g.Log().Error(err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 //OperationLog 客户操作日志
-func (s *CustomerService) OperationLog(ctx context.Context, ids []int64, req *model.AddCustomerDynameicsReq) (err error) {
+func (s *CustomerService) OperationLog(ids []int64, req *model.AddCustomerDynameicsReq) (err error) {
 	cusDynameics := new(model.CustCustomerDynamics)
 	if err = gconv.Struct(req, cusDynameics); err != nil {
 		err = myerrors.NewMsgError(nil, "操作日志验证结构体失败")
@@ -555,7 +555,6 @@ func (s *CustomerService) Export(req *model.CustCustomerExport) (content *model.
 
 		for ck, item := range data {
 			for index, v := range req.Columns {
-				// "CustCode":客户编码
 				if v == "客户编码" {
 					f.SetCellValue("Sheet1", service.Div(index+1)+strconv.Itoa(ck+2), item.CustCode)
 				}