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-25 16:27:36 +08:00
parent 7420769c9c
commit d6075a5e8b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/IndexController.php
View File

@ -12,6 +12,7 @@ use app\common\model\system_store\SystemStore;
use app\common\service\pay\PayService;
use app\common\service\PushService;
use app\common\service\wechat\WechatTemplate;
use app\statistics\logic\OrderLogic;
use Exception;
use support\Cache;
use think\facade\Db;
@ -28,7 +29,8 @@ class IndexController extends BaseApiController
public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config'];
public function index()
{
{ $all_where['paid'] = 1;
d(OrderLogic::dayPayPrice($all_where,date('Y-m-d',time())));
$uid=9;
$a= PushService::push('wechat_mmp_'.$uid, $uid, ['type'=>'INDUSTRYMEMBERS','msg'=>'支付超时,订单已被取消,请重新提交订单','data'=>['id'=>5]]);

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

@ -35,6 +35,7 @@ use app\common\model\system_store\SystemStore;
use app\common\model\user_recharge\UserRecharge;
use app\common\service\ConfigService;
use app\common\service\FileService;
use app\statistics\logic\OrderLogic;
/**
@ -82,7 +83,9 @@ class WorkbenchLogic extends BaseLogic
//门店收益金额
$data['income_amount'] = StoreFinanceFlow::where($storeFinanceWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('number');
//门店收款金额
$data['receipt_amount'] = UserRecharge::where($userRechargeWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('price');
$all_where['paid'] = 1;
$data['receipt_amount'] = OrderLogic::dayPayPrice($all_where,date('Y-m-d',time()));
// $data['receipt_amount'] = UserRecharge::where($userRechargeWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('price');
//保证金金额
$data['deposit_amount'] = StoreFinanceFlow::where($storeFinanceWhereTwo)->whereBetweenTime('create_time', $startTime, $endTime)->sum('number');
//门店成交用户数