diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index 21bb07231..4d723fc4c 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -146,7 +146,11 @@ 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 // 退款单京西补贴部分先不作计算 + if afsOrder.VendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====afsOrder2 %s", utils.Format4Output(afsOrder, false)) + } if err = dao.CreateEntity(db, afsOrder); err != nil { + globals.SugarLogger.Debugf("=====err300 %v", err) return err } @@ -155,14 +159,22 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD orderSku.RefundMoneyByCal = orderSku.PmSkuSubsidyMoney + 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 afsOrder.VendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====orderSku %s", utils.Format4Output(orderSku, false)) + } if err = dao.CreateEntity(db, orderSku); err != nil { + globals.SugarLogger.Debugf("=====err300 %v", err) return err } } if len(afsOrder.Skus) > 0 { orderSku := afsOrder.Skus[0] orderSku.RefundMoneyByCal = afsOrder.RefundMoneyByCal - orderSku.RefundMoneyByCal + if afsOrder.VendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====orderSku %s", utils.Format4Output(orderSku, false)) + } if err = dao.CreateEntity(db, orderSku); err != nil { + globals.SugarLogger.Debugf("=====orderSku err300 %v", err) return err } } else { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 0f695475e..2dc44fe51 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1847,10 +1847,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } // 增加门店地址修改同步 - globals.SugarLogger.Debugf("========storeMap := %s", utils.Format4Output(storeMap, false)) storeDetail, err := dao.GetStoreBaseByVendorStoreID(storeMap.VendorStoreID, storeMap.VendorID) - globals.SugarLogger.Debugf("========storeDetail := %s", utils.Format4Output(storeDetail, false)) - globals.SugarLogger.Debugf("========err := %v", err) address := "" if err != nil || storeDetail == nil { return 0, fmt.Errorf("基础门店信息异常,请联系管理员") diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index a79ad7df2..b0619c6a9 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -61,6 +61,9 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) { if orderStatus := c.callbackAfsMsg2Status(msg); orderStatus != nil { var err error + if orderStatus.RefVendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====orderStatus %s", utils.Format4Output(orderStatus, false)) + } if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew { var afsOrder *model.AfsOrder if msg.Cmd == ebaiapi.CmdOrderPartRefund { @@ -126,7 +129,12 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } } else { - if afsOrder2, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID); afsOrder2 == nil && err == nil { + afsOrder2, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID) + if orderStatus.RefVendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====afsOrder2 %s", utils.Format4Output(afsOrder2, false)) + globals.SugarLogger.Debugf("=====err %v", err) + } + if afsOrder2 == nil && err == nil { partRefundData := msg.Data.(*ebaiapi.CBPartRefundInfo) afsOrder := &model.AfsOrder{ VendorID: model.VendorIDEBAI, @@ -157,8 +165,14 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney afsOrder.Skus = append(afsOrder.Skus, orderSku) } + if orderStatus.RefVendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====afsOrder %s", utils.Format4Output(afsOrder, false)) + } if afsOrder != nil { err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) + if orderStatus.RefVendorOrderID == "4062150144186637882" { + globals.SugarLogger.Debugf("=====err2 %v", err) + } } } else { err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus)