diff --git a/business/model/order.go b/business/model/order.go index 77b737b9c..b17dee902 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -501,6 +501,7 @@ type StoreAcctOrder struct { VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` VendorID int `orm:"column(vendor_id)" json:"vendorID"` StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid + BrandID int `orm:"column(brand_id)"json:"brandID"` //外部系统里记录的brandID ActualPayPrice int `json:"actualPayPrice"` // 单位为分 顾客实际支付 UserID string `orm:"column(user_id);size(48);index" json:"userID"` OrderType int `json:"orderType"` diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index b7811d2e5..f37c028d6 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -584,7 +584,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { storeOrder.OrderFinishedAt = time.Now() storeOrder.Status = model.OrderStatusFinished 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: