123
This commit is contained in:
@@ -584,7 +584,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
|
|||||||
storeOrder.OrderFinishedAt = time.Now()
|
storeOrder.OrderFinishedAt = time.Now()
|
||||||
storeOrder.Status = model.OrderStatusFinished
|
storeOrder.Status = model.OrderStatusFinished
|
||||||
if _, err = dao.UpdateEntity(dao.GetDB(), storeOrder, "OrderFinishedAt", "Status"); err == nil {
|
if _, err = dao.UpdateEntity(dao.GetDB(), storeOrder, "OrderFinishedAt", "Status"); err == nil {
|
||||||
partner.CurStoreAcctManager.InsertBrandBill(nil, storeOrder.BrandID, storeOrder.ActualPayPrice, 1, 1, "")
|
partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, storeOrder.BrandID, storeOrder.ActualPayPrice, 1, 1, "")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case model.PayTypeTL_BrandBillCharge:
|
case model.PayTypeTL_BrandBillCharge:
|
||||||
@@ -602,7 +602,6 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
|
|||||||
priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 0, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
|
priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 0, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
|
||||||
if len(priceDefendOrders) > 0 {
|
if len(priceDefendOrders) > 0 {
|
||||||
priceDefendOrders[0].IsPay = model.YES
|
priceDefendOrders[0].IsPay = model.YES
|
||||||
dao.UpdateEntity(dao.GetDB(), priceDefendOrders[0], "IsPay")
|
|
||||||
err = nil
|
err = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user