Merge remote-tracking branch 'origin/master'

api/medical/internal/logic/public/distributorclaimlogic.go

@@ -26,6 +26,7 @@ func NewDistributorClaimLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
+// DistributorClaim 经销商认领
 func (l *DistributorClaimLogic) DistributorClaim(req *types.ClaimReq) (resp *types.ClaimResp, err error) {
 	rs, err := l.svcCtx.Medical.Claim(l.ctx, &medical.ClaimReq{
 		UserId: int64(req.UserId),
@@ -34,14 +35,9 @@ func (l *DistributorClaimLogic) DistributorClaim(req *types.ClaimReq) (resp *typ
 		AppId:  req.AppId,
 	})
 	if err != nil || rs == nil {
-		errMsg := ""
-		if err == entity.RepeatErr || err == entity.OperateErr || err == entity.EntNoFoundErr {
-			errMsg = err.Error()
-		} else {
-			errMsg = entity.OperateErr.Error()
-		}
+		logx.Errorf("%v: req:%v err:%v ", entity.FunctionDistributorClaim, req, err)
 		return &types.ClaimResp{
-			Error_msg:   errMsg,
+			Error_msg:   entity.OperateErr.Error(),
 			Error_code:  entity.ERRORCODE,
 			ResourceNum: 0,
 			ResourceIds: 0,

api/medical/internal/logic/public/distributorunclaimedlogic.go

@@ -2,13 +2,12 @@ package public
 
 import (
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/svc"
+	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/types"
 	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/entity"
 	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/rpc/medical/medical"
 	"context"
 
-	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/svc"
-	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/types"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -26,6 +25,7 @@ func NewDistributorUnclaimedLogic(ctx context.Context, svcCtx *svc.ServiceContex
 	}
 }
 
+// DistributorUnclaimed 经销商取消认领
 func (l *DistributorUnclaimedLogic) DistributorUnclaimed(req *types.ClaimReq) (resp *types.ClaimResp, err error) {
 	rs, err := l.svcCtx.Medical.UnClaimed(l.ctx, &medical.ClaimReq{
 		UserId: int64(req.UserId),
@@ -34,14 +34,9 @@ func (l *DistributorUnclaimedLogic) DistributorUnclaimed(req *types.ClaimReq) (r
 		AppId:  req.AppId,
 	})
 	if err != nil || rs == nil {
-		errMsg := ""
-		if err == entity.RepeatErr || err == entity.OperateErr || err == entity.EntNoFoundErr {
-			errMsg = err.Error()
-		} else {
-			errMsg = entity.OperateErr.Error()
-		}
+		logx.Errorf("%v: req:%v err:%v ", entity.FunctionDistributorUnclaimed, req, err)
 		return &types.ClaimResp{
-			Error_msg:   errMsg,
+			Error_msg:   entity.OperateErr.Error(),
 			Error_code:  entity.ERRORCODE,
 			ResourceNum: 0,
 			ResourceIds: 0,

api/medical/internal/logic/public/institutionclaimlogic.go

@@ -2,13 +2,11 @@ package public
 
 import (
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/svc"
+	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/types"
 	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/entity"
 	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/rpc/medical/medical"
 	"context"
-
-	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/svc"
-	"bp.jydev.jianyu360.cn/ApplicationCenter/medicalField/api/medical/internal/types"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -26,6 +24,7 @@ func NewInstitutionclaimLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
+// Institutionclaim 机构认领
 func (l *InstitutionclaimLogic) Institutionclaim(req *types.ClaimReq) (resp *types.ClaimResp, err error) {
 	rs, err := l.svcCtx.Medical.Claim(l.ctx, &medical.ClaimReq{
 		UserId: int64(req.UserId),
@@ -34,14 +33,9 @@ func (l *InstitutionclaimLogic) Institutionclaim(req *types.ClaimReq) (resp *typ
 		AppId:  req.AppId,
 	})
 	if err != nil || rs == nil {
-		errMsg := ""
-		if err == entity.RepeatErr || err == entity.OperateErr || err == entity.EntNoFoundErr {
-			errMsg = err.Error()
-		} else {
-			errMsg = entity.OperateErr.Error()
-		}
+		logx.Errorf("%v: req:%v err:%v ", entity.FunctionInstitutionClaim, req, err)
 		return &types.ClaimResp{
-			Error_msg:   errMsg,
+			Error_msg:   entity.OperateErr.Error(),
 			Error_code:  entity.ERRORCODE,
 			ResourceNum: 0,
 			ResourceIds: 0,

api/medical/internal/logic/public/institutionunclaimedlogic.go

@@ -26,6 +26,7 @@ func NewInstitutionUnclaimedLogic(ctx context.Context, svcCtx *svc.ServiceContex
 	}
 }
 
+// InstitutionUnclaimed 机构取消认领
 func (l *InstitutionUnclaimedLogic) InstitutionUnclaimed(req *types.ClaimReq) (resp *types.ClaimResp, err error) {
 	rs, err := l.svcCtx.Medical.UnClaimed(l.ctx, &medical.ClaimReq{
 		UserId: int64(req.UserId),
@@ -34,14 +35,9 @@ func (l *InstitutionUnclaimedLogic) InstitutionUnclaimed(req *types.ClaimReq) (r
 		AppId:  req.AppId,
 	})
 	if err != nil || rs == nil {
-		errMsg := ""
-		if err == entity.RepeatErr || err == entity.OperateErr || err == entity.EntNoFoundErr {
-			errMsg = err.Error()
-		} else {
-			errMsg = entity.OperateErr.Error()
-		}
+		logx.Errorf("%v: req:%v err:%v ", entity.FunctionInstitutionUnclaimed, req, err)
 		return &types.ClaimResp{
-			Error_msg:   errMsg,
+			Error_msg:   entity.OperateErr.Error(),
 			Error_code:  entity.ERRORCODE,
 			ResourceNum: 0,
 			ResourceIds: 0,

entity/code.go

@@ -40,3 +40,10 @@ var (
 	OperateErr    = errors.New("操作失败")
 	EntNoFoundErr = errors.New("未查询到该企业详细信息")
 )
+
+const (
+	FunctionInstitutionUnclaimed = "机构取消认领"
+	FunctionDistributorUnclaimed = "经销商取消认领"
+	FunctionInstitutionClaim     = "机构认领"
+	FunctionDistributorClaim     = "经销商认领"
+)

service/claim_test.go

@@ -29,8 +29,8 @@ func TestEntClaimService_Claim(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 
-			got := EntClaimSrv.Claim(tt.args.data)
-			t.Log(got)
+			got, err := EntClaimSrv.Claim(tt.args.data)
+			t.Log(got, err)
 		})
 	}
 

service/portrait_test.go

@@ -143,7 +143,7 @@ func TestPortraitService_List(t *testing.T) {
 			this := &PortraitService{
 				Conn: tt.fields.Conn,
 			}
-			got, _, err := this.List(tt.args.companyId, tt.args.pagesize, tt.args.pagenum)
+			got, _, err := this.List(tt.args.companyId, tt.args.pagesize, tt.args.pagenum, false)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Info() error = %v, wantErr %v", err, tt.wantErr)
 				return