diff --git a/business/jxstore/cms/store_acct.go b/business/jxstore/cms/store_acct.go index 2518e0356..5569ecf3a 100644 --- a/business/jxstore/cms/store_acct.go +++ b/business/jxstore/cms/store_acct.go @@ -10,7 +10,6 @@ import ( ) type StoreAcctManager struct { - DB *dao.DaoDB } var ( @@ -18,9 +17,7 @@ var ( ) func init() { - FixedStoreAcctManager = &StoreAcctManager{ - DB: dao.GetDB(), - } + FixedStoreAcctManager = &StoreAcctManager{} partner.InitStoreAcctManager(FixedStoreAcctManager) } @@ -28,7 +25,7 @@ func (s *StoreAcctManager) InsertStoreAcctIncome(ctx *jxcontext.Context, storeID var ( userID, userName string goodsVendorOrderID string - db = s.DB + db = dao.GetDB() ) if ctx != nil { userID = ctx.GetUserID() @@ -60,7 +57,7 @@ func (s *StoreAcctManager) InsertStoreAcctIncome(ctx *jxcontext.Context, storeID func (s *StoreAcctManager) InsertStoreAcctExpend(ctx *jxcontext.Context, storeID, price, acctType int, vendorOrderID string) (err error) { var ( userID, userName string - db = s.DB + db = dao.GetDB() ) if ctx != nil { userID = ctx.GetUserID() @@ -89,7 +86,7 @@ func (s *StoreAcctManager) InsertStoreAcctExpend(ctx *jxcontext.Context, storeID func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeID, price int, isIncome bool) (err error) { var ( - db = s.DB + db = dao.GetDB() ) globals.SugarLogger.Debugf("UpdateStoreAcctBalance storeID: [%v] , price :[%v] ,", storeID, price) if ctx == nil { @@ -152,10 +149,11 @@ func (s *StoreAcctManager) InsertStoreAcctIncomeAndUpdateStoreAcctBalance(ctx *j func (s *StoreAcctManager) CheckStoreAcctExpendExist(vendorOrderID string) (isEqual, isZero bool, err error) { var ( expends, incomes int + db = dao.GetDB() ) globals.SugarLogger.Debugf("CheckStoreAcctExpendExist orderID:[%v]", vendorOrderID) - expends, err = dao.GetStoreAcctExpendTotal(s.DB, 0, []int{partner.StoreAcctTypeExpendCreateWaybillEx, partner.StoreAcctTypeRealFeeExpend}, vendorOrderID, utils.ZeroTimeValue, utils.ZeroTimeValue) - incomes, err = dao.GetStoreAcctIncomeTotal(s.DB, 0, []int{partner.StoreAcctTypeRealFeeIncome, partner.StoreAcctTypeIncomeCancelTemp, partner.StoreAcctTypeIncomeCancelReal}, vendorOrderID, utils.ZeroTimeValue, utils.ZeroTimeValue) + expends, err = dao.GetStoreAcctExpendTotal(db, 0, []int{partner.StoreAcctTypeExpendCreateWaybillEx, partner.StoreAcctTypeRealFeeExpend}, vendorOrderID, utils.ZeroTimeValue, utils.ZeroTimeValue) + incomes, err = dao.GetStoreAcctIncomeTotal(db, 0, []int{partner.StoreAcctTypeRealFeeIncome, partner.StoreAcctTypeIncomeCancelTemp, partner.StoreAcctTypeIncomeCancelReal}, vendorOrderID, utils.ZeroTimeValue, utils.ZeroTimeValue) if expends != incomes { if expends > incomes { return false, false, err @@ -173,5 +171,5 @@ func (s *StoreAcctManager) CheckStoreAcctExpendExist(vendorOrderID string) (isEq } func (s *StoreAcctManager) GetStoreAcctExpendLastCreateWayBillFee(vendorOrderID string) (lastFee int, err error) { - return dao.GetStoreAcctExpendLastCreateWayBillFee(s.DB, vendorOrderID) + return dao.GetStoreAcctExpendLastCreateWayBillFee(dao.GetDB(), vendorOrderID) }