Merge branch 'master' of https://e.coding.net/rosydev/baseapi

platformapi/mtpsapi/riderInfo.go

@@ -4,9 +4,9 @@ const (
 	DaDaCode     = "10002" // 达达配送
 	FnPsCode     = "10004" // 蜂鸟配送
 	MTPsCode     = "10032" // 美团配送
-	UUPTCode     = "10006" //uu跑腿
+	UUPTCode     = "10006" // uu跑腿
-	SFPSCode     = "10007" //顺丰配送
+	SFPSCode     = "10007" // 顺丰配送
-	DYPsCode     = "10018" //抖音配送(小时达)
+	DYPsCode     = "10018" // 抖音配送(小时达)
 	MyselfPsCode = "10015" // 自送
 )
 

platformapi/sfps2/order.go

@@ -14,7 +14,6 @@ func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err er
 	//补全默认参数
 	preOrder.PushTime = time.Now().Unix()
 	preOrder.DevId = a.devId
-	globals.SugarLogger.Debugf("PreCreateOrder req=%s", utils.Format4Output(preOrder, false))
 	resp := a.HttpPostJson("precreateorder", preOrder)
 	if resp.HttpStatusCode != HttpStatusSuccessCode {
 		return 0, errors.New("HTTP请求错误，请检查重试")
@@ -25,7 +24,6 @@ func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err er
 	retVal := PreCreateOrderResp{}
 	s, _ := json.Marshal(resp.BaseRetVal.Result)
 	if err = json.Unmarshal(s, &retVal); err == nil {
-		globals.SugarLogger.Debugf("PreCreateOrder resp=%s", utils.Format4Output(retVal, false))
 		return retVal.ChargePriceList.ShopPayPrice, nil
 	} else {
 		return 0, err

platformapi/tao_vegetable/api_token.go

@@ -12,13 +12,12 @@ const (
 	AppSecret  = "fda9a7045262e3aa1f26ca508a9be242"
 	ServerUrl  = "https://eco.taobao.com/router/rest"             // 正式环境https
 	ServerUrl2 = "https://qimen.api.taobao.com/top/router/qmtest" // 沙箱环境https
-
+	ServerUrl3 = "http://qimen.api.taobao.com/top/router/qm"      // 正式环境http
-	ServerUrl3 = "http://qimen.api.taobao.com/top/router/qm"     // 正式环境http
+	ServerUrl4 = "http://qimen.api.taobao.com/top/router/qmtest"  // 沙箱环境http
-	ServerUrl4 = "http://qimen.api.taobao.com/top/router/qmtest" // 沙箱环境http
 )
 
 func NewTaoVegetable(appKey, appSecret, serverUrl string) *API {
-	return &API{client: topsdk.NewDefaultTopClient(appKey, appSecret, serverUrl, 2000, 2000)}
+	return &API{client: topsdk.NewDefaultTopClient(appKey, appSecret, serverUrl, 10000, 10000)}
 }
 
 type API struct {

platformapi/tao_vegetable/order_afs.go

@@ -28,13 +28,14 @@ func (a *API) AgreeUserCancel(req *request2.AlibabaTclsAelophyRefundAgreeRequest
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return fmt.Errorf(*data.Result.ReturnMsg)
 	}
+	globals.SugarLogger.Debugf("进入AgreeUserCancel := %s", utils.Format4Output(data, false))
 
 	return nil
 }
 
 // DisAgreeUserCancel 拒绝用户售后申请
 func (a *API) DisAgreeUserCancel(req *request2.AlibabaTclsAelophyRefundDisagreeRequest) error {
-	globals.SugarLogger.Debugf("进入 DisAgreeUserCancel")
+	globals.SugarLogger.Debugf("进入 DisAgreeUserCancel : %s", utils.Format4Output(req, false))
 	client := ability3156.NewAbility3156(&a.client)
 
 	data, _ := client.AlibabaTclsAelophyRefundDisagree(req, a.token)
@@ -43,6 +44,7 @@ func (a *API) DisAgreeUserCancel(req *request2.AlibabaTclsAelophyRefundDisagreeR
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return fmt.Errorf(*data.Result.ReturnMsg)
 	}
+	globals.SugarLogger.Debugf("进入 DisAgreeUserCancel : %s", utils.Format4Output(data, false))
 
 	return nil
 }
@@ -58,21 +60,23 @@ func (a *API) PartialRefundReason(req *request2.AlibabaTclsAelophyRefundCsapplyr
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return nil, fmt.Errorf(*data.ApiResult.ErrMsg)
 	}
+	globals.SugarLogger.Debugf("PartialRefundReason := %s", utils.Format4Output(data, false))
 
 	return data.ApiResult.Model, nil
 }
 
 // PartialRefund 商户逆向取消订单
-func (a *API) PartialRefund(req *request2.AlibabaTclsAelophyRefundCsapplyRequest) error {
+func (a *API) PartialRefund(req *request2.AlibabaTclsAelophyRefundCsapplyNewRequest) error {
-	globals.SugarLogger.Debugf("进入 PartialRefund")
+	globals.SugarLogger.Debugf("PartialRefund := %s", utils.Format4Output(req, false))
 	client := ability3156.NewAbility3156(&a.client)
 
-	data, _ := client.AlibabaTclsAelophyRefundCsapply(req, a.token)
+	data, _ := client.AlibabaTclsAelophyRefundCsapplyNew(req, a.token)
 
 	if !*data.ApiResult.Success {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return fmt.Errorf(*data.ApiResult.ErrMsg)
 	}
+	globals.SugarLogger.Debugf("PartialRefund := %s", utils.Format4Output(data, false))
 
 	return nil
 }

platformapi/tao_vegetable/order_delivery.go

@@ -60,7 +60,7 @@ func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackReques
 
 // DeliveryTrajectory 自配送轨迹回传(骑手开始配送之后同步订单数据)
 func (a *API) DeliveryTrajectory(req *request2.AlibabaAelophyOrderLogisticsTraceCallbackRequest) error {
-	globals.SugarLogger.Debugf("进入 DeliveryTrajectory")
+	globals.SugarLogger.Debugf("进入 DeliveryTrajectory : %s", utils.Format4Output(req, false))
 	client := ability591.NewAbility591(&a.client)
 
 	data, _ := client.AlibabaAelophyOrderLogisticsTraceCallback(req, a.token)
@@ -69,6 +69,21 @@ func (a *API) DeliveryTrajectory(req *request2.AlibabaAelophyOrderLogisticsTrace
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return fmt.Errorf(*data.ApiResult.ErrMsg)
 	}
-
+	globals.SugarLogger.Debugf("进入 DeliveryTrajectory : %s", utils.Format4Output(data, false))
+	return nil
+}
+
+// DelivererChange 骑手信息变化时传入
+func (a *API) DelivererChange(req *request2.AlibabaAelophyOrderDelivererChangeRequest) error {
+	globals.SugarLogger.Debugf("进入 DelivererChange : %s", utils.Format4Output(req, false))
+	client := ability591.NewAbility591(&a.client)
+
+	data, _ := client.AlibabaAelophyOrderDelivererChange(req, a.token)
+
+	if !*data.ApiResult.Success {
+		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
+		return fmt.Errorf(*data.ApiResult.ErrMsg)
+	}
+	globals.SugarLogger.Debugf("进入 DelivererChange : %s", utils.Format4Output(data, false))
 	return nil
 }

platformapi/tao_vegetable/order_test.go

@@ -21,7 +21,7 @@ func TestName(t *testing.T) {
 func TestGetOrderDetail(t *testing.T) {
 	requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
 		StoreId:    utils.String2Pointer("JX668594"),
-		BizOrderId: utils.Int64ToPointer(5000900001958720922),
+		BizOrderId: utils.Int64ToPointer(5000900194372970922),
 	}}
 	data, err := apiTao.QueryOrderDetail(requestParam)
 	globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
@@ -45,7 +45,7 @@ func TestQueryAfsOrderDetail(t *testing.T) {
 		OrderFrom: utils.Int64ToPointer(31),
 		ShopId:    nil,
 		StoreId:   utils.String2Pointer("JX668594"),
-		RefundIds: &[]int64{1311956159},
+		RefundIds: &[]int64{1314241374},
 	}
 	data, err := apiTao.QueryAfsOrderDetail(param)
 	globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
@@ -57,11 +57,11 @@ func TestDeliveryFinishACCEPTED(t *testing.T) {
 	param := &request591.AlibabaAelophyOrderWorkCallbackRequest{}
 	param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
 		StoreId:                      utils.String2Pointer("JX668594"),
-		BizOrderId:                   utils.Int64ToPointer(5000894158854290922),
+		BizOrderId:                   utils.Int64ToPointer(5000900574962430922),
-		Status:                       utils.String2Pointer("ACCEPTED"),
+		Status:                       utils.String2Pointer("SIGN"),
 		StatusRemark:                 nil,
-		DelivererName:                nil,
+		DelivererName:                utils.String2Pointer("张廷"),
-		DelivererPhone:               nil,
+		DelivererPhone:               utils.String2Pointer("SIGN"),
 		WorkCallbackSubOrderInfoList: nil,
 		DelivererCompany:             nil,
 		LogisticsNo:                  nil,
@@ -131,8 +131,8 @@ func TestPickUp(t *testing.T) {
 	param := &request591.AlibabaAelophyOrderWorkCallbackRequest{}
 	param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
 		StoreId:    utils.String2Pointer("JX668594"),
-		BizOrderId: utils.Int64ToPointer(5000897449678380922),
+		BizOrderId: utils.Int64ToPointer(5000900604228190922),
-		Status:     utils.String2Pointer(OrderStatusPickedUp),
+		Status:     utils.String2Pointer("SHIPPING"),
 	}
 
 	workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0)
@@ -166,3 +166,36 @@ func TestString(t *testing.T) {
 	//skuName := skuSt[a2+12 : a3-5]
 	//fmt.Println(skuName)
 }
+
+// 骑手变更
+func TestDelivererChange(t *testing.T) {
+	param := &request591.AlibabaAelophyOrderDelivererChangeRequest{
+		DelivererChangeRequest: &domain591.AlibabaAelophyOrderDelivererChangeDelivererChangeRequest{
+			StoreId:          utils.String2Pointer("JX668594"),
+			BizOrderId:       utils.Int64ToPointer(5000900610990770922),
+			DelivererName:    utils.String2Pointer("张廷"),
+			DelivererPhone:   utils.String2Pointer("13302290396"),
+			DelivererCompany: utils.String2Pointer(TaoDeliveryTypeSELF),
+			LogisticsNo:      utils.String2Pointer("1504611792359260160"),
+		},
+	}
+	apiTao.DelivererChange(param)
+}
+
+// 骑手坐标
+func TestDeliveryTrajectory(t *testing.T) {
+	param := &request591.AlibabaAelophyOrderLogisticsTraceCallbackRequest{
+		LogisticsTraceCallbackRequest: &domain591.AlibabaAelophyOrderLogisticsTraceCallbackLogisticsTraceCallbackRequest{
+			StoreId:    utils.String2Pointer("JX668594"),
+			BizOrderId: utils.Int64ToPointer(5000900574962430922),
+			Longitude:  utils.String2Pointer("104045460"),
+			Latitude:   utils.String2Pointer("30693001"),
+			UpdateTime: (*util.LocalTime)(utils.Time2Pointer(time.Now())),
+		},
+	}
+	apiTao.DeliveryTrajectory(param)
+}
+
+func TestS(t *testing.T) {
+	fmt.Println(1 % 20)
+}

platformapi/tao_vegetable/tao_consts.go

@@ -86,6 +86,17 @@ const (
 	OrderStatusChange        = "orderStatusChange" // 订单状态变化
 )
 
+const (
+	TaoDeliveryTypeFN    = "FENGNIAO" // 蜂鸟
+	TaoDeliveryTypeMT    = "MEITUAN"  // 美团
+	TaoDeliveryTypeDD    = "DADA"     // 达达
+	TaoDeliveryTypeSF    = "SHUNFENG" // 顺丰
+	TaoDeliveryTypeELM   = "ELEZB"    // 饿了么众包
+	TaoDeliveryTypeSS    = "BINGEX"   // 闪送
+	TaoDeliveryTypeSELF  = "SELF"     // 商家自送
+	TaoDeliveryTypeOther = "OTHER"    // 其他运力
+)
+
 func IsErrCategoryExist(err error) (isExist bool) {
 	return utils.IsErrMatch(err, ErrCodeSkuCategoryExist, nil)
 }

platformapi/tao_vegetable/upload_img.go

@@ -10,22 +10,15 @@ import (
 
 // UploadImg 上传图片
 func (a *API) UploadImg(param *request.AlibabaWdkPictureUploadRequest) (string, error) {
+	globals.SugarLogger.Debugf("UploadImg param := %s", utils.Format4Output(param, false))
 	client := ability1475.NewAbility1475(&a.client)
 
-	data, err := client.AlibabaWdkPictureUpload(param, a.token)
+	data, _ := client.AlibabaWdkPictureUpload(param, a.token)
 	globals.SugarLogger.Debugf("===UploadImg data ======== : %s", utils.Format4Output(data, false))
-	globals.SugarLogger.Debugf("===UploadImg data ======== : %s", utils.Format4Output(err, false))
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return "", err
-	}
-
 	if data.Result.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.Result, false))
 		return "", fmt.Errorf(*data.Result.ErrMsg)
 	}
 
-	globals.SugarLogger.Debugf("UploadImg Data := %s", utils.Format4Output(data, false))
-
 	return *data.Result.Model.FullUrl, nil
 }