mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改报错和查询用户余额支付

Browse Source
This commit is contained in:
liu 2024-06-18 12:10:21 +08:00
parent b67259a91e
commit 79e89fa22d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/logic/CapitalFlowLogic.php
View File

@ -50,13 +50,14 @@ class CapitalFlowLogic extends BaseLogic
/** /**
* 用户支出 * 用户支出
* @param $category * @param $category
* @param $store_id
* @param $linkType * @param $linkType
* @param $linkId * @param $linkId
* @param $amount * @param $amount
* @param $mark * @param $mark
* @return mixed * @return mixed
*/ */
public function userExpense($store_id=0,$category, $linkType, $linkId, $amount, $mark = '',$payType=0) public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0,$store_id=0,)
{ {
$model = new CapitalFlow(); $model = new CapitalFlow();
$model->uid = $this->user['id']; $model->uid = $this->user['id'];

6
app/common/logic/PayNotifyLogic.php
View File

@ -78,7 +78,7 @@ class PayNotifyLogic extends BaseLogic
$user->save(); $user->save();
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense($order['store_id'],'user_order_pay', 'order', $order['id'], $order['pay_price']); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']);
// self::afterPay($order); // self::afterPay($order);
// Redis::send('push-platform-print', ['id' => $order['id']], 60); // Redis::send('push-platform-print', ['id' => $order['id']], 60);
// PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
@ -112,7 +112,7 @@ class PayNotifyLogic extends BaseLogic
$user->save(); $user->save();
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense($order['store_id'],'user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1,$order['store_id']);
if ($user['user_ship'] == 1) { if ($user['user_ship'] == 1) {
VipLogic::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); VipLogic::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
} }
@ -151,7 +151,7 @@ class PayNotifyLogic extends BaseLogic
} else { } else {
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
//微信支付和用户余额无关 //微信支付和用户余额无关
$capitalFlowDao->userExpense($order['store_id'],'user_order_pay', 'order', $order['id'], $order->pay_price, '', 1); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1,$order['store_id']);
} }

12
app/store/logic/WorkbenchLogic.php
View File

@ -21,6 +21,7 @@ use app\common\enum\YesNoEnum;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\logic\store_order\StoreOrderLogic; use app\common\logic\store_order\StoreOrderLogic;
use app\common\logic\StoreFinanceFlowLogic; use app\common\logic\StoreFinanceFlowLogic;
use app\common\model\finance\CapitalFlow;
use app\common\model\order\Cart; use app\common\model\order\Cart;
use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow;
use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_finance_flow\StoreFinanceFlow;
@ -582,7 +583,7 @@ class WorkbenchLogic extends BaseLogic
$cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id']) $cash_all = StoreCashFinanceFlow::where('store_id',$params['store_id'])
->where('status',YesNoEnum::YES) ->where('status',YesNoEnum::YES)
->sum('receipts'); ->sum('receivable');
if(isset($params['month']) && $params['month']){ if(isset($params['month']) && $params['month']){
$all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']]) $all = StoreOrder::where(['paid'=>YesNoEnum::YES,'store_id'=>$params['store_id']])
->whereMonth('create_time', $params['month']) ->whereMonth('create_time', $params['month'])
@ -599,11 +600,10 @@ class WorkbenchLogic extends BaseLogic
->sum('pay_price'); ->sum('pay_price');
$profit_all = $all $profit_all = $all
->sum('profit'); ->sum('profit');
$cost_all = $all //消耗余额 V2.0
->sum('cost'); $cost_all = CapitalFlow::
where(['category'=>'user_order_balance_pay','store_id'=>$params['store_id']])
->sum('amount');
$time = self::getLastSevenDays(); $time = self::getLastSevenDays();
$newArr = []; $newArr = [];