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-04-11 09:34:12 +08:00
parent d0bae37a7f
commit 56ad26ba07
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxcallback/orderman/order_afs.go
View File

@@ -50,11 +50,9 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
afsOrder.Status = orderStatus.Status
}
if order, _ := c.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID); order != nil {
globals.SugarLogger.Debugf("order 1 := %s", utils.Format4Output(order, false))
if order.ConsigneeMobile2 == "" {
if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
if order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, order.VendorStoreID); order2 != nil && order.ConsigneeMobile != order2.ConsigneeMobile {
globals.SugarLogger.Debugf("order 2 := %s", utils.Format4Output(order2, false))
order.ConsigneeMobile = order2.ConsigneeMobile
c.UpdateOrderFields(order, []string{"ConsigneeMobile"})
}
@@ -98,11 +96,7 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
if afsOrder.RefundType == model.AfsTypeFullRefund {
isAdjust = true
}
globals.SugarLogger.Debugf("afsOrder 1 := %s", utils.Format4Output(afsOrder, false))
globals.SugarLogger.Debugf("orderStatus 1 := %s", utils.Format4Output(orderStatus, false))
globals.SugarLogger.Debugf("isAdjust 1 := %s", utils.Format4Output(isAdjust, false))
if err = c.SaveAfsOrder(db, afsOrder, isAdjust); err != nil {
globals.SugarLogger.Debugf("SaveAfsOrder := %s", utils.Format4Output(err, false))
return err
}
}
@@ -113,9 +107,6 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
}
func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isDeleteFirst bool) (err error) {
defer func() {
globals.SugarLogger.Debugf("===========err defer %v", err)
}()
if db == nil {
db = dao.GetDB()
}
@@ -155,9 +146,8 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD
deductionsByPm := afsOrder.PmSubsidyMoney + afsOrder.AfsFreightMoney + afsOrder.BoxMoney + afsOrder.TongchengFreightMoney
afsOrder.RefundMoneyByCal = afsOrder.SkuUserMoney + afsOrder.FreightUserMoney + deductionsByPm - afsOrder.PmRefundMoney
// order.TotalMoney += order.SkuJxMoney // 退款单京西补贴部分先不作计算
globals.SugarLogger.Debugf("=====SaveAfsOrder===== := %s", utils.Format4Output(afsOrder, false))
if err = dao.CreateEntity(db, afsOrder); err != nil {
globals.SugarLogger.Debugf("=CreateEntity 1 ==========: %v", utils.Format4Output(err, false))
globals.SugarLogger.Debugf("=afsOrder 1 ==========: %v", utils.Format4Output(afsOrder, false))
return err
}
@@ -167,8 +157,6 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD
utils.Float64TwoInt64(float64(afsOrder.RefundMoneyByCal-afsOrder.PmSkuSubsidyMoney)*float64(orderSku.UserMoney+orderSku.PmSubsidyMoney-orderSku.PmSkuSubsidyMoney)/float64(afsOrder.SkuUserMoney+afsOrder.PmSubsidyMoney-afsOrder.PmSkuSubsidyMoney))
afsOrder.Skus[0].RefundMoneyByCal += orderSku.RefundMoneyByCal
if err = dao.CreateEntity(db, orderSku); err != nil {
globals.SugarLogger.Debugf("=CreateEntity 1 ==========: %v", utils.Format4Output(err, false))
globals.SugarLogger.Debugf("=afsOrder 1 ==========: %v", utils.Format4Output(afsOrder, false))
return err
}
}

3
business/partner/purchase/jx/order_afs.go
View File

@@ -47,6 +47,9 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
if orderPays[0].PayType == model.PayTypeTicTok {
_, err = localjx.RefundOrderByTT(ctx, orderPays[0], order.VendorOrderID, int(order.SkuUserMoney), reason)
}
if orderPays[0].PayType == model.PayTypeKuaiShou {
_, err = localjx.RefundOrderByKS(ctx, orderPays[0], order.VendorOrderID, int(order.SkuUserMoney), reason)
}
if err != nil {
return err
} else {