This commit is contained in:
richboo111
2023-08-30 15:07:21 +08:00
23 changed files with 301 additions and 120 deletions

View File

@@ -36,7 +36,7 @@ func CallBackResultInfo(err error) *CallBackResult {
return &CallBackResult{
Success: true,
ErrCode: "SUCCESS",
ErrMsg: "",
ErrMsg: "成功",
}
}
return &CallBackResult{
@@ -52,7 +52,7 @@ func CallBackResultSign(err error) *CallBackResult {
return &CallBackResult{
Success: true,
ErrCode: "SUCCESS",
ErrMsg: "",
ErrMsg: "成功",
}
}

View File

@@ -46,7 +46,8 @@ func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackReques
client := ability591.NewAbility591(&a.client)
//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 {
//globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
return fmt.Errorf(*data.ApiResult.ErrMsg)

View File

@@ -22,8 +22,8 @@ func TestName(t *testing.T) {
}
func TestGetOrderDetail(t *testing.T) {
requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
StoreId: utils.String2Pointer("JX666708"),
BizOrderId: utils.Int64ToPointer(5000910858776180489),
StoreId: utils.String2Pointer("JX101983"),
BizOrderId: utils.Int64ToPointer(5000921008118200880),
}}
data, err := apiTao.QueryOrderDetail(requestParam)
globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
@@ -135,20 +135,44 @@ func TestGetTransactionOrderList(t *testing.T) {
func TestPickUp(t *testing.T) {
param := &request591.AlibabaAelophyOrderWorkCallbackRequest{}
param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
StoreId: utils.String2Pointer("JX668594"),
BizOrderId: utils.Int64ToPointer(5000900604228190922),
Status: utils.String2Pointer("SHIPPING"),
StoreId: utils.String2Pointer("JX101983"),
BizOrderId: utils.Int64ToPointer(5000921008118200880),
Status: utils.String2Pointer("PICKED"),
}
workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0)
workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{
BizSubOrderId: utils.Int64ToPointer(3422286108419706112),
SkuCode: utils.String2Pointer("19930827"),
PickSaleQuantity: utils.String2Pointer("3"),
PickStockQuantity: utils.String2Pointer("3"),
BizSubOrderId: utils.Int64ToPointer(5000921008118210880),
SkuCode: utils.String2Pointer("39132"),
PickSaleQuantity: utils.String2Pointer("1"),
PickStockQuantity: utils.String2Pointer("1"),
}
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

View File

@@ -112,21 +112,47 @@ func TestAddStoreSku(t *testing.T) {
globals.SugarLogger.Debugf("err = %s", utils.Format4Output(err, false))
}
var skucodeMap = []string{
"JX100829:25278",
}
func TestUpdateSku(t *testing.T) {
param := &request585.AlibabaWdkSkuUpdateRequest{}
updateSkuList := make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
updateSku := domain585.AlibabaWdkSkuUpdateSkuDo{
OuCode: utils.String2Pointer("JX101870"),
SkuCode: utils.String2Pointer("6045426"),
CleanSkuMemberPrice: utils.Int64ToPointer(1),
AllowAppSale: utils.Int64ToPointer(1),
OnlineSaleFlag: utils.Int64ToPointer(1),
data2 := make([]string, 0, 0)
for _, v := range skucodeMap {
storeCodeAndSkuCode := strings.Split(v, ":")
skuCode := []string{storeCodeAndSkuCode[1]}
storeCode1 := utils.String2Pointer(storeCodeAndSkuCode[0])
result, err := apiTao.QueryStoreSKu(&request585.AlibabaWdkSkuQueryRequest{Param: &domain585.AlibabaWdkSkuQuerySkuQueryDo{
OuCode: storeCode1,
SkuCodes: &skuCode,
}})
if err != nil {
data2 = append(data2, v)
continue
}
storeCode := *result
if len(storeCode) > 0 && utils.Str2Float64WithDefault(*storeCode[0].Model.SalePrice, 0) < 5 {
param := &request585.AlibabaWdkSkuUpdateRequest{}
updateSkuList := make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
updateSku := domain585.AlibabaWdkSkuUpdateSkuDo{
OuCode: storeCode1,
SkuCode: utils.String2Pointer(skuCode[0]),
SkuPrice: utils.String2Pointer(utils.Float64ToStr(utils.Str2Float64WithDefault(*storeCode[0].Model.SalePrice, 0) + 2)), // 优先使用skuPrice 靠后SalePrice
}
updateSkuList = append(updateSkuList, updateSku)
param.ParamList = &updateSkuList
_, err := apiTao.UpdateStoreSku(param)
if err != nil {
data2 = append(data2, v)
continue
}
}
}
updateSkuList = append(updateSkuList, updateSku)
param.ParamList = &updateSkuList
data, err := apiTao.UpdateStoreSku(param)
globals.SugarLogger.Debugf("data = %s", utils.Format4Output(data, false))
globals.SugarLogger.Debugf("err = %s", utils.Format4Output(err, false))
globals.SugarLogger.Debugf("data2 :============ %s", utils.Format4Output(data2, false))
}
// 商品上下架