liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-08-18 10:06:19 +08:00
parent e8fa3313c9
commit 8e23122584
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platformapi/tao_vegetable/order_delivery.go
View File

@@ -6,8 +6,6 @@ import (
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain"
request2 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request" request2 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
) )
@@ -44,16 +42,17 @@ func (a *API) QueryOrderDetail(req *request2.AlibabaAelophyOrderGetRequest) (*do
// DeliveryFinish 订单一下的没一个状态通知接口 // DeliveryFinish 订单一下的没一个状态通知接口
// ACCEPTED = 商户接单 REJECTED = 商户取消订单 PICKED = 拣货完成 PACKAGED = 打包出库 SHIPPING = 开始配送 SIGN = 用户签收 REFUSED = 用户拒收 // ACCEPTED = 商户接单 REJECTED = 商户取消订单 PICKED = 拣货完成 PACKAGED = 打包出库 SHIPPING = 开始配送 SIGN = 用户签收 REFUSED = 用户拒收
func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackRequest) error { func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackRequest) error {
globals.SugarLogger.Debugf("进入 DeliveryFinish: %s", utils.Format4Output(req, false)) //globals.SugarLogger.Debugf("进入 DeliveryFinish: %s", utils.Format4Output(req, false))
client := ability591.NewAbility591(&a.client) client := ability591.NewAbility591(&a.client)
globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false)) //globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false))
data, _ := client.AlibabaAelophyOrderWorkCallback(req, a.token) data, err := client.AlibabaAelophyOrderWorkCallback(req, a.token)
fmt.Println(err)
if data != nil && !*data.ApiResult.Success { if data != nil && !*data.ApiResult.Success {
//globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) //globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
return fmt.Errorf(*data.ApiResult.ErrMsg) return fmt.Errorf(*data.ApiResult.ErrMsg)
} }
globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) //globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
return nil return nil
} }

42
platformapi/tao_vegetable/order_test.go
View File

@@ -22,8 +22,8 @@ func TestName(t *testing.T) {
} }
func TestGetOrderDetail(t *testing.T) { func TestGetOrderDetail(t *testing.T) {
requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{ requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
StoreId: utils.String2Pointer("JX666708"), StoreId: utils.String2Pointer("JX101983"),
BizOrderId: utils.Int64ToPointer(5000910858776180489), BizOrderId: utils.Int64ToPointer(5000921008118200880),
}} }}
data, err := apiTao.QueryOrderDetail(requestParam) data, err := apiTao.QueryOrderDetail(requestParam)
globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
@@ -135,20 +135,44 @@ func TestGetTransactionOrderList(t *testing.T) {
func TestPickUp(t *testing.T) { func TestPickUp(t *testing.T) {
param := &request591.AlibabaAelophyOrderWorkCallbackRequest{} param := &request591.AlibabaAelophyOrderWorkCallbackRequest{}
param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
StoreId: utils.String2Pointer("JX11983"), StoreId: utils.String2Pointer("JX101983"),
BizOrderId: utils.Int64ToPointer(5000900604228190922), BizOrderId: utils.Int64ToPointer(5000921008118200880),
Status: utils.String2Pointer("SHIPPING"), Status: utils.String2Pointer("PICKED"),
} }
workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0) workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0)
workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{
BizSubOrderId: utils.Int64ToPointer(3422286108419706112), BizSubOrderId: utils.Int64ToPointer(5000921008118210880),
SkuCode: utils.String2Pointer("19930827"), SkuCode: utils.String2Pointer("39132"),
PickSaleQuantity: utils.String2Pointer("3"), PickSaleQuantity: utils.String2Pointer("1"),
PickStockQuantity: utils.String2Pointer("3"), PickStockQuantity: utils.String2Pointer("1"),
} }
workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo) workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo)
workCallbackSubOrderInfo2 := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{
BizSubOrderId: utils.Int64ToPointer(5000921008118220880),
SkuCode: utils.String2Pointer("6093937"),
PickSaleQuantity: utils.String2Pointer("2"),
PickStockQuantity: utils.String2Pointer("2"),
}
workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo2)
workCallbackSubOrderInfo3 := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{
BizSubOrderId: utils.Int64ToPointer(5000921008118230880),
SkuCode: utils.String2Pointer("6045098"),
PickSaleQuantity: utils.String2Pointer("1"),
PickStockQuantity: utils.String2Pointer("1"),
}
workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo3)
workCallbackSubOrderInfo4 := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{
BizSubOrderId: utils.Int64ToPointer(5000921008118240880),
SkuCode: utils.String2Pointer("24342"),
PickSaleQuantity: utils.String2Pointer("1"),
PickStockQuantity: utils.String2Pointer("1"),
}
workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo4)
// 出库 // 出库
param.WorkCallbackRequest.WorkCallbackSubOrderInfoList = &workCallbackSubOrderInfoList param.WorkCallbackRequest.WorkCallbackSubOrderInfoList = &workCallbackSubOrderInfoList