liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-11 13:47:50 +08:00
parent 6deada8e0b
commit 969e26af02
7 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/jxcallback/orderman/order.go
View File

@@ -2442,18 +2442,11 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id
`
sqlParams := []interface{}{vendorOrderID}
dao.GetRows(db, &orderSkus, sql, sqlParams)
if len(orderSkus) < 5 {
return 0, fmt.Errorf("商品数小于5，不允许删除！")
if len(orderSkus) < 3 {
return 0, fmt.Errorf("商品数小于3，不允许删除！")
}
if orderSkus[0].ID == int64(id) {
//if orderSkus[0].JxSkuID == skuID {
return 0, fmt.Errorf("不允许删第一个商品！")
//}
//} else {
// if orderSkus[0].SkuID == skuID {
// return 0, fmt.Errorf("不允许删第一个商品！")
// }
//}
}
for _, v := range order.Skus {
if v.ID == int64(id) {
@@ -2465,21 +2458,6 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id
shopPrice = v.ShopPrice * int64(v.Count)
earningPrice = v.EarningPrice * int64(v.Count)
}
//if v.SkuID == 0 {
// if v.JxSkuID == skuID {
// }
//} else {
// if v.SkuID == skuID {
// sql := `
// DELETE FROM order_sku WHERE id = ?
// `
// sqlParams := []interface{}{v.ID}
// dao.ExecuteSQL(db, sql, sqlParams)
// shopPrice = v.ShopPrice * int64(v.Count)
// earningPrice = v.EarningPrice * int64(v.Count)
// }
//}
}
order.ShopPrice -= shopPrice
order.EarningPrice -= earningPrice

5
business/partner/delivery/dada/waybill.go
View File

@@ -4,7 +4,9 @@ import (
"errors"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"time"
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
@@ -118,6 +120,9 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
tiktokStatusPush(order, msg.OrderStatus)
case model.VendorIDMTWM, model.VendorIDTaoVegetable:
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新
if goodsOrder.VendorID == model.VendorIDTaoVegetable && msg.OrderStatus == dadaapi.OrderStatusAccepted {
tao_vegetable.PushDelivererChangeInfo(goodsOrder, order, tao.TaoDeliveryTypeDD)
}
}
return err

5
business/partner/delivery/fn/waybill.go
View File

@@ -3,9 +3,11 @@ package fn
import (
"fmt"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"strings"
"time"
@@ -311,6 +313,9 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
tiktokStatusPush(order, orderStatus)
case model.VendorIDMTWM, model.VendorIDTaoVegetable:
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新
if good.VendorID == model.VendorIDTaoVegetable && cc.OrderStatus == fnpsapi.OrderStatusAssigned {
tao_vegetable.PushDelivererChangeInfo(good, order, tao.TaoDeliveryTypeFN)
}
}
return fnpsapi.Err2CallbackResponse(nil, "")
}

6
business/partner/delivery/mtps/waybill.go
View File

@@ -10,6 +10,7 @@ import (
"strings"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -18,6 +19,7 @@ import (
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/delivery"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/client/orm"
@@ -139,12 +141,14 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
// 加入调度器
err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
switch order.OrderVendorID {
case model.VendorIDDD:
pushMTPSToTiktok(msg.Status, order)
case model.VendorIDMTWM, model.VendorIDTaoVegetable:
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新
if goodsOrder.VendorID == model.VendorIDTaoVegetable && msg.Status == mtpsapi.OrderStatusAccepted {
tao_vegetable.PushDelivererChangeInfo(goodsOrder, order, tao.TaoDeliveryTypeMT)
}
}
return err

5
business/partner/delivery/sfps/waybill.go
View File

@@ -3,6 +3,8 @@ package sfps
import (
"errors"
"fmt"
tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"time"
"git.rosy.net.cn/jx-callback/globals"
@@ -400,6 +402,9 @@ func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackRespons
tiktokStatusPush(order, orderStatus)
case model.VendorIDTaoVegetable, model.VendorIDMTWM:
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新
if good.VendorID == model.VendorIDTaoVegetable && orderStatus == sfps2.OrderStatusTakeOrder {
tao_vegetable.PushDelivererChangeInfo(good, order, tao.TaoDeliveryTypeSF)
}
}
return sfps2.Err2CallbackResponse(nil)
}

5
business/partner/delivery/uupt/waybill.go
View File

@@ -2,6 +2,8 @@ package uupt
import (
"fmt"
tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"strings"
"time"
@@ -386,6 +388,9 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp
tiktokStatusPush(param, req.State)
case model.VendorIDMTWM, model.VendorIDTaoVegetable:
delivery.GetOrderRiderInfoToPlatform(param.VendorOrderID, param.Status) // 骑手位置更新
if good.VendorID == model.VendorIDTaoVegetable && req.State == uuptapi.StateRMGrabsOrder {
tao_vegetable.PushDelivererChangeInfo(good, param, tao.TaoDeliveryTypeOther)
}
}
return uuptapi.Err2CallbackResponse(nil)
}

14
business/partner/purchase/tao_vegetable/order.go
View File

@@ -251,6 +251,20 @@ func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, par
return getAPI(vendorOrgCode, 0, vendorStoreID).DeliveryTrajectory(req)
}
func PushDelivererChangeInfo(order *model.GoodsOrder, bill *model.Waybill, deliveryType string) error {
param := &request591.AlibabaAelophyOrderDelivererChangeRequest{
DelivererChangeRequest: &domain591.AlibabaAelophyOrderDelivererChangeDelivererChangeRequest{
StoreId: utils.String2Pointer(order.VendorStoreID),
BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
DelivererName: utils.String2Pointer(bill.CourierName),
DelivererPhone: utils.String2Pointer(bill.CourierMobile),
DelivererCompany: nil,
LogisticsNo: utils.String2Pointer(bill.VendorWaybillID),
},
}
return getAPI(order.VendorOrgCode, 0, "").DelivererChange(param)
}
func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) {
order, _, err = p.getOrder(vendorOrgCode, utils.Str2Int64(vendorOrderID), vendorStoreID)
return order, err