github/niucloud-admin
1
0
Fork 0
mirror of https://gitee.com/niucloud-team/niucloud-admin.git synced 2025-12-12 10:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.5.0

Browse Source
This commit is contained in:
zhangxingye 2025-02-22 17:21:18 +08:00
parent b6b7198a2d
commit 941910a528
8 changed files with 185 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
niucloud/config/version.php
View File

@ -1,6 +1,6 @@
<?php
return [
'version' => '1.4.4',
'code' => '202501030001'
'version' => '1.5.1',
'code' => '2025022201'
];

2
niucloud/core/dict/AdvPosition.php
View File

@ -1,6 +1,6 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的saas管理平台
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------

38
niucloud/core/dict/DiyFormComponent.php Normal file
View File

@ -0,0 +1,38 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace core\dict;
class DiyFormComponent extends BaseDict
{
/**
* 万能表单组件配置
* @param array $data
* @return array|mixed
*/
public function load(array $data)
{
$addons = $this->getLocalAddons();
$components_files = [];
foreach ($addons as $v) {
$components_path = $this->getAddonDictPath($v) . "diy_form" . DIRECTORY_SEPARATOR . "components.php";
if (is_file($components_path)) {
$components_files[] = $components_path;
}
}
$components_files_data = $this->loadFiles($components_files);
$components = $data;
foreach ($components_files_data as $file_data) {
$components = empty($components) ? $file_data : array_merge2($components, $file_data);
}
return $components;
}
}

38
niucloud/core/dict/DiyFormTemplate.php Normal file
View File

@ -0,0 +1,38 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace core\dict;
class DiyFormTemplate extends BaseDict
{
/**
* 万能表单模版
* @param array $data
* @return array|mixed
*/
public function load(array $data)
{
$addons = $this->getLocalAddons();
$components_files = [];
foreach ($addons as $v) {
$components_path = $this->getAddonDictPath($v) . "diy_form" . DIRECTORY_SEPARATOR . "template.php";
if (is_file($components_path)) {
$components_files[] = $components_path;
}
}
$components_files_data = $this->loadFiles($components_files);
$components = $data;
foreach ($components_files_data as $file_data) {
$components = empty($components) ? $file_data : array_merge2($components, $file_data);
}
return $components;
}
}

38
niucloud/core/dict/DiyFormType.php Normal file
View File

@ -0,0 +1,38 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------
// | niucloud团队 版权所有 开源版本可自由商用
// +----------------------------------------------------------------------
// | Author: Niucloud Team
// +----------------------------------------------------------------------
namespace core\dict;
class DiyFormType extends BaseDict
{
/**
* 万能表单组件配置
* @param array $data
* @return array|mixed
*/
public function load(array $data)
{
$addons = $this->getLocalAddons();
$components_files = [];
foreach ($addons as $v) {
$components_path = $this->getAddonDictPath($v) . "diy_form" . DIRECTORY_SEPARATOR . "type.php";
if (is_file($components_path)) {
$components_files[] = $components_path;
}
}
$components_files_data = $this->loadFiles($components_files);
$components = $data;
foreach ($components_files_data as $file_data) {
$components = empty($components) ? $file_data : array_merge2($components, $file_data);
}
return $components;
}
}

2
niucloud/core/dict/RechargeGift.php
View File

@ -1,6 +1,6 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的saas管理平台
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------

2
niucloud/core/dict/WebLink.php
View File

@ -1,6 +1,6 @@
<?php
// +----------------------------------------------------------------------
// | Niucloud-admin 企业快速开发的saas管理平台
// | Niucloud-admin 企业快速开发的多应用管理平台
// +----------------------------------------------------------------------
// | 官方网址：https://www.niucloud.com
// +----------------------------------------------------------------------

95
niucloud/core/pay/Wechatpay.php
View File

