github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复退款报错，修复资金流水

Browse Source
This commit is contained in:
evoxwht 2022-02-18 09:24:10 +08:00
parent 7ee125f2bd
commit cb15bc29c9
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
crmeb/app/adminapi/controller/v1/statistic/FlowStatistic.php Normal file
View File

@ -0,0 +1,74 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\adminapi\controller\v1\statistic;
use app\adminapi\controller\AuthController;
use app\services\statistic\CapitalFlowServices;
use think\facade\App;
class FlowStatistic extends AuthController
{
/**
* @param App $app
* @param CapitalFlowServices $services
*/
public function __construct(App $app, CapitalFlowServices $services)
{
parent::__construct($app);
$this->services = $services;
}
/**
* 资金流水
* @return mixed
*/
public function getFlowList()
{
$where = $this->request->getMore([
['time', ''],
['trading_type', 0],
['keywords', ''],
['ids', ''],
['export', 0]
]);
$date = $this->services->getFlowList($where);
return app('json')->success($date);
}
/**
* 资金流水备注
* @param $id
* @return mixed
*/
public function setMark($id)
{
$data = $this->request->postMore([
['mark', '']
]);
$this->services->setMark($id, $data);
return app('json')->success('备注成功！');
}
/**
* 账单记录
* @return mixed
*/
public function getFlowRecord()
{
$where = $this->request->getMore([
['type', 'day'],
['time', '']
]);
$data = $this->services->getFlowRecord($where);
return app('json')->success($data);
}
}

2
crmeb/app/services/order/StoreOrderSplitServices.php
View File

@ -82,7 +82,7 @@ class StoreOrderSplitServices extends BaseServices
$other_cart_ids[] = $other;
}
$cart_ids_arr = ['new' => $cart_ids, 'other' => $other_cart_ids];
if (empty($cart_ids_arr['other'])) return $old_order;
if (empty($cart_ids_arr['other'])) return [$old_order, ['id' => 0]];
return $this->transaction(function () use ($id, $cart_ids_arr, $orderInfo, $orderInfoOld, $cartInfo, $storeOrderCreateServices, $storeOrderCartInfoServices, $statusService) {
$order = $otherOrder = [];
$statusData = $statusService->getColumn(['oid' => $id], '*');