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 15:54:43 +08:00
parent 0367c61d05
commit 84a2921cfa
6 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -584,7 +584,8 @@ 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.InsertBrandBill(jxcontext.AdminCtx, storeOrder.BrandID, storeOrder.ActualPayPrice, 1, 1, "")
brandID, _ := dao.GetStoreBrandID(dao.GetDB(), storeOrder.StoreID)
partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, brandID, storeOrder.ActualPayPrice, 1, 1, "")
}
}
case model.PayTypeTL_BrandBillCharge:
@@ -2485,12 +2486,11 @@ func RefreshCouponsStatus(ctx *jxcontext.Context) (err error) {
return err
}
func CreateStoreAcctOrder(ctx *jxcontext.Context, orderType, storeID, price int, goodsVendorOrderID string, brandID int) (vendorOrderID string, err error) {
func CreateStoreAcctOrder(ctx *jxcontext.Context, orderType, storeID, price int, goodsVendorOrderID string) (vendorOrderID string, err error) {
var (
db = dao.GetDB()
storeAcct = &model.StoreAcct{
StoreID: storeID,
BrandID: brandID,
}
)
if err = dao.GetEntity(db, storeAcct, "StoreID"); err != nil && dao.IsNoRowsError(err) {
@@ -2503,7 +2503,6 @@ func CreateStoreAcctOrder(ctx *jxcontext.Context, orderType, storeID, price int,
VendorOrderID: utils.Int64ToStr(jxutils.GenOrderNo()),
UserID: ctx.GetUserID(),
StoreID: storeID,
BrandID: brandID,
OrderType: orderType,
Status: model.OrderStatusWait4Pay,
ActualPayPrice: price,