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

微信支付退款

Browse Source
This commit is contained in:
gazebo
2019-11-21 09:20:56 +08:00
parent 75caa1fffd
commit db9e80212f
8 changed files with 207 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,9 +74,15 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, orderStatus *model.Or
if order.Status == model.OrderStatusUnknown {
order.Status = model.OrderStatusNew
}
isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db)
if err == nil && !isDuplicated {
isDuplicated, err = c.SaveOrder(order, false, db)
var isDuplicated bool
if order.Status == model.OrderStatusNew && order.VendorID == model.VendorIDJX && !model.IsOrderJXTemp(order) {
isDuplicated, _, err = c.addOrderStatus(orderStatus, db)
} else {
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
if err == nil && !isDuplicated {
isDuplicated, err = c.SaveOrder(order, false, db)
}
}
if err == nil {
dao.Commit(db)
@@ -268,7 +274,6 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
}
order.ConsigneeName = utils.LimitUTF8StringLen(order.ConsigneeName, 32)
// globals.SugarLogger.Debugf("saveOrder isAdjust:%t, order:%v", isAdjust, order)
created, _, err2 := db.Db.ReadOrCreate(order, "VendorOrderID", "VendorID")
if err = err2; err == nil {
originalOrder := &model.GoodsOrderOriginal{