顺丰的查询、预计时间、取消接口

services/express/internal/logic/expressAdminCancelLogic.go

@@ -0,0 +1,73 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
+	"lone-services/services/express/internal/dao"
+	"lone-services/services/express/internal/model"
+	"strconv"
+
+	"lone-services/rpc/express/pb"
+	"lone-services/services/express/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ExpressAdminCancelLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewExpressAdminCancelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ExpressAdminCancelLogic {
+	return &ExpressAdminCancelLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *ExpressAdminCancelLogic) ExpressAdminCancel(in *express.IdRequest) (*express.Response, error) {
+	var v validate.InfoValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}}
+	var upData dao.DeliveryOrderPrintEdit
+	err := model.DeliveryOrderModel{}.Init().GetOne(w, &upData)
+	if err != nil {
+		l.Logger.Error("没有找到快递数据", err)
+		return l.fail(utils.ErrorNotFund)
+	}
+	if upData.Id < utils.NumberZero {
+		return l.fail(utils.ErrorNotFund)
+	}
+
+	tw := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(upData.TransitId)}}
+	var transitInfo dao.ExpressSend
+	err = model.ExpressModel{}.Init().GetOne(tw, &transitInfo)
+	if err != nil {
+		l.Logger.Error("发货地址信息没有找到", upData.TransitId, err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+	if transitInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+
+	}
+	client, clientErr := svc.GetTransitInfo(transitInfo)
+	if clientErr != utils.Ok {
+		return l.fail(clientErr)
+	}
+	retStatus := svc.Cancel(client, w, upData, dao.SendStatusCancel, l.svcCtx.OrderSvcName)
+	if retStatus != utils.Ok {
+		return l.fail(retStatus)
+	}
+	return l.ok(utils.NumberOne)
+}

services/express/internal/logic/expressAdminEstimatedLogic.go

@@ -0,0 +1,100 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
+	"lone-services/services/express/internal/dao"
+	"lone-services/services/express/internal/model"
+	"strconv"
+	"strings"
+	"time"
+
+	"lone-services/rpc/express/pb"
+	"lone-services/services/express/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ExpressAdminEstimatedLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewExpressAdminEstimatedLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ExpressAdminEstimatedLogic {
+	return &ExpressAdminEstimatedLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *ExpressAdminEstimatedLogic) ExpressAdminEstimated(in *express.IdRequest) (*express.Response, error) {
+	var v validate.InfoValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}}
+	var upData dao.DeliveryOrderUpTransit
+	err := model.DeliveryOrderModel{}.Init().GetOne(w, &upData)
+	if err != nil {
+		l.Logger.Error("没有找到快递数据", err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+	if upData.Id < utils.NumberZero {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+
+	if upData.Status != dao.SendStatusOk {
+		return l.ok(upData.EstimatedTime)
+	}
+
+	tw := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(upData.TransitId)}}
+	var transitInfo dao.ExpressSend
+	err = model.ExpressModel{}.Init().GetOne(tw, &transitInfo)
+	if err != nil {
+		l.Logger.Error("发货地址信息没有找到", upData.TransitId, err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+	if len(upData.TransitSn) < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+
+	client, clientErr := svc.GetTransitInfo(transitInfo)
+	if clientErr != utils.Ok {
+		return l.fail(clientErr)
+	}
+
+	sns := strings.Split(upData.TransitSn, utils.DecollatorComma)
+	res, err := client.Estimated(sns[0], transitInfo.CardNumber)
+	if err != nil || res.ErrorCode != utils.StringStatusOk {
+		l.Logger.Error("estimated transit err", err, res)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "获取快递错误"))
+	}
+
+	var toTime string
+	if transitInfo.TransitId == dao.ExpressCompanyJd {
+		toTime = time.UnixMilli(int64(res.RequestQuery["deliveryPromiseTime"].(float64))).Format(time.DateTime)
+	} else if transitInfo.TransitId == dao.ExpressCompanySf {
+		toTime = utils.GetStringByMap(res.RequestQuery, "promiseTm")
+	}
+
+	if toTime == utils.StringEmpty {
+		return l.fail(utils.Fail)
+	}
+
+	upData.EstimatedTime = toTime
+	_, err = model.DeliveryOrderModel{}.Init().Edit(w, &upData)
+	if err != nil {
+		return l.fail(utils.Fail)
+	}
+
+	return l.ok(toTime)
+}

services/express/internal/logic/expressAdminQueryLogic.go

