xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source 
# Conflicts:
#	config/route.php
This commit is contained in:
mzl
2025-10-30 14:39:10 +08:00
parent a7d623656d
commit 8c3a445a39
32 changed files with 2004 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/SysConfigController.php
+48
View File
@@ -0,0 +1,48 @@
<?php
namespace app\admin\controller;
use app\common\controller\BaseController;
use app\common\traits\crud\CrudControllerTrait;
use app\admin\service\SysConfigService;
class SysConfigController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new SysConfigService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
return $data;
}
/**
* 数据格式化
*
* @param array $data
* @return array
*/
protected function showFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
return $data;
}
}
app/admin/controller/dashboard/FinStatisticsController.php
+48
View File
@@ -0,0 +1,48 @@
<?php
namespace app\admin\controller\dashboard;
use app\common\controller\BaseController;
use app\common\model\FinReceipt;
use support\Request;
class FinStatisticsController extends BaseController
{
/**
* 收款记录统计
* @param Request $request
* @return \support\Response
*/
public function statistics(Request $request)
{
try {
$query = FinReceipt::where('payment_apply_id','>',0);
$result = [];
//已认领数量
$result['claimed_num'] = $query->count();
//已认领金额
$result['claimed_amount'] = $query->sum('amount');
//未入账数量
$result['unreceived_num'] = FinReceipt::whereNull('received_at')->count();
//未入账金额
$result['unreceived_amount'] = FinReceipt::whereNull('received_at')->sum('amount');
$query = FinReceipt::whereNull('payment_apply_id');
//未认领数量
$result['unclaimed_num'] = $query->count();
//未认领金额
$result['unclaimed_amount'] = $query->sum('amount');
//已超时未认领数量
$result['timeout'] = $query->where('created_at','<',time()-24*3600)->count();
return $this->success($result);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
}
app/admin/logic/SysConfigLogic.php
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace app\admin\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\SysConfig;
class SysConfigLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SysConfig::class;
}
app/admin/service/SysConfigService.php
+83
View File
@@ -0,0 +1,83 @@
<?php
namespace app\admin\service;
use app\admin\validate\SysConfigValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\SysConfig;
use support\Redis;
use support\Request;
class SysConfigService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SysConfig::class;
/**
* 验证器
*/
protected $validator = SysConfigValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 构建查询条件
*/
protected function buildQueryConfig(Request $request, string $scene = 'default'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'index':
// ====== ====== 排序 ====== ======
$config['order']['id'] = 'desc';
// ====== ====== 筛选 ====== ======
// 状态
if (isset($p['status']) && in_array($p['status'], [0,1])) {
$config['where']['status'] = $p['status'];
}
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
foreach (['config_key','config_value','description'] as $col) {
$config['orWhere'][] = [$col, 'like', $k];
}
}
break;
case 'show':
$config['where']['id'] = $p['id'];
//$config['where']['status'] = 1;
break;
case 'store':
break;
case 'update':
$config['where']['id'] = $p['id'];
break;
case 'destroy':
$config['where']['id'] = $p['id'];
break;
}
return $config;
}
public function beforeServiceUpdate($data, Request $request)
{
Redis::del($data['config_key']);
}
}
app/admin/validate/SysConfigValidate.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace app\admin\validate;
use think\Validate;
class SysConfigValidate extends Validate
{
// 规则
protected $rule = [
];
// 提示
protected $message = [
];
// 场景
protected $scene = [
'store' => [
],
'update' => [
]
];
}
app/common/controller/FinPaymentApplyController.php
+128
View File
@@ -0,0 +1,128 @@
<?php
namespace app\common\controller;
use app\common\controller\BaseController;
use app\common\model\Country;
use app\common\model\FinPaymentStock;
use app\common\model\SysAccount;
use app\common\model\SysCurrency;
use app\common\model\SysDictItem;
use app\common\model\User;
use app\common\service\OssService;
use app\common\traits\crud\CrudControllerTrait;
use app\common\service\FinPaymentApplyService;
class FinPaymentApplyController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new FinPaymentApplyService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['doc_user_id'])) //内勤
$data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['sales_user_id'])) //业务员
$data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['corp_id'])) //公司(渠道)
$data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
if (isset($data['account_id'])){ //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
$data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
}
if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
$OssService = new OssService();
if (isset($data['submit_files'])){
$data['submit_files'] = json_decode($data['submit_files'], true);
foreach ($data['submit_files'] as $key => $value) {
$data['submit_files'][$key] = [
'file_src' => $value['file_src'],
'file_full' => $OssService->generatePrivateUrl($value['file_src']),
'file_name' => $value['file_name'],
];
}
}
if (!empty($data['voucher_file'])) {
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
} elseif (isset($data['voucher_file'])) {
$data['voucher_file_full'] = '';
}
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['claimed_at'])){
$data['enter_file_last'] = date('Y-m-d H:i:s', ($data['claimed_at']+86400)); //入账资料最后提交时间
$data['claimed_at'] = date('Y-m-d H:i:s', $data['claimed_at']); //认领时间
}
return $data;
}
/**
* 数据格式化
*
* @param array $data
* @return array
*/
public function showFormat($data)
{
if (isset($data['doc_user_id'])) //内勤
$data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['sales_user_id'])) //业务员
$data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['corp_id'])) //公司(渠道)
$data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
if (isset($data['account_id'])){ //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
$data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
}
if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
$OssService = new OssService();
if (isset($data['submit_files'])){
$data['submit_files'] = json_decode($data['submit_files'], true);
foreach ($data['submit_files'] as $key => $value) {
$data['submit_files'][$key] = [
'file_src' => $value['file_src'],
'file_full' => $OssService->generatePrivateUrl($value['file_src']),
'file_name' => $value['file_name'],
];
}
}
if (!empty($data['voucher_file'])) {
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
} elseif (isset($data['voucher_file'])) {
$data['voucher_file_full'] = '';
}
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
$finPaymentStock = FinPaymentStock::where('payment_apply_id', $data['id'])->get();
$stock = [];
foreach ($finPaymentStock as $v) {
$stock[$v['pi_no']]['pi_no'] = $v['pi_no'];
$stock[$v['pi_no']]['stock_id'][] = [$v['stock_id']];
}
$data['stock'] = array_values($stock);
return $data;
}
}
app/common/controller/FinReceiptController.php
+165
View File
@@ -0,0 +1,165 @@
<?php
namespace app\common\controller;
use app\common\controller\BaseController;
use app\common\model\Country;
use app\common\model\FinPaymentApply;
use app\common\model\FinPaymentStock;
use app\common\model\SysAccount;
use app\common\model\SysCurrency;
use app\common\model\SysDictItem;
use app\common\model\User;
use app\common\service\OssService;
use app\common\traits\crud\CrudControllerTrait;
use app\common\service\FinReceiptService;
use support\Request;
class FinReceiptController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new FinReceiptService();
}
/**
* 确认入账
* @param Request $request
* @return \support\Response
*/
public function credit(Request $request)
{
try {
$id = $request->input('id');
$raw = $this->service->credit($id);
return $this->success($raw);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
public function show(Request $request)
{
try {
$raw = $this->service->serviceShow($request);
$data = $this->transformData($raw, method_exists($this, 'showFormat')
? [$this, 'showFormat']
: null);
return $this->success($data);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
/**
* 更新
*
* @param Request $request 请求对象
* @return mixed 返回更新成功的数据或信息
*/
public function payment(Request $request)
{
try {
$data = $this->validate($this->service->getValidator(), $request->post(), 'update');
$res = $this->service->serviceUpdatePayment($request, $data);
return $this->success([], '更新成功');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['created_at'])){
$data['claim_timeout'] = (($data['created_at'] < (time()-86400)) && empty($data['payment_apply_id'])) ?1:0;
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
}
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['arrived_at']))
$data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
if (isset($data['received_at']))
$data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
if (isset($data['account_id'])) { //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
$data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
}
if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (!empty($data['fx_receipt_file'])){
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
}elseif (isset($data['fx_receipt_file'])){
$data['fx_receipt_file_full'] = '';
}
return $data;
}
/**
* 数据格式化
*
* @param array $data
* @return array
*/
protected function showFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['arrived_at']))
$data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
if (isset($data['received_at']))
$data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
if (isset($data['account_id'])) { //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
$data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
}
if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (!empty($data['fx_receipt_file'])) {
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
} elseif (isset($data['fx_receipt_file'])) {
$data['fx_receipt_file_full'] = '';
}
if (!empty($data['payment_apply_id'])) {
$paymentApply = FinPaymentApply::where('id', $data['payment_apply_id'])->first();
if(!$paymentApply)
return $data;
$paymentApply = $paymentApply->toArray();
$paymentApply['created_at'] = strtotime($paymentApply['created_at']);
$paymentApply['updated_at'] = strtotime($paymentApply['updated_at']);
$paymentApply = (new FinPaymentApplyController())->showFormat($paymentApply);
$data['payment_apply'] = $paymentApply;
}
return $data;
}
/**
* 收款记录统计
* @param Request $request
* @return \support\Response
*/
public function statistics(Request $request)
{
try {
$raw = $this->service->statistics();
return $this->success($raw);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
}
app/common/controller/FinReceiptHisController.php
+98
View File
@@ -0,0 +1,98 @@
<?php
namespace app\common\controller;
use app\common\controller\BaseController;
use app\common\model\Country;
use app\common\model\SysAccount;
use app\common\model\SysCurrency;
use app\common\model\User;
use app\common\service\OssService;
use app\common\traits\crud\CrudControllerTrait;
use app\common\service\FinReceiptHisService;
use support\Request;
class FinReceiptHisController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new FinReceiptHisService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['arrived_at']))
$data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
if (isset($data['received_at']))
$data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
if (isset($data['account_id'])) { //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
$data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
}
if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (!empty($data['fx_receipt_file'])){
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
}elseif (isset($data['fx_receipt_file'])){
$data['fx_receipt_file_full'] = '';
}
if (isset($data['created_by']))
$data['created_by'] = User::where('id', $data['created_by'])->value('name')??'';
if (isset($data['updated_by']))
$data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??'';
return $data;
}
/**
* 数据格式化
*
* @param array $data
* @return array
*/
protected function showFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['arrived_at']))
$data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
if (isset($data['received_at']))
$data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
if (isset($data['account_id'])){ //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
$data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
}
if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (!empty($data['fx_receipt_file'])){
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
}elseif (isset($data['fx_receipt_file'])){
$data['fx_receipt_file_full'] = '';
}
if (isset($data['created_by']))
$data['created_by'] = User::where('id', $data['created_by'])->value('name')??'';
if (isset($data['updated_by']))
$data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??'';
return $data;
}
}
app/common/controller/UploadController.php
+5 -2
View File
@@ -87,12 +87,15 @@ class UploadController
}
$originalName = $file->getUploadName();
$ossservice = new OssService();
$mimes = $ossservice->getMimeTypes(['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'zip', 'rar']);
$result = Storage::adapter('oss')
->path('x_server/' . $sceneUrl . date('Ymd'))
->size(1024*1024*5)
->extYes($mimes)
->upload($file);
$ossservice = new OssService();
$data = [
'original_name' => $originalName,
app/common/logic/FinPaymentApplyLogic.php
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace app\common\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\FinPaymentApply;
class FinPaymentApplyLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = FinPaymentApply::class;
}
app/common/logic/FinReceiptHisLogic.php
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace app\common\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\FinReceiptHis;
class FinReceiptHisLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = FinReceiptHis::class;
}
app/common/logic/FinReceiptLogic.php
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace app\common\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\FinReceipt;
class FinReceiptLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = FinReceipt::class;
public function credit($id)
{
return FinReceipt::where('id', $id)->update(['received_at' => time()]);
}
}
app/common/logic/SysConfigLogic.php
+22
View File
@@ -0,0 +1,22 @@
<?php
namespace app\common\logic;
use app\common\model\SysConfig;
use app\common\model\SysCurrency;
use app\common\traits\crud\CrudLogicTrait;
class SysConfigLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SysCurrency::class;
public function findByKey(string $key)
{
return SysConfig::where('status', 1)->where('config_key', $key)->get(['id', 'config_key', 'config_value']);
}
}
app/common/model/FinPaymentApply.php
+65
View File
@@ -0,0 +1,65 @@
<?php
namespace app\common\model;
use support\Model;
class FinPaymentApply extends Model
{
/**
* The connection name for the model.
*
* @var string|null
*/
protected $connection = 'mysql';
/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'fin_payment_apply';
/**
* The primary key associated with the table.
*
* @var string
*/
protected $primaryKey = 'id';
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = true;
protected $dateFormat = 'U';
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'apply_no', 'doc_user_id', 'sales_user_id', 'corp_id', 'account_id', 'payment_account', 'payment_entity', 'entity_type', 'currency_id', 'amount', 'swift', 'remit_bank', 'country_id', 'remitter', 'exchange_rate', 'total_amount_cny', 'voucher_file', 'voucher_name', 'submit_files','receipt_id','claimed_at','warn', 'created_at', 'updated_at', 'claimed_by',];
/**
* 不允许自动填充模型字段
*/
protected $guarded = [];
/**
* 获取对应的收款记录（1-1，可为空）
*/
public function receipt()
{
return $this->hasOne(FinReceipt::class, 'payment_apply_id', 'id');
}
/**
* 关联的备货单（通过中间表）
*/
public function stocks()
{
return $this->belongsToMany(StockOrders::class, 'fin_payment_stock', 'payment_apply_id', 'stock_id');
}
}
app/common/model/FinPaymentStock.php
+67
View File
@@ -0,0 +1,67 @@
<?php
namespace app\common\model;
use support\Model;
class FinPaymentStock extends Model
{
/**
* The connection name for the model.
*
* @var string|null
*/
protected $connection = 'mysql';
/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'fin_payment_stock';
/**
* The primary key associated with the table.
*
* @var string
*/
protected $primaryKey = 'id';
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = true;
protected $dateFormat = 'U';
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'pi_no', 'payment_apply_id', 'receipt_id', 'stock_id', 'allocated_amount', 'allocated_amount_cny', 'updated_at', 'created_at'];
/**
* 不允许自动填充模型字段
*/
protected $guarded = [];
// 付款申请
public function payment_apply()
{
return $this->belongsTo(FinPaymentApply::class, 'payment_apply_id', 'id');
}
// 收款记录
public function receipt()
{
return $this->belongsTo(FinReceipt::class, 'receipt_id', 'id');
}
// 备货单
public function stock()
{
return $this->belongsTo(StockOrders::class, 'stock_id', 'id');
}
}
app/common/model/FinReceipt.php
+65
View File
@@ -0,0 +1,65 @@
<?php
namespace app\common\model;
use support\Model;
class FinReceipt extends Model
{
/**
* The connection name for the model.
*
* @var string|null
*/
protected $connection = 'mysql';
/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'fin_receipt';
/**
* The primary key associated with the table.
*
* @var string
*/
protected $primaryKey = 'id';
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = true;
protected $dateFormat = 'U';
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'receipt_no', 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'discount_amount', 'total_amount_cny', 'exchange_rate', 'arrived_at', 'received_at', 'voucher_no', 'fx_receipt_file', 'fx_receipt_file_name', 'is_domestic_return', 'created_by', 'updated_by', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
*/
protected $guarded = [];
/**
* 对应的付款申请（1-1，可为空）
*/
public function payment()
{
return $this->belongsTo(FinPaymentApply::class, 'payment_apply_id', 'id');
}
/**
* 关联的备货单（通过中间表）
*/
public function stocks()
{
return $this->belongsToMany(StockOrders::class, 'fin_payment_stock', 'receipt_id', 'stock_id');
}
}
app/common/model/FinReceiptHis.php
+49
View File
@@ -0,0 +1,49 @@
<?php
namespace app\common\model;
use support\Model;
class FinReceiptHis extends Model
{
/**
* The connection name for the model.
*
* @var string|null
*/
protected $connection = 'mysql';
/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'fin_receipt_his';
/**
* The primary key associated with the table.
*
* @var string
*/
protected $primaryKey = 'id';
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = true;
protected $dateFormat = 'U';
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'receipt_id', 'receipt_no', 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'discount_amount', 'total_amount_cny', 'exchange_rate', 'arrived_at', 'received_at', 'voucher_no', 'fx_receipt_file', 'is_domestic_return', 'created_by', 'updated_by', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
*/
protected $guarded = [];
}
app/common/model/StockOrders.php
+16
View File
@@ -107,4 +107,20 @@ class StockOrders extends Model
{
return $this->hasOne(User::class, 'id', 'salesperson_id');
}
/**
* 客户的标签
*/
public function payment()
{
return $this->belongsToMany(FinPaymentApply::class, 'fin_payment_stock', 'stock_id', 'payment_apply_id');
}
/**
* 关联收款记录（多对多，经由中间表）
*/
public function receipts()
{
return $this->belongsToMany(FinReceipt::class, 'fin_payment_stock', 'stock_id', 'receipt_id');
}
}
app/common/model/SysConfig.php
+49
View File
@@ -0,0 +1,49 @@
<?php
namespace app\common\model;
use support\Model;
class SysConfig extends Model
{
/**
* The connection name for the model.
*
* @var string|null
*/
protected $connection = 'mysql';
/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'sys_config';
/**
* The primary key associated with the table.
*
* @var string
*/
protected $primaryKey = 'id';
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = true;
protected $dateFormat = 'U';
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'category', 'config_key', 'config_value', 'config_type', 'description', 'status', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
*/
protected $guarded = [];
}
app/common/service/FinPaymentApplyService.php
+243
View File
@@ -0,0 +1,243 @@
<?php
namespace app\common\service;
use app\common\model\FinPaymentStock;
use app\common\model\FinReceipt;
use app\common\validate\FinPaymentApplyValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\FinPaymentApply;
use support\Redis;
use support\Request;
class FinPaymentApplyService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = FinPaymentApply::class;
/**
* 验证器
*/
protected $validator = FinPaymentApplyValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 构建查询条件
*/
protected function buildQueryConfig(Request $request, string $scene = 'index'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'index':
// ====== ====== 排序 ====== ======
$config['order']['id'] = 'desc';
// ====== ====== 筛选 ====== ======
// 汇款国家
if (isset($p['country_id']) && !empty($p['country_id'])) {
$config['where']['country_id'] = $p['country_id'];
}
// 收款账户筛选
if (isset($p['account_id']) && !empty($p['account_id'])) {
$config['where']['account_id'] = $p['account_id'];
}
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
$config['orWhere'][] = ['remitter', 'like', $k];
}
break;
case 'show':
$config['where']['id'] = $p['id'];
break;
case 'update':
case 'destroy':
$config['where']['id'] = $p['id'];
break;
case 'store':
break;
}
return $config;
}
public function beforeServiceStore($data, Request $request)
{
$data['apply_no'] = $this->generateUniqueApplyNo();
$data['doc_user_id'] = $request->user->uid;
$data['submit_files'] = json_encode($data['submit_files']);
redis::set('stock_' . $data['doc_user_id'], json_encode($request->post('stock')), 'EX', 30);
unset($data['stock']);
return $data;
}
public function afterServiceStore($res)
{
$data = [
'payment_apply_id' => $res['id'],
];
$piStock = json_decode(redis::get('stock_' . $res['doc_user_id']), true);
redis::del('stock' . $res['doc_user_id']);
foreach ($piStock as $stock) {
foreach ($stock['stock_id'] as $v) {
$data['stock_id'] = $v;
$data['pi_no'] = $stock['pi_on'];
FinPaymentStock::create($data);
}
}
}
public function beforeServiceUpdate($data, Request $request)
{
$data['submit_files'] = json_encode($data['submit_files']);
return $data;
}
/**
* 生成唯一的付款申请编码
* 格式：PA + 日期 + 6位字母数字组合
*
* @return string 唯一编码
*/
public function generateUniqueApplyNo()
{
$chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
$maxAttempts = 10; // 防止无限循环
$secondChar = 'PA' . date('Ymd');
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
// 生成后6位随机字符
$suffix = '';
for ($i = 0; $i < 6; $i++) {
$suffix .= $chars[rand(0, strlen($chars) - 1)];
}
$applyNo = $secondChar . $suffix;
// 检查是否已存在
$existing = FinPaymentApply::where('apply_no', $applyNo)->first();
if (!$existing) {
return $applyNo;
}
}
// 如果1000次尝试后仍然重复，使用时间戳确保唯一性
$timestamp = substr(time(), -6);
return $secondChar . $timestamp;
}
/**
* 根据相似度排序付款记录
* @param Request $request
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Pagination\LengthAwarePaginator
*/
public function complexQueryIndex(Request $request)
{
$limit = (int)$request->get('size', 15);
$page = (int)$request->get('current', 1);
$param = $request->all();
$where = [];
// 汇款国家
if (isset($param['country_id']) && !empty($param['country_id'])) {
$where[] = ['country_id', $param['country_id']];
}
// 收款账户筛选
if (isset($param['account_id']) && !empty($param['account_id'])) {
$where[] = ['account_id', $param['account_id']];
}
// 关键字
if (isset($param['keyword']) && $param['keyword']) {
$k = '%' . $param['keyword'] . '%';
$where[] = ['remitter', 'like', $k];
}
// 构建查询
$query = $this->modelClass::where($where);
// 是否已关联收款记录的筛选
$correlation = $param['correlation']??'';
if ($correlation === 'receipt') { //已关联
$query->whereHas('receipt');
} elseif ($correlation === 'unbind') { //未关联
$query->whereDoesntHave('receipt');
}
if ((isset($param['scene']) && $param['scene'] == 'list') || empty($param['receipt_id'])) {
return $query->orderBy('id','desc')->paginate($limit, ['*'], 'page', $page);
}
$receipt = FinReceipt::where('id', $param['receipt_id'])->first();
$account_id = $receipt->account_id;
$currency_id = $receipt->currency_id;
$remitter = $receipt->remitter;
$amount = $receipt->amount;
// 计算十天前的时间戳
$sevenDaysAgo = time() - (10 * 24 * 60 * 60);
// 构建相似度排序逻辑
$similarityOrder = [];
// 如果有传入参数，计算相似度
if (!empty($account_id)) {
$similarityOrder[] = "CASE WHEN account_id = {$account_id} THEN 0 ELSE 1 END";
}
if (!empty($currency_id)) {
$similarityOrder[] = "CASE WHEN currency_id = {$currency_id} THEN 0 ELSE 1 END";
}
if (!empty($remitter)) {
$similarityOrder[] = "CASE WHEN remitter = {$remitter} THEN 0 ELSE 1 END";
}
if (!empty($amount)) {
$amount = (float)$amount;
$similarityOrder[] = "ABS(amount - {$amount}) ASC";
$similarityOrder[] = "CASE WHEN (ABS(amount - {$amount}) / {$amount} * 100) <= 5 THEN 0 ELSE 1 END";
}
// 构建排序SQL
$orderByClause = "";
if (!empty($similarityOrder)) {
$orderByClause = "CASE
WHEN created_at >= {$sevenDaysAgo} THEN
(" . implode(' + ', $similarityOrder) . ")
ELSE 0
END ASC, ";
}
$orderByClause .= "CASE
WHEN created_at > {$sevenDaysAgo} THEN id
ELSE 999999
END DESC, ";
$orderByClause .= "id DESC";
$query->orderByRaw($orderByClause);
return $query->paginate($limit, ['*'], 'page', $page);
}
}
app/common/service/FinReceiptHisService.php
+62
View File
@@ -0,0 +1,62 @@
<?php
namespace app\common\service;
use app\common\validate\FinReceiptHisValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\FinReceiptHis;
use support\exception\BusinessException;
use support\Request;
class FinReceiptHisService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = FinReceiptHis::class;
/**
* 验证器
*/
protected $validator = FinReceiptHisValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 构建查询条件
*/
protected function buildQueryConfig(Request $request, string $scene = 'index'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'index':
if(empty($p['receipt_id'])){
throw new BusinessException('receipt_id不能为空');
}
// ====== ====== 排序 ====== ======
$config['order']['id'] = 'desc';
// ====== ====== 筛选 ====== ======
$config['where']['receipt_id'] = $p['receipt_id'];
break;
case 'show':
$config['where']['id'] = $p['id'];
break;
}
return $config;
}
}
app/common/service/FinReceiptService.php
+319
View File
@@ -0,0 +1,319 @@
<?php
namespace app\common\service;
use app\common\logic\FinReceiptLogic;
use app\common\model\FinPaymentApply;
use app\common\model\FinReceiptHis;
use app\common\validate\FinReceiptValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\FinReceipt;
use support\exception\BusinessException;
use support\Request;
class FinReceiptService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = FinReceipt::class;
/**
* 验证器
*/
protected $validator = FinReceiptValidate::class;
protected $logic;
public function __construct()
{
$this->logic = (new FinReceiptLogic());
}
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 构建查询条件
*/
protected function buildQueryConfig(Request $request, string $scene = 'index'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'index':
// ====== ====== 排序 ====== ======
$config['order']['id'] = 'desc';
// ====== ====== 筛选 ====== ======
// 汇款国家
if (isset($p['country_id']) && !empty($p['country_id'])) {
$config['where']['country_id'] = $p['country_id'];
}
// 没有付款记录的收款记录
if (isset($p['payment_apply']) && $p['payment_apply'] == 'not') { //未认领
$config['where']['payment_apply_id'] = ['null'];
} elseif (isset($p['payment_apply']) && $p['payment_apply'] == 'already') { //已认领
$config['where']['payment_apply_id'] = ['not null'];
} elseif (isset($p['payment_apply']) && $p['payment_apply'] == 'timeout') { //超时未认领
$config['where']['payment_apply_id'] = ['not null'];
$config['where']['created_at'] = ['<' ,time() - 24*60*60];
}
// 收款申请筛选
if (isset($p['payment_apply_id']) && !empty($p['payment_apply_id'])) {
$config['where']['payment_apply_id'] = $p['payment_apply_id'];
}
// 收款账户筛选
if (isset($p['account_id']) && !empty($p['account_id'])) {
$config['where']['account_id'] = $p['account_id'];
}
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
$config['orWhere'][] = ['remitter', 'like', $k];
}
break;
case 'show':
$config['where']['id'] = $p['id'];
break;
case 'update':
case 'payment':
case 'destroy':
$config['where']['id'] = $p['id'];
break;
case 'store':
break;
}
return $config;
}
public function beforeServiceStore($data, Request $request)
{
if(isset($data['payment_apply_id']) && empty($data['payment_apply_id'])){
unset($data['payment_apply_id']);
}
$data['receipt_no'] = $this->generateUniqueReceipt();
$data['arrived_at'] = strtotime( $data['arrived_at']);
$data['created_by'] = $request->user->uid;
$data['updated_by'] = $request->user->uid;
return $data;
}
public function afterServiceStore($res)
{
$receipt = FinReceipt::where('id',$res->id)->first()->toArray();
$receipt = array_merge($receipt,['receipt_id' => $res->id]);
unset($receipt['id']);
FinReceiptHis::create($receipt);
}
public function beforeServiceUpdate($data, Request $request)
{
$data['updated_by'] = $request->user->uid;
if(isset($data['arrived_at']))
$data['arrived_at'] = strtotime($data['arrived_at']);
if(isset($data['received_at']))
$data['received_at'] = strtotime($data['received_at']);
return $data;
}
public function afterServiceUpdate($res)
{
$receipt = FinReceipt::where('id',$res['id'])->first()->toArray();
$receipt = array_merge($receipt,['receipt_id' => $res['id']]);
unset($receipt['id']);
FinReceiptHis::create($receipt);
}
/**
* 生成唯一的付款申请编码
* 格式：PA + 日期 + 6位字母数字组合
*
* @return string 唯一编码
*/
public function generateUniqueReceipt()
{
$chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
$maxAttempts = 10; // 防止无限循环
$secondChar = 'RE' . date('Ymd');
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
// 生成后6位随机字符
$suffix = '';
for ($i = 0; $i < 6; $i++) {
$suffix .= $chars[rand(0, strlen($chars) - 1)];
}
$ReceiptNo = $secondChar . $suffix;
// 检查是否已存在
$existing = FinReceipt::where('receipt_no', $ReceiptNo)->first();
if (!$existing) {
return $ReceiptNo;
}
}
// 如果1000次尝试后仍然重复，使用时间戳确保唯一性
$timestamp = substr(time(), -6);
return $secondChar . $timestamp;
}
/**
* 根据相似度排序付款记录
* @param Request $request
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Pagination\LengthAwarePaginator
*/
public function complexQueryIndex(Request $request)
{
$limit = (int)$request->get('size', 15);
$page = (int)$request->get('current', 1);
$param = $request->all();
$where = [];
// 汇款国家
if (isset($param['country_id']) && !empty($param['country_id'])) {
$where[] = ['country_id', $param['country_id']];
}
// 收款账户筛选
if (isset($param['account_id']) && !empty($param['account_id'])) {
$where[] = ['account_id', $param['account_id']];
}
// 收款申请筛选
if (isset($param['payment_apply_id']) && !empty($param['payment_apply_id'])) {
$where[]['payment_apply_id'] = $param['payment_apply_id'];
}
// 关键字
if (isset($param['keyword']) && $param['keyword']) {
$k = '%' . $param['keyword'] . '%';
$where[] = ['remitter', 'like', $k];
}
// 构建查询
$query = $this->modelClass::where($where);
// 没有付款记录的收款记录
if (isset($param['payment_apply']) && $param['payment_apply'] == 'not') {
$query->whereNull('payment_apply_id');
} elseif (isset($param['payment_apply']) && $param['payment_apply'] == 'already') {
$query->whereNotNull('payment_apply_id');
}
if (isset($param['scene']) && $param['scene'] == 'list') {
return $query->paginate($limit, ['*'], 'page', $page);
}
// 计算七天前的时间戳
$sevenDaysAgo = time() - (10 * 24 * 60 * 60);
// 构建相似度排序逻辑
$similarityOrder = [];
// 如果有传入参数，计算相似度
if (isset($param['account_id']) && !empty($param['account_id'])) {
$similarityOrder[] = "CASE WHEN account_id = {$param['account_id']} THEN 0 ELSE 1 END";
}
if (isset($param['country_id']) && !empty($param['country_id'])) {
$similarityOrder[] = "CASE WHEN country_id = {$param['country_id']} THEN 0 ELSE 1 END";
}
if (isset($param['keyword']) && $param['keyword']) {
$keyword = addslashes($param['keyword']);
$similarityOrder[] = "CASE WHEN remitter LIKE '%{$keyword}%' THEN 0 ELSE 1 END";
}
if (isset($param['amount']) && !empty($param['amount'])) {
$amount = (float)$param['amount'];
$similarityOrder[] = "ABS(amount - {$amount})";
}
// 构建排序SQL
$orderByClause = "";
if (!empty($similarityOrder)) {
$orderByClause = "CASE
WHEN created_at >= {$sevenDaysAgo} THEN
(" . implode(' + ', $similarityOrder) . ")
ELSE 999999
END ASC, ";
}
$orderByClause .= "CASE
WHEN created_at < {$sevenDaysAgo} THEN id
ELSE 0
END DESC";
$query->orderByRaw($orderByClause);
return $query->paginate($limit, ['*'], 'page', $page);
}
public function credit($id)
{
$finReceipt = FinReceipt::find($id);
if(!empty($finReceipt->received_at)){
throw new BusinessException('该记录已将确认入账');
}
$res = $this->logic->credit($id);
$this->afterServiceUpdate(['id'=>$id]);
return $res;
}
/**
* 更新：绑定收款记录，计算折让金额
* @param Request $request
* @param array $data
* @param string $scene
* @return mixed
*/
public function serviceUpdatePayment(Request $request, array $data = [], string $scene = 'payment')
{
$payment_apply_id = $request->input('payment_apply_id');
$id = $request->input('id');
$data = $this->preProcess(ucfirst($scene), $data, $request);
$config = $this->buildQueryConfig($request, $scene);
FinPaymentApply::where('id', $payment_apply_id)->update(['receipt_id' => $id, 'claimed_at' => time(), 'claimed_by' => $request->user->uid]);
//折让金额
$payment = FinPaymentApply::where('id', $payment_apply_id)->first();
$receipt = FinReceipt::find($id);
$data['discount_amount'] = $payment->amount - $receipt->amount ?? 0;
$updated = $this->logicUpdateBy($config, $data);
return $this->postProcess(ucfirst($scene), $data);
}
/**
* 收款记录统计
* @return bool|int
*/
public function statistics()
{
$finReceipt = FinReceipt::find($id);
if(!empty($finReceipt->received_at)){
throw new BusinessException('该记录已将确认入账');
}
$res = $this->logic->credit($id);
$this->afterServiceUpdate(['id'=>$id]);
return $res;
}
}
app/common/service/OssService.php
+34
View File
@@ -76,4 +76,38 @@ class OssService
throw new BusinessException('Delete Error: ' . $th->getMessage());
}
}
/**
* 获取对应的 MIME 类型
*/
public function getMimeTypes($extensions)
{
$mimeMap = [
'jpg' => 'image/jpeg',
'jpeg' => 'image/jpeg',
'png' => 'image/png',
'gif' => 'image/gif',
'bmp' => 'image/bmp',
'webp' => 'image/webp',
'pdf' => 'application/pdf',
'doc' => 'application/msword',
'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'xls' => 'application/vnd.ms-excel',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'ppt' => 'application/vnd.ms-powerpoint',
'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'txt' => 'text/plain',
'zip' => 'application/zip',
'rar' => 'application/x-rar-compressed'
];
$mimes = [];
foreach ($extensions as $ext) {
if (isset($mimeMap[$ext])) {
$mimes[] = $mimeMap[$ext];
}
}
return array_unique($mimes);
}
}
app/common/service/SysConfigService.php
+37
View File
@@ -0,0 +1,37 @@
<?php
namespace app\common\service;
use app\common\logic\SysConfigLogic;
use app\common\logic\SysCurrencyLogic;
use app\common\logic\SystemsLogic;
use support\Redis;
class SysConfigService
{
protected $logic;
public function __construct()
{
$this->logic = (new SysConfigLogic());
}
/**
* 获取系统list
*/
public static function getConfig(string $config_key)
{
$value = Redis::get($config_key);
if (empty($value)) {
$config = (new SysConfigLogic())->findByKey($config_key);
if (empty($config)) {
return null;
}
$value = $config->config_value;
Redis::set($config->config_key, $value, 'EX', 7200);
}
return $value;
}
}
app/common/service/SysOpLogService.php
+1 -1
View File
@@ -61,7 +61,7 @@ class SysOpLogService
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
foreach (['user_name', 'route'] as $col) {
foreach (['user_name', 'route', 'params_brief'] as $col) {
$config['orWhere'][] = [$col, 'like', $k];
}
}
app/common/utils/scaffold/templates/paymentFiles.stub
+103
View File
@@ -0,0 +1,103 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>邮箱提醒</title>
<style type="text/css">
body {
font-family: Arial, sans-serif;
line-height: 1.6;
color: #333333;
margin: 0;
padding: 0;
background-color: #f5f5f5;
}
.email-container {
max-width: 600px;
margin: 0 auto;
background-color: #ffffff;
}
.header {
padding: 20px;
background-color: #0056b3;
color: white;
text-align: center;
}
.content {
padding: 20px;
}
.button {
display: inline-block;
padding: 10px 20px;
background-color: #0056b3;
color: white !important;
text-decoration: none;
border-radius: 4px;
font-weight: bold;
margin: 10px 0;
}
.footer {
padding: 15px;
text-align: center;
font-size: 12px;
color: #777777;
background-color: #f0f0f0;
}
@media only screen and (max-width: 480px) {
.email-container {
width: 100%;
}
.button {
display: block;
text-align: center;
}
}
</style>
</head>
<body>
<!--[if mso]>
<style type="text/css">
.button {
background-color: #0056b3 !important;
color: white !important;
}
</style>
<![endif]-->
<table class="email-container" width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td class="header">
<h1>付款单提醒</h1>
</td>
</tr>
<tr>
<td class="content">
<p>您好，</p>
<p>您有新的付款单待处理。请及时查看：</p>
<ul>
<li>付款单编号：{{code}}</li>
<li>付款主体：{{payment_entity}}</li>
<li>问题描述：{{content}}</li>
{{reply}}
</ul>
<p>请点击下方按钮立即查看详情：</p>
<div style="text-align: center;">
<a href="https://x.hnxinyouhe.com" class="button" style="color: white; text-decoration: none;">立即查看</a>
</div>
<!--<p>如果您未请求此操作，请忽略此邮件或联系我们的客服团队。</p>-->
</td>
</tr>
<tr>
<td class="footer">
<p>© 2025 河南新友合科技有限公司. 保留所有权利。</p>
<p>这是系统自动发送的邮件，请勿直接回复。</p>
</td>
</tr>
</table>
</body>
</html>
app/common/validate/FinPaymentApplyValidate.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace app\common\validate;
use think\Validate;
class FinPaymentApplyValidate extends Validate
{
// 规则
protected $rule = [
];
// 提示
protected $message = [
];
// 场景
protected $scene = [
'store' => [
],
'update' => [
]
];
}
app/common/validate/FinReceiptHisValidate.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace app\common\validate;
use think\Validate;
class FinReceiptHisValidate extends Validate
{
// 规则
protected $rule = [
];
// 提示
protected $message = [
];
// 场景
protected $scene = [
'store' => [
],
'update' => [
]
];
}
app/common/validate/FinReceiptValidate.php
+56
View File
@@ -0,0 +1,56 @@
<?php
namespace app\common\validate;
use think\Validate;
class FinReceiptValidate extends Validate
{
// 规则
protected $rule = [
// 'payment_apply_id' => 'integer|gt:0',
// 'country_id' => 'require|integer|gt:0',
// 'remitter' => 'require',
// 'account_id' => 'require|integer|gt:0',
// 'currency_id' => 'require|integer|gt:0',
// 'amount' => 'require|gt:0',
// 'exchange_rate' => 'require|gt:0',
// 'arrived_at' => 'require',
// 'is_domestic_return' => 'require|integer',
];
// 提示
protected $message = [
// 'payment_apply_id.integer' => '付款申请ID必须是整数',
// 'payment_apply_id.gt' => '付款申请ID必须大于0',
// 'country_id.require' => '付款来源国家ID不能为空',
// 'country_id.integer' => '付款来源国家ID必须是整数',
// 'country_id.gt' => '付款来源国家ID必须大于0',
// 'remitter.require' => '汇款人不能为空',
// 'account_id.require' => '收款账号ID不能为空',
// 'account_id.integer' => '收款账号ID必须是整数',
// 'account_id.gt' => '收款账号ID必须大于0',
// 'currency_id.require' => '收款币种ID不能为空',
// 'currency_id.integer' => '收款币种ID必须是整数',
// 'currency_id.gt' => '收款币种ID必须大于0',
// 'amount.require' => '收款金额不能为空',
// 'amount.gt' => '收款金额必须大于0',
// 'exchange_rate.require' => '实际汇率不能为空',
// 'exchange_rate.gt' => '实际汇率必须大于0',
// 'arrived_at.require' => '到账时间不能为空',
// 'arrived_at.gt' => '到账时间必须大于0',
// 'is_domestic_return.require' => '是否回转内地不能为空',
// 'is_domestic_return.integer' => '是否回转内地必须是整数',
];
// 场景
protected $scene = [
'store' => [
// 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'exchange_rate', 'arrived_at'
],
'update' => [
// 'payment_apply_id'
]
];
}
app/functions.php
+2 -1
View File
@@ -180,7 +180,8 @@ if (!function_exists('tplUrl')) {
{
$urlArray = [
'email' => 'common/utils/scaffold/templates/Email.stub',
'work_order' => 'common/utils/scaffold/templates/workOrder.stub'
'work_order' => 'common/utils/scaffold/templates/workOrder.stub',
'payment_files' => 'common/utils/scaffold/templates/paymentFiles.stub',
];
return $urlArray[$tplKey];
}
app/process/Task.php
+42 -2
View File
@@ -2,6 +2,8 @@
namespace app\process;
use app\common\model\FinPaymentApply;
use app\common\model\User;
use app\crm\model\Customer;
use support\Log;
use Workerman\Crontab\Crontab;
@@ -11,7 +13,7 @@ class Task
public function onWorkerStart()
{
// 每半小时执行一次
// 每半小时执行一次，通知待跟进客户
new Crontab('0 */30 * * * *', function(){
echo date('Y-m-d H:i:s') . "\n";
Log::info('send follow start',[time()]);
@@ -41,7 +43,45 @@ class Task
$item->save();
}
Log::info('send follow start',[time()]);
Log::info('send follow end',[time()]);
});
// 检查入账资料是否提交
new Crontab('* */70 * * * *', function () {
$G = date('G');
if ($G > 22 || $G < 8) {
return;
}
Log::info('fin_payment_apply submit_files start', [time()]);
$orWhere = [
['submit_files', '=', '[]'],
['submit_files', '=', ''],
];
$where = [
['warn', '<', 2],
['created_at', '>', time() - 60 * 60 * 48],
['created_at', '<', time() - 60 * 60 * 24],
];
$payment = FinPaymentApply::where($where)->orWhere($orWhere)->orderBy('id', 'desc')->get();
foreach ($payment as $item) {
Log::info('fin_payment_apply submit_files ', [$item->toArray()]);
$notice = [
'code' => $item->apply_no,
'payment_entity' => $item->payment_entity ?? $item->remitter,
'content' => '认领收款单后请在24小时内提交入账资料',
'reply' => '',
];
$email = [];
$email[] = User::where('id', $item->claimed_by)->value('email');
$email[] = User::where('id', $item->doc_user_id)->value('email');
$email = array_unique($email);
\app\common\utils\email\MailSend::send($email, '【XYH】付款记录', replaceTpl($notice, 'payment_files'));
$item->warn = ++$item->warn;
$item->save();
}
Log::info('fin_payment_apply submit_files end', [time()]);
});
}
config/route.php
+38 -1
View File
@@ -389,7 +389,6 @@ Route::group('/admin', function () {
});
});
Route::group('/purchase/order', function () {
Route::any('/predata', [app\common\controller\PurchaseOrdersController::class, 'preQueryData']);
Route::any('/list', [app\common\controller\PurchaseOrdersController::class, 'index']);
@@ -423,6 +422,44 @@ Route::group('/admin', function () {
Route::any('/destroy', [app\common\controller\SysUpdateLogController::class, 'destroy']);
});
// 收款记录
Route::group('/receipt', function () {
Route::any('/list', [app\common\controller\FinReceiptController::class, 'index']);
Route::any('/show', [app\common\controller\FinReceiptController::class, 'show']);
Route::any('/store', [app\common\controller\FinReceiptController::class, 'store']);
Route::any('/update', [app\common\controller\FinReceiptController::class, 'update']);
Route::any('/payment', [app\common\controller\FinReceiptController::class, 'payment']);
Route::any('/destroy', [app\common\controller\FinReceiptController::class, 'destroy']);
Route::any('/credit', [app\common\controller\FinReceiptController::class, 'credit']);
});
// 收款记录历史
Route::group('/receipt/his', function () {
Route::any('/list', [app\common\controller\FinReceiptHisController::class, 'index']);
Route::any('/show', [app\common\controller\FinReceiptHisController::class, 'show']);
});
Route::group('/fin', function () {
Route::any('/statistics', [app\admin\controller\dashboard\FinStatisticsController::class, 'statistics']);
});
// 付款申请
Route::group('/payment', function () {
Route::any('/list', [app\common\controller\FinPaymentApplyController::class, 'index']);
Route::any('/show', [app\common\controller\FinPaymentApplyController::class, 'show']);
Route::any('/store', [app\common\controller\FinPaymentApplyController::class, 'store']);
Route::any('/update', [app\common\controller\FinPaymentApplyController::class, 'update']);
Route::any('/destroy', [app\common\controller\FinPaymentApplyController::class, 'destroy']);
});
// 系统配置
Route::group('/config', function () {
Route::any('/list', [app\admin\controller\SysConfigController::class, 'index']);
Route::any('/show', [app\admin\controller\SysConfigController::class, 'show']);
Route::any('/store', [app\admin\controller\SysConfigController::class, 'store']);
Route::any('/update', [app\admin\controller\SysConfigController::class, 'update']);
Route::any('/destroy', [app\admin\controller\SysConfigController::class, 'destroy']);
});
// 仪表盘
Route::group('/dashboard', function () {
// 内勤