aa

business/jxstore/cms/store_acct.go

@@ -6,6 +6,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 type StoreAcctManager struct {
@@ -22,11 +23,13 @@ func init() {
 
 func (s *StoreAcctManager) InsertStoreAcctIncome(ctx *jxcontext.Context, db *dao.DaoDB, storeID, price, acctType int, vendorOrderID string) (err error) {
 	var (
-		userID, userName string
+		userID, userName   string
+		goodsVendorOrderID string
 	)
 	if ctx != nil {
 		userID = ctx.GetUserID()
 		userName = ctx.GetUserName()
+		goodsVendorOrderID = vendorOrderID
 	} else {
 		storeOrder := &model.StoreAcctOrder{
 			VendorOrderID: vendorOrderID,
@@ -34,16 +37,19 @@ func (s *StoreAcctManager) InsertStoreAcctIncome(ctx *jxcontext.Context, db *dao
 		if err = dao.GetEntity(db, storeOrder, "VendorOrderID"); err == nil && storeOrder.ID != 0 {
 			userID = storeOrder.UserID
 			userName = storeOrder.LastOperator
+			goodsVendorOrderID = storeOrder.GoodsVendorOrderID
 		}
 	}
 	storeAcctIncome := &model.StoreAcctIncome{
-		StoreID:     storeID,
-		IncomePrice: price,
-		Type:        acctType,
-		UserID:      userID,
+		StoreID:       storeID,
+		IncomePrice:   price,
+		Type:          acctType,
+		UserID:        userID,
+		VendorOrderID: goodsVendorOrderID,
 	}
 	dao.WrapAddIDCULEntity(storeAcctIncome, userName)
 	err = dao.CreateEntity(db, storeAcctIncome)
+	globals.SugarLogger.Debugf("InsertStoreAcctIncome orderID: [%v] , price :[%v] , type :[%v]", vendorOrderID, price, acctType)
 	return err
 }
 
@@ -72,6 +78,7 @@ func (s *StoreAcctManager) InsertStoreAcctExpend(ctx *jxcontext.Context, db *dao
 	}
 	dao.WrapAddIDCULEntity(storeAcctExpend, userName)
 	err = dao.CreateEntity(db, storeAcctExpend)
+	globals.SugarLogger.Debugf("InsertStoreAcctExpend orderID: [%v] , price :[%v] , type :[%v]", vendorOrderID, price, acctType)
 	return err
 }
 
@@ -79,17 +86,13 @@ func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeI
 	var (
 		db = dao.GetDB()
 	)
+	globals.SugarLogger.Debugf("UpdateStoreAcctBalance storeID: [%v] , price :[%v] ,", storeID, price)
 	if ctx == nil {
 		ctx = jxcontext.AdminCtx
 	}
 	storeAcct := &model.StoreAcct{
 		StoreID: storeID,
 	}
-	if isIncome {
-		storeAcct.AccountBalance += price
-	} else {
-		storeAcct.AccountBalance -= price
-	}
 	dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil || err != nil {
@@ -107,10 +110,17 @@ func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeI
 			return err
 		}
 	} else {
+		globals.SugarLogger.Debugf("UpdateStoreAcctBalance1 storeID: [%v] , balance :[%v] ,", storeID, storeAcct.AccountBalance)
+		if isIncome {
+			storeAcct.AccountBalance += price
+		} else {
+			storeAcct.AccountBalance -= price
+		}
 		if _, err = dao.UpdateEntity(db, storeAcct, "AccountBalance"); err != nil {
 			dao.Rollback(db)
 			return err
 		}
+		globals.SugarLogger.Debugf("UpdateStoreAcctBalance2 storeID: [%v] , balance :[%v] ,", storeID, storeAcct.AccountBalance)
 	}
 	dao.Commit(db)
 	return err