@@ -0,0 +1,92 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
+	"lone-services/services/express/internal/dao"
+	"lone-services/services/express/internal/model"
+	"strconv"
+
+	"lone-services/rpc/express/pb"
+	"lone-services/services/express/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ExpressAdminQueryLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewExpressAdminQueryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ExpressAdminQueryLogic {
+	return &ExpressAdminQueryLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *ExpressAdminQueryLogic) ExpressAdminQuery(in *express.IdRequest) (*express.Response, error) {
+	var v validate.InfoValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}}
+	var upData dao.DeliveryOrderUpTransit
+	err := model.DeliveryOrderModel{}.Init().GetOne(w, &upData)
+	if err != nil {
+		l.Logger.Error("没有找到快递数据", err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+	if upData.Id < utils.NumberZero {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+
+	if upData.Status != dao.SendStatusOk {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有发货"))
+	}
+
+	tw := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(upData.TransitId)}}
+	var transitInfo dao.ExpressSend
+	err = model.ExpressModel{}.Init().GetOne(tw, &transitInfo)
+	if err != nil {
+		l.Logger.Error("发货地址信息没有找到", upData.TransitId, err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+	if transitInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+
+	client, clientErr := svc.GetTransitInfo(transitInfo)
+	if clientErr != utils.Ok {
+		return l.fail(clientErr)
+	}
+	sn := upData.OrderSn
+	if transitInfo.TransitId == dao.ExpressCompanyJd {
+		sn = upData.TransitSn
+	}
+	res, err := client.Query(sn)
+	if err != nil || res.ErrorCode != utils.StringStatusOk {
+		l.Logger.Error("query transit err", err, res)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "获取快递错误"))
+	}
+
+	//TODO JD
+	//if transitInfo.TransitId == dao.ExpressCompanyJd {
+	//	return // s.queryJdEdit(res.RequestQuery, &upData)
+	//}
+
+	items, s := svc.QueryEdit(res.RequestQuery, &upData, l.svcCtx.OrderSvcName)
+	if s != utils.Ok {
+		return l.fail(s)
+	}
+	return l.ok(items)
+}

services/express/internal/logic/expressApiCancelLogic.go

@@ -0,0 +1,77 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/services/express/internal/dao"
+	"lone-services/services/express/internal/model"
+	"lone-services/services/express/validator"
+	"strconv"
+
+	"lone-services/rpc/express/pb"
+	"lone-services/services/express/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ExpressApiCancelLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewExpressApiCancelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ExpressApiCancelLogic {
+	return &ExpressApiCancelLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *ExpressApiCancelLogic) ExpressApiCancel(in *express.IdApiRequest) (*express.Response, error) {
+	var v validator.IdApiValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}}
+	var upData dao.DeliveryOrderPrintEdit
+	err := model.DeliveryOrderModel{}.Init().GetOne(w, &upData)
+	if err != nil {
+		l.Logger.Error("没有找到快递数据", err)
+		return l.fail(utils.ErrorNotFund)
+	}
+	if upData.Id < utils.NumberZero {
+		return l.fail(utils.ErrorNotFund)
+	}
+	orderInfo := svc.GetOrderInfo(upData.OrderSn, in.Type, l.svcCtx.OrderSvcName)
+	if orderInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到订单信息"))
+	}
+	tw := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(upData.TransitId)}}
+	var transitInfo dao.ExpressSend
+	err = model.ExpressModel{}.Init().GetOne(tw, &transitInfo)
+	if err != nil {
+		l.Logger.Error("发货地址信息没有找到", upData.TransitId, err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+	if transitInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+
+	}
+	client, clientErr := svc.GetTransitInfo(transitInfo)
+	if clientErr != utils.Ok {
+		return l.fail(clientErr)
+	}
+	retStatus := svc.Cancel(client, w, upData, dao.SendStatusCancel, l.svcCtx.OrderSvcName)
+	if retStatus != utils.Ok {
+		return l.fail(retStatus)
+	}
+	return l.ok(utils.NumberOne)
+}

services/express/internal/logic/expressApiEstimatedLogic.go

