充值问题

app/business/controllers/UserController.php

@@ -124,7 +124,7 @@ class UserController extends BaseController
 		$upData['balance'] = $totalBalance;
 		$upData['totalRecharge'] = $totalRecharge;
 		$merchantAsset = MerchantAssetService::getByMerchantId($this->merchantId);
-		$return = xhRechargeService::recharge($rechargeAmount, $user, $this->adminId, $this->merchant, $this->merchantExtend, $merchantAsset, true);
+		$return = xhRechargeService::recharge($rechargeAmount, $user, $this->adminId, $this->merchant, $this->merchantExtend, $merchantAsset);
 		if ($return['code'] == 'A0001') {
 			util::ok();
 		}

common/services/xhRechargeService.php

@@ -21,7 +21,7 @@ class xhRechargeService
 	
 	public static function getById($id)
 	{
-		return xhRecharge::getByCondition(['id'=>$id]);
+		return xhRecharge::getByCondition(['id' => $id]);
 	}
 	
 	public static function updateById($id, $data)
@@ -38,7 +38,7 @@ class xhRechargeService
 		if ($recharge['status'] == 1) {
 			return ['status' => false, 'msg' => '订单已经充值成功了'];
 		}
-
+		
 		$userId = $recharge['userId'];
 		$user = xhUserService::getById($userId);
 		$merchantId = $recharge['merchantId'];
@@ -47,7 +47,7 @@ class xhRechargeService
 		$merchantExtend = xhMerchantExtendService::getByMerchantId($merchantId);
 		$merchantAsset = xhMerchantAssetService::getByMerchantId($merchantId);
 		$rechargeAmount = $amount;
-
+		
 		$connection = Yii::$app->db;//事务处理
 		$transaction = $connection->beginTransaction();
 		try {
@@ -151,7 +151,7 @@ class xhRechargeService
 			$totalBalance = stringUtil::calcAdd($userAsset['balance'], $rechargeAmount);
 			$totalRecharge = stringUtil::calcAdd($userAsset['totalRecharge'], $rechargeAmount);
 			$merchantTotalRecharge = stringUtil::calcAdd($merchantAsset['totalRecharge'], $rechargeAmount);
-
+			
 			$rechargeData = [
 				'payWay' => $payWay,
 				'payStyle' => $payStyle,
@@ -164,10 +164,10 @@ class xhRechargeService
 				'addTime' => $now,
 				'userTotalRecharge' => $totalRecharge,
 				'merchantTotalRecharge' => $merchantTotalRecharge,
-				'status'=>1,
+				'status' => 1,
 			];
 			$order = self::add($rechargeData);//用户充值记录增加
-
+			
 			$upData['integral'] = $totalIntegral;
 			$upData['balance'] = $totalBalance;
 			$upData['totalRecharge'] = $totalRecharge;
@@ -176,7 +176,7 @@ class xhRechargeService
 			$mPreDeal = $merchantAsset['totalDeal'];
 			$mDeal = $mPreDeal + 1;//交易量+1
 			$upMData = ['totalDeal' => $mDeal, 'totalRecharge' => $merchantTotalRecharge];
-			xhMerchantAssetService::incomeChangeAsset($merchant, $merchantAsset, $upMData, $order, $capitalType);//商家资产变化
+			xhMerchantAssetService::incomeChangeAsset($merchant, $merchantAsset, $upMData, $order, $capitalType, true);//商家资产变化
 			
 			$integralData = [
 				'userId' => $userId,