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

123

Browse Source
This commit is contained in:
邹宗楠
2021-12-30 11:01:02 +08:00
parent ed4d77c244
commit 4db5c77c90
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/model/order.go
View File

@@ -501,6 +501,7 @@ type StoreAcctOrder struct {
VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"`
VendorID int `orm:"column(vendor_id)" json:"vendorID"` VendorID int `orm:"column(vendor_id)" json:"vendorID"`
StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid
BrandID int `orm:"column(brand_id)"json:"brandID"` //外部系统里记录的brandID
ActualPayPrice int `json:"actualPayPrice"` // 单位为分 顾客实际支付 ActualPayPrice int `json:"actualPayPrice"` // 单位为分 顾客实际支付
UserID string `orm:"column(user_id);size(48);index" json:"userID"` UserID string `orm:"column(user_id);size(48);index" json:"userID"`
OrderType int `json:"orderType"` OrderType int `json:"orderType"`

2
business/partner/purchase/jx/localjx/order.go
View File

@@ -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.InsertStoreAcctIncomeAndUpdateStoreAcctBalance(nil, storeOrder.StoreID, storeOrder.ActualPayPrice, partner.StoreAcctTypeIncomePay, orderPay.VendorOrderID, 0) partner.CurStoreAcctManager.InsertBrandBill(nil, storeOrder.BrandID, storeOrder.ActualPayPrice, 1, 1, "")
} }
} }
case model.PayTypeTL_BrandBillCharge: case model.PayTypeTL_BrandBillCharge: