diff --git a/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php b/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php index f005e2e03..a5bae6f02 100644 --- a/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php +++ b/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php @@ -30,53 +30,6 @@ class StoreFinanceFlowController extends BaseAdminController } - /** - * @notes 添加门店流水 - * @return \think\response\Json - * @author admin - * @date 2024/05/31 16:56 - */ - public function add() - { - $params = (new StoreFinanceFlowValidate())->post()->goCheck('add'); - $result = StoreFinanceFlowLogic::add($params); - if (true === $result) { - return $this->success('添加成功', [], 1, 1); - } - return $this->fail(StoreFinanceFlowLogic::getError()); - } - - - /** - * @notes 编辑门店流水 - * @return \think\response\Json - * @author admin - * @date 2024/05/31 16:56 - */ - public function edit() - { - $params = (new StoreFinanceFlowValidate())->post()->goCheck('edit'); - $result = StoreFinanceFlowLogic::edit($params); - if (true === $result) { - return $this->success('编辑成功', [], 1, 1); - } - return $this->fail(StoreFinanceFlowLogic::getError()); - } - - - /** - * @notes 删除门店流水 - * @return \think\response\Json - * @author admin - * @date 2024/05/31 16:56 - */ - public function delete() - { - $params = (new StoreFinanceFlowValidate())->post()->goCheck('delete'); - StoreFinanceFlowLogic::delete($params); - return $this->success('删除成功', [], 1, 1); - } - /** * @notes 获取门店流水详情 diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index 00c75b096..7dfa79216 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -4,9 +4,13 @@ namespace app\admin\lists\store_finance_flow; use app\admin\lists\BaseAdminDataLists; +use app\common\enum\OrderEnum; +use app\common\enum\PayEnum; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\lists\ListsSearchInterface; - +use app\common\model\financial_record\FinancialRecord; +use app\common\model\system_store\SystemStoreStaff; +use app\common\model\user\User; /** * 门店流水列表 @@ -26,7 +30,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt public function setSearch(): array { return [ - '=' => ['store_id', 'uid', 'create_time'], + '=' => ['store_id', 'user_id', 'create_time'], ]; } @@ -42,11 +46,24 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt */ public function lists(): array { - return StoreFinanceFlow::where($this->searchWhere) - ->field(['id', 'uid', 'staff_id', 'order_id', 'link_id', 'type', 'pay_type', 'remark', 'trade_time']) + return FinancialRecord::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select() + ->select()->each(function ($item) { + if($item['user_id']<=0){ + $item['nickname']='游客'; + }else{ + $item['nickname']=User::where('id',$item['user_id'])->value('nickname'); + } + if($item['financial_pm']==0){ + $item['number']='-'.$item['number']; + }else{ + $item['number']='+'.$item['number']; + } + $item['staff_name']=SystemStoreStaff::where('id',$item['staff_id'])->value('staff_name'); + $item['pay_type_name']=PayEnum::getPaySceneDesc($item['pay_type']); + $item['financial_type_name']=OrderEnum::getFinancialType($item['financial_type']); + }) ->toArray(); } diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 4fed49152..e1e33cacb 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -4,6 +4,7 @@ namespace app\admin\lists\store_order; use app\admin\lists\BaseAdminDataLists; +use app\common\enum\PayEnum; use app\common\model\store_order\StoreOrder; use app\common\lists\ListsSearchInterface; @@ -46,7 +47,10 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select() + ->select()->each(function($item){ + $item['pay_type_name']=PayEnum::getPaySceneDesc($item['pay_type']); + return $item; + }) ->toArray(); } diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index a74942a9b..5c3c64476 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -212,6 +212,7 @@ class StoreProductLogic extends BaseLogic 'bar_code' => $find['bar_code'], 'cate_id' => $find['cate_id'], 'price' => $find['price'], + 'unit' => $find['unit'], 'store_id' => $store_id, 'sales' => 0, 'stock' => $stock, diff --git a/app/common/enum/PayEnum.php b/app/common/enum/PayEnum.php index 5926c3129..ad9523f06 100644 --- a/app/common/enum/PayEnum.php +++ b/app/common/enum/PayEnum.php @@ -56,14 +56,6 @@ class PayEnum - //支付场景 - const SCENE_H5 = 1; //H5 - const SCENE_OA = 2; //微信公众号 - const SCENE_MNP = 3; //微信小程序 - const SCENE_APP = 4; //APP - const SCENE_PC = 5; //PC商城 - - /** * @notes 获取支付类型 * @param bool $value @@ -116,11 +108,22 @@ class PayEnum public static function getPaySceneDesc($value = true) { $data = [ - self::SCENE_H5 => 'H5', - self::SCENE_OA => '微信公众号', - self::SCENE_MNP => '微信小程序', - self::SCENE_APP => 'APP', - self::SCENE_PC => 'PC', + self::WECHAT_PAY_H5 => '微信H5', + self::WECHAT_PAY_JSAPI => '微信JSAPI', + self::WECHAT_PAY_MINI => '微信小程序', + self::WECHAT_PAY_APP => '微信APP', + self::ALIPAY_H5 => '支付宝H5', + self::ALIPAY_MINI => '支付宝小程序', + self::ALIPAY_APP => '支付宝APP', + self::GOODS_FIRST_PAYMENT_LATER => '货到付款', + self::CORPORATE_TRANSFER => '企业转账', + self::CASH_PAY => '现金支付', + self::WECHAT_PAY_QRCODE => '微信二维码', + self::WECHAT_PAY_BARCODE => '微信条码', + self::ALIPAY_QRCODE => '支付宝二维码', + self::ALIPAY_BARCODE => '支付宝条码', + self::BALANCE_PAY => '余额支付', + ]; if ($value === true) { return $data;