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-26 11:58:57 +08:00
parent af4060a6c4
commit 3cc3fc5fc2
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/partner/delivery/rider.go
View File

@@ -409,7 +409,14 @@ func UpdateFakeWayBillToTiktok() {
// 设置骑手和下一状态时间 // 设置骑手和下一状态时间
makeRiderInfo(fakeWayBill[i], riderInfo) makeRiderInfo(fakeWayBill[i], riderInfo)
if riderInfo.CourierName == "" && fakeWayBill[i].CourierName != "" {
riderInfo.CourierName = fakeWayBill[i].CourierName
riderInfo.CourierPhone = fakeWayBill[i].CourierMobile
}
if riderInfo.CourierName == "" && fakeWayBill[i].CourierName == "" {
riderInfo.CourierName = "石锋"
riderInfo.CourierPhone = "18048531223"
}
if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider { if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider {
riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone) riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
} }
@@ -452,7 +459,7 @@ func UpdateFakeWayBillToTiktok() {
globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error()) globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())
} }
// 饿百订单推送订单送达 // 饿百订单推送订单送达
if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM { if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDTaoVegetable || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM {
if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil { if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {
globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err) globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err)
} }

4
business/partner/purchase/tao_vegetable/order_afs.go
View File

@@ -71,10 +71,10 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
var err error var err error
var db = dao.GetDB() var db = dao.GetDB()
orderStatus, scarceGoods := c.callbackAfsMsg2Status(status, msg) orderStatus, scarceGoods := c.callbackAfsMsg2Status(status, msg)
// 用户取消售后
switch status { switch status {
case tao_vegetable.OrderStatusApplyAfs: case tao_vegetable.OrderStatusApplyAfs:
refundData := msg.(*tao_vegetable.UserApplyRefundCallBack) refundData := msg.(*tao_vegetable.UserApplyRefundCallBack)
globals.SugarLogger.Debugf("================OrderStatusApplyAfs : %s", utils.Format4Output(msg, false))
var afsOrder *model.AfsOrder var afsOrder *model.AfsOrder
var api = getAPI("", 0, refundData.StoreId) var api = getAPI("", 0, refundData.StoreId)
@@ -289,12 +289,14 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
if scarceGoods != nil { if scarceGoods != nil {
var afsOrder *model.AfsOrder var afsOrder *model.AfsOrder
refundSuccess := msg.(*tao_vegetable.RefundOrderFinish) refundSuccess := msg.(*tao_vegetable.RefundOrderFinish)
globals.SugarLogger.Debugf("================OrderStatusRefundSuccess : %s", utils.Format4Output(msg, false))
var api = getAPI("", 0, refundSuccess.StoreId) var api = getAPI("", 0, refundSuccess.StoreId)
afsOrder = &model.AfsOrder{ afsOrder = &model.AfsOrder{
VendorID: model.VendorIDTaoVegetable, VendorID: model.VendorIDTaoVegetable,
AfsOrderID: refundSuccess.OutMainRefundId, AfsOrderID: refundSuccess.OutMainRefundId,
VendorOrderID: orderStatus.RefVendorOrderID, VendorOrderID: orderStatus.RefVendorOrderID,
VendorOrderID2: refundSuccess.BizSubRefundId,
VendorStoreID: refundSuccess.StoreId, VendorStoreID: refundSuccess.StoreId,
StoreID: 0, StoreID: 0,
AfsCreatedAt: orderStatus.StatusTime, AfsCreatedAt: orderStatus.StatusTime,