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:36:44 +08:00
parent b66f11b9ad
commit 034a753655
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,6 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
sku.SkuID = sku.JxSkuID sku.SkuID = sku.JxSkuID
} }
if err = dao.CreateEntity(db, sku); err != nil { if err = dao.CreateEntity(db, sku); err != nil {
globals.SugarLogger.Debugf("===============sku1 := %v", err)
if !dao.IsDuplicateError(err) { if !dao.IsDuplicateError(err) {
return err return err
} }
@@ -121,7 +120,6 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
sku.JxDeductionsMoney = deductionsByJx - sku.JxDeductionsMoney sku.JxDeductionsMoney = deductionsByJx - sku.JxDeductionsMoney
sku.JxShopMoney = order.JxShopMoney - sku.JxShopMoney sku.JxShopMoney = order.JxShopMoney - sku.JxShopMoney
if err = dao.CreateEntity(db, sku); err != nil { if err = dao.CreateEntity(db, sku); err != nil {
globals.SugarLogger.Debugf("===============sku2 := %v", err)
if !dao.IsDuplicateError(err) { if !dao.IsDuplicateError(err) {
return err return err
} }
@@ -134,7 +132,6 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera
// 加上京西对单条sku的补贴，再存数据库 // 加上京西对单条sku的补贴，再存数据库
order.JxSubsidyMoney += order.JxSkuSubsidyMoney order.JxSubsidyMoney += order.JxSkuSubsidyMoney
if err = dao.CreateEntity(db, order); err != nil { if err = dao.CreateEntity(db, order); err != nil {
globals.SugarLogger.Debugf("===============sku3 := %v", err)
if !dao.IsDuplicateError(err) { if !dao.IsDuplicateError(err) {
return err return err
} }

1
business/partner/purchase/tao_vegetable/financial.go
View File

@@ -137,7 +137,6 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData url.Values) (afsOrd
// 存储美团正向订单结账信息 // 存储美团正向订单结账信息
func (p *PurchaseHandler) OnOrderDetail(result *domain591.AlibabaAelophyOrderGetOrderResponse, operation string) (err error) { func (p *PurchaseHandler) OnOrderDetail(result *domain591.AlibabaAelophyOrderGetOrderResponse, operation string) (err error) {
err = partner.CurOrderManager.SaveOrderFinancialInfo(p.OrderDetail2Financial(result), operation) err = partner.CurOrderManager.SaveOrderFinancialInfo(p.OrderDetail2Financial(result), operation)
globals.SugarLogger.Debugf("=============OrderFinancial := %v", err)
return err return err
} }

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

@@ -157,8 +157,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
} }
if len(activityId) > 0 { if len(activityId) > 0 {
//sku.StoreSubID = activityId[0] //sku.StoreSubName = strings.Join(activityName, ",")
sku.StoreSubName = strings.Join(activityName, ",")
} }
if sku.Weight == 0 { if sku.Weight == 0 {
sku.Weight = 222 // 如果名字里找不到缺省给半斤左右的一个特别值 sku.Weight = 222 // 如果名字里找不到缺省给半斤左右的一个特别值
@@ -353,8 +352,7 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
if err == nil { if err == nil {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh { if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {
err3 := c.OnOrderDetail(orderMap, partner.CreatedPeration) c.OnOrderDetail(orderMap, partner.CreatedPeration)
globals.SugarLogger.Debugf("========err3 %v", err3)
if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDTaoVegetable); handler != nil { if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDTaoVegetable); handler != nil {
handler.AcceptOrRefuseOrder(order, true, "jxAdmin") handler.AcceptOrRefuseOrder(order, true, "jxAdmin")
} }