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-10-26 14:25:05 +08:00
parent 4aae44d74f
commit 397a7d4340
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/financial.go
View File

@@ -17,7 +17,6 @@ const (
// 处理正向订单结账信息
func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, operation string) (err error) {
globals.SugarLogger.Debugf("=============OrderFinancial := %s", utils.Format4Output(order, false))
db := dao.GetDB()
txDB, _ := dao.Begin(db)
defer func() {
@@ -101,6 +100,7 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
sku.SkuID = sku.JxSkuID
}
if err = dao.CreateEntity(db, sku); err != nil {
globals.SugarLogger.Debugf("===============sku1 := %v", err)
if !dao.IsDuplicateError(err) {
return err
}
@@ -121,6 +121,7 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
sku.JxDeductionsMoney = deductionsByJx - sku.JxDeductionsMoney
sku.JxShopMoney = order.JxShopMoney - sku.JxShopMoney
if err = dao.CreateEntity(db, sku); err != nil {
globals.SugarLogger.Debugf("===============sku2 := %v", err)
if !dao.IsDuplicateError(err) {
return err
}
@@ -133,6 +134,7 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
// 加上京西对单条sku的补贴，再存数据库
order.JxSubsidyMoney += order.JxSkuSubsidyMoney
if err = dao.CreateEntity(db, order); err != nil {
globals.SugarLogger.Debugf("===============sku3 := %v", err)
if !dao.IsDuplicateError(err) {
return err
}

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

@@ -348,15 +348,11 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
// 商户接单/支付完成代表新订单
if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {
order, orderMap, err2 := c.getOrder("", msg.BizOrderId, msg.StoreId)
globals.SugarLogger.Debugf("=============order := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=============orderMap := %s", utils.Format4Output(orderMap, false))
globals.SugarLogger.Debugf("=============err2 := %v", err)
if err = err2; err == nil {
err = partner.CurOrderManager.OnOrderNew(order, status)
if err == nil {
utils.CallFuncAsync(func() {
if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {
globals.SugarLogger.Debugf("=============orderMap := %s", utils.Format4Output(orderMap, false))
c.OnOrderDetail(orderMap, partner.CreatedPeration)
if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDTaoVegetable); handler != nil {
handler.AcceptOrRefuseOrder(order, true, "jxAdmin")