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

Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store

Browse Source
This commit is contained in:
luofei 2024-06-04 10:23:59 +08:00
commit 825f29a09a
4 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
View File

@ -8,7 +8,6 @@ use app\common\enum\OrderEnum;
use app\common\enum\PayEnum; use app\common\enum\PayEnum;
use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_finance_flow\StoreFinanceFlow;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\financial_record\FinancialRecord;
use app\common\model\system_store\SystemStoreStaff; use app\common\model\system_store\SystemStoreStaff;
use app\common\model\user\User; use app\common\model\user\User;
@ -46,7 +45,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
*/ */
public function lists(): array public function lists(): array
{ {
return FinancialRecord::where($this->searchWhere) return StoreFinanceFlow::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($item) { ->select()->each(function ($item) {

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

@ -10,12 +10,12 @@ use Webman\Config;
class IndexController extends BaseApiController class IndexController extends BaseApiController
{ {
public $notNeedLogin = ['app_update','express_list','province','city','area','street']; public $notNeedLogin = ['index','app_update','express_list','province','city','area','street'];
public function index() public function index()
{ {
d(2);
$params=['store_id'=>2,'pay_type'=>17]; $params=['store_id'=>2,'pay_type'=>17];
$a=StoreOrderLogic::createOrder([1],0,null,$params); $a=StoreOrderLogic::createOrder([1],0,null,$params);

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

@ -4,17 +4,9 @@ namespace app\common\logic;
use app\common\enum\OrderEnum; use app\common\enum\OrderEnum;
use app\common\enum\PayEnum; use app\common\enum\PayEnum;
use app\common\enum\user\AccountLogEnum;
use app\common\model\operation\Opurchaseclass;
use app\common\model\order\Cart;
use app\common\model\financial_record\FinancialRecord;
use app\common\model\recharge\RechargeOrder;
use app\common\model\retail\Cashierclass;
use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_finance_flow\StoreFinanceFlow;
use app\common\model\store_order\StoreOrder; use app\common\model\store_order\StoreOrder;
use app\common\model\user\User;
use app\common\service\PushService; use app\common\service\PushService;
use app\common\service\wechat\WeChatMnpService;
use support\Log; use support\Log;
use think\facade\Db; use think\facade\Db;
use Webman\RedisQueue\Redis; use Webman\RedisQueue\Redis;
@ -107,7 +99,7 @@ class PayNotifyLogic extends BaseLogic
'store_id' => $order['store_id'], 'store_id' => $order['store_id'],
'staff_id' => $order['staff_id'], 'staff_id' => $order['staff_id'],
]; ];
(new FinancialRecord())->saveAll($record); (new StoreFinanceFlow())->saveAll($record);
if ($order->pay_type == 9) { if ($order->pay_type == 9) {
@ -151,7 +143,7 @@ class PayNotifyLogic extends BaseLogic
'store_id' => $order['store_id'], 'store_id' => $order['store_id'],
'staff_id' => $order['staff_id'], 'staff_id' => $order['staff_id'],
]; ];
(new FinancialRecord())->saveAll($record); (new StoreFinanceFlow())->saveAll($record);
} }
/** /**
@ -211,7 +203,7 @@ class PayNotifyLogic extends BaseLogic
'type' => OrderEnum::MERCHANT, 'type' => OrderEnum::MERCHANT,
'mer_id' => $order['merchant'], 'mer_id' => $order['merchant'],
]; ];
(new FinancialRecord())->saveAll($record); (new StoreFinanceFlow())->saveAll($record);
if ($order->pay_type == 9) { if ($order->pay_type == 9) {

22
app/common/model/financial_record/FinancialRecord.php
View File

@ -1,22 +0,0 @@
<?php
namespace app\common\model\financial_record;
use app\common\model\BaseModel;
use think\model\concern\SoftDelete;
/**
* 财务流水模型
* Class FinancialRecord
* @package app\common\model\financial_record
*/
class FinancialRecord extends BaseModel
{
use SoftDelete;
protected $name = 'financial_record';
protected $deleteTime = 'delete_time';
}