@ -2,6 +2,7 @@
namespace core\pay;
use app\dict\common\ChannelDict;
use app\dict\pay\OnlinePayDict;
use app\dict\pay\RefundDict;
use app\dict\pay\TransferDict;
@ -224,21 +225,32 @@ class Wechatpay extends BasePay
*/
public function transfer(array $params)
{
$to_data = $params['to_no'];//收款人数据
$channel = $to_data['channel'] ?? '';//渠道
$open_id = $to_data['open_id'] ?? '';//openid
if(empty($this->config['mch_id']) || empty($this->config['mch_secret_key']) || empty($this->config['mch_secret_cert']) || empty($this->config['mch_public_cert_path'])){
throw new PayException('WECHAT_TRANSFER_CONFIG_NOT_EXIST');
}
//这儿的批次信息可能是这儿生成的,但依然需要记录
$order = [
'out_batch_no' => $params['transfer_no'] . '',//
'batch_name' => $params['remark'],
'batch_remark' => $params['remark'],
'out_batch_no' => ($to_data['out_batch_no'] ?? '') . '',//
'batch_name' => $params['remark'] ?? '',
'batch_remark' => $params['remark'] ?? '',
];
if($channel == ChannelDict::WEAPP){
$order['_type'] = 'mini';
}
$transfer_list = $params['transfer_list'];
//单笔转账
if (empty($transfer_list)) {
$transfer_list = [
[
'transfer_no' => $params['transfer_no'] . '1',
'transfer_no' => $params['transfer_no'],
'money' => (int)$params['money'],
'remark' => $params['remark'],
'openid' => $params['to_no']
'openid' => $open_id
]
];
}
@ -247,7 +259,7 @@ class Wechatpay extends BasePay
foreach ($transfer_list as $k => $v) {
$item_transfer = [
'out_detail_no' => $params['transfer_no'] . $k,
'out_detail_no' => $params['transfer_no'],
'transfer_amount' => (int)$v['money'],
'transfer_remark' => $v['remark'],
'openid' => $v['openid'],
@ -261,20 +273,38 @@ class Wechatpay extends BasePay
}
$order['total_amount'] = $total_amount;
$order['total_num'] = $total_num;
$result = $this->returnFormat(Pay::wechat()->transfer($order));
if (!empty($result['code'])) {
$tran_status_list = [
'PROCESSING' => TransferDict::DEALING,
'ACCEPTED' => TransferDict::DEALING,
'CLOSED' => TransferDict::FAIL,
'FINISHED' => TransferDict::SUCCESS,
];
try {
$result = $this->returnFormat(Pay::wechat()->transfer($order));
if (!empty($result['code'])) {
// if($result['code'] == 'PARAM_ERROR'){
// throw new PayException();
// }else if($result['code'] == 'INVALID_REQUEST'){
// throw new PayException();
// }
if ($result['code'] == 'INVALID_REQUEST') {
throw new PayException(700010);
if ($result['code'] == 'INVALID_REQUEST') {
throw new PayException(700010);
}
throw new PayException($result['message']);
}
throw new PayException($result['message']);
return ['batch_id' => $result['batch_id'], 'out_batch_no' => $result['out_batch_no'], 'status' => $tran_status_list[$result['batch_status']]];
} catch (\Exception $e) {
if($e->getCode() == 9402){
return ['batch_id' => '', 'out_batch_no' => $order['out_batch_no'], 'status' => TransferDict::DEALING];
}
if ($e instanceof InvalidResponseException) {
throw new PayException($e->response->all()['message'] ?? '');
}
throw new PayException($e->getMessage());
}
return ['batch_id' => $result['batch_id'], 'out_batch_no' => $result['out_batch_no'], 'status' => TransferDict::SUCCESS];
}
/**
@ -465,28 +495,35 @@ class Wechatpay extends BasePay
* @throws ContainerException
* @throws InvalidParamsException
*/
public function getTransfer(string $transfer_no, $out_transfer_no = '')
public function getTransfer(string $transfer_no, $out_batch_no = '')
{
$order = [
'out_batch_no' => $out_transfer_no,
'out_batch_no' => $out_batch_no,
'out_detail_no' => $transfer_no,
'_action' => 'transfer',
];
$result = Pay::wechat()->query($order);
$result = $this->returnFormat($result);
//微信转账状态
$transfer_status_array = [
'INIT' => TransferDict::DEALING,//初始态。 系统转账校验中
'WAIT_PAY' => TransferDict::DEALING,
'PROCESSING' => TransferDict::DEALING,
'FAIL' => TransferDict::FAIL,
'SUCCESS' => TransferDict::SUCCESS,
];
return [
'status' => $transfer_status_array[$result['status']],
'transfer_no' => $transfer_no
];
try {
$result = Pay::wechat()->query($order);
$result = $this->returnFormat($result);
//微信转账状态
$transfer_status_array = [
'INIT' => TransferDict::DEALING,//初始态。 系统转账校验中
'WAIT_PAY' => TransferDict::DEALING,
'PROCESSING' => TransferDict::DEALING,
'FAIL' => TransferDict::FAIL,
'SUCCESS' => TransferDict::SUCCESS,
];
return [
'status' => $transfer_status_array[$result['detail_status']],
'transfer_no' => $transfer_no
];
}catch(Throwable $e){
return [
'status' => TransferDict::DEALING,
'transfer_no' => $transfer_no
];
}
}