@@ -0,0 +1,105 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
+	"lone-services/services/express/internal/dao"
+	"lone-services/services/express/internal/model"
+	"strconv"
+	"strings"
+	"time"
+
+	"lone-services/rpc/express/pb"
+	"lone-services/services/express/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ExpressApiEstimatedLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewExpressApiEstimatedLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ExpressApiEstimatedLogic {
+	return &ExpressApiEstimatedLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *ExpressApiEstimatedLogic) ExpressApiEstimated(in *express.IdApiRequest) (*express.Response, error) {
+	var v validate.InfoValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}}
+	var upData dao.DeliveryOrderUpTransit
+	err := model.DeliveryOrderModel{}.Init().GetOne(w, &upData)
+	if err != nil {
+		l.Logger.Error("没有找到快递数据", err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+	if upData.Id < utils.NumberZero {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+
+	if upData.Status != dao.SendStatusOk {
+		return l.ok(upData.EstimatedTime)
+	}
+
+	orderInfo := svc.GetOrderInfo(upData.OrderSn, in.Type, l.svcCtx.OrderSvcName)
+	if orderInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到订单信息"))
+	}
+
+	tw := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(upData.TransitId)}}
+	var transitInfo dao.ExpressSend
+	err = model.ExpressModel{}.Init().GetOne(tw, &transitInfo)
+	if err != nil {
+		l.Logger.Error("发货地址信息没有找到", upData.TransitId, err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+	if len(upData.TransitSn) < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+
+	client, clientErr := svc.GetTransitInfo(transitInfo)
+	if clientErr != utils.Ok {
+		return l.fail(clientErr)
+	}
+
+	sns := strings.Split(upData.TransitSn, utils.DecollatorComma)
+	res, err := client.Estimated(sns[0], transitInfo.CardNumber)
+	if err != nil || res.ErrorCode != utils.StringStatusOk {
+		l.Logger.Error("estimated transit err", err, res)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "获取快递错误"))
+	}
+
+	var toTime string
+	if transitInfo.TransitId == dao.ExpressCompanyJd {
+		toTime = time.UnixMilli(int64(res.RequestQuery["deliveryPromiseTime"].(float64))).Format(time.DateTime)
+	} else if transitInfo.TransitId == dao.ExpressCompanySf {
+		toTime = utils.GetStringByMap(res.RequestQuery, "promiseTm")
+	}
+
+	if toTime == utils.StringEmpty {
+		return l.fail(utils.Fail)
+	}
+
+	upData.EstimatedTime = toTime
+	_, err = model.DeliveryOrderModel{}.Init().Edit(w, &upData)
+	if err != nil {
+		return l.fail(utils.Fail)
+	}
+
+	return l.ok(toTime)
+}

services/express/internal/logic/expressApiQueryLogic.go

@@ -0,0 +1,97 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
+	"lone-services/services/express/internal/dao"
+	"lone-services/services/express/internal/model"
+	"strconv"
+
+	"lone-services/rpc/express/pb"
+	"lone-services/services/express/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ExpressApiQueryLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewExpressApiQueryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ExpressApiQueryLogic {
+	return &ExpressApiQueryLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *ExpressApiQueryLogic) ExpressApiQuery(in *express.IdApiRequest) (*express.Response, error) {
+	var v validate.InfoValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}}
+	var upData dao.DeliveryOrderUpTransit
+	err := model.DeliveryOrderModel{}.Init().GetOne(w, &upData)
+	if err != nil {
+		l.Logger.Error("没有找到快递数据", err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+	if upData.Id < utils.NumberZero {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到快递数据"))
+	}
+
+	if upData.Status != dao.SendStatusOk {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有发货"))
+	}
+
+	orderInfo := svc.GetOrderInfo(upData.OrderSn, in.Type, l.svcCtx.OrderSvcName)
+	if orderInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到订单信息"))
+	}
+	
+	tw := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(upData.TransitId)}}
+	var transitInfo dao.ExpressSend
+	err = model.ExpressModel{}.Init().GetOne(tw, &transitInfo)
+	if err != nil {
+		l.Logger.Error("发货地址信息没有找到", upData.TransitId, err)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+	if transitInfo.Id < utils.NumberOne {
+		return l.fail(utils.SetError(utils.ErrorNotFund, "没有找到发货的快递信息"))
+	}
+
+	client, clientErr := svc.GetTransitInfo(transitInfo)
+	if clientErr != utils.Ok {
+		return l.fail(clientErr)
+	}
+	sn := upData.OrderSn
+	if transitInfo.TransitId == dao.ExpressCompanyJd {
+		sn = upData.TransitSn
+	}
+	res, err := client.Query(sn)
+	if err != nil || res.ErrorCode != utils.StringStatusOk {
+		l.Logger.Error("query transit err", err, res)
+		return l.fail(utils.SetError(utils.ErrorNotFund, "获取快递错误"))
+	}
+
+	//TODO JD
+	//if transitInfo.TransitId == dao.ExpressCompanyJd {
+	//	return // s.queryJdEdit(res.RequestQuery, &upData)
+	//}
+
+	items, s := svc.QueryEdit(res.RequestQuery, &upData, l.svcCtx.OrderSvcName)
+	if s != utils.Ok {
+		return l.fail(s)
+	}
+	return l.ok(items)
+}

services/express/internal/logic/infoLogic.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"lone-services/pkg/modelbase"
 	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
 	"lone-services/rpc/express/pb"
 	"lone-services/services/express/internal/dao"
 	"lone-services/services/express/internal/model"
 	"lone-services/services/express/internal/svc"
-	"lone-services/services/express/validator"
 	"strconv"
 
 	"github.com/zeromicro/go-zero/core/logx"
@@ -30,7 +30,7 @@ func NewInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *InfoLogic {
 }
 
 func (l *InfoLogic) Info(in *express.IdRequest) (*express.Response, error) {
-	var v validator.InfoValidator
+	var v validate.InfoValidator
 	if fail := l.checkParams(in, &v); fail != nil {
 		return fail, nil
 	}