liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-07-12 15:27:53 +08:00
parent 15a0c91452 d53ae43639
commit 8b192ad547
21 changed files with 154 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/jxcallback/orderman/order.go
View File

@@ -172,8 +172,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
}
}()
globals.SugarLogger.Debugf("========OnOrderStatusChanged : %s", vendorOrgCode)
globals.SugarLogger.Debugf("========OnOrderStatusChanged : %s", utils.Format4Output(orderStatus, false))
// 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下
if orderStatus != nil {
if orderStatus.Status == model.OrderStatusAccepted {
@@ -184,11 +182,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
}
}
} else {
globals.SugarLogger.Debugf("========loadOrder : %s", utils.Format4Output(loadOrder, false))
loadOrder.Status = model.OrderStatusAccepted
loadOrder.VendorStatus = tao_vegetable.OrderStatusNew
c.UpdateOrderFields(loadOrder, []string{"Status", "VendorStatus"})
globals.SugarLogger.Debugf("========loadOrder : %s", utils.Format4Output(loadOrder, false))
}
}
}
@@ -2447,14 +2443,7 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id
return 0, fmt.Errorf("商品数小于3，不允许删除！")
}
if orderSkus[0].ID == int64(id) {
//if orderSkus[0].JxSkuID == skuID {
return 0, fmt.Errorf("不允许删第一个商品！")
//}
//} else {
// if orderSkus[0].SkuID == skuID {
// return 0, fmt.Errorf("不允许删第一个商品！")
// }
//}
}
for _, v := range order.Skus {
if v.ID == int64(id) {
@@ -2466,21 +2455,6 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id
shopPrice = v.ShopPrice * int64(v.Count)
earningPrice = v.EarningPrice * int64(v.Count)
}
//if v.SkuID == 0 {
// if v.JxSkuID == skuID {
// }
//} else {
// if v.SkuID == skuID {
// sql := `
// DELETE FROM order_sku WHERE id = ?
// `
// sqlParams := []interface{}{v.ID}
// dao.ExecuteSQL(db, sql, sqlParams)
// shopPrice = v.ShopPrice * int64(v.Count)
// earningPrice = v.EarningPrice * int64(v.Count)
// }
//}
}
order.ShopPrice -= shopPrice
order.EarningPrice -= earningPrice