|
@@ -12,6 +12,7 @@ use app\model\MemberAccount;
|
|
use app\model\Order;
|
|
use app\model\Order;
|
|
use app\model\OrderSheet;
|
|
use app\model\OrderSheet;
|
|
use app\model\PayDetail;
|
|
use app\model\PayDetail;
|
|
|
|
+use app\model\SysDept;
|
|
use support\Db;
|
|
use support\Db;
|
|
use support\exception\BusinessException;
|
|
use support\exception\BusinessException;
|
|
use support\Request;
|
|
use support\Request;
|
|
@@ -322,7 +323,7 @@ class PayDetailController extends Curd
|
|
])->where('member_id', $memberId)
|
|
])->where('member_id', $memberId)
|
|
->select('member_id', 'member_mobile', 'join_member_role_id', 'member_is_owner', 'member_is_vip', 'member_is_partner', 'member_is_referrer')
|
|
->select('member_id', 'member_mobile', 'join_member_role_id', 'member_is_owner', 'member_is_vip', 'member_is_partner', 'member_is_referrer')
|
|
->first();
|
|
->first();
|
|
- if (!$member){
|
|
|
|
|
|
+ if (!$member) {
|
|
return json_fail('数据异常');
|
|
return json_fail('数据异常');
|
|
}
|
|
}
|
|
$member = $member->toArray();
|
|
$member = $member->toArray();
|
|
@@ -489,12 +490,18 @@ class PayDetailController extends Curd
|
|
$data = $this->inputFilter($params);
|
|
$data = $this->inputFilter($params);
|
|
$goods = Goods::find($params['goods_id']);
|
|
$goods = Goods::find($params['goods_id']);
|
|
$extendJson = [];
|
|
$extendJson = [];
|
|
|
|
+ $orderExtendJson = [];
|
|
// if (!$params['is_custom']) {
|
|
// if (!$params['is_custom']) {
|
|
// Db::beginTransaction();
|
|
// Db::beginTransaction();
|
|
try {
|
|
try {
|
|
if (!$params['is_custom']) {
|
|
if (!$params['is_custom']) {
|
|
$data['pay_amount'] = $goods->goods_sales_price;
|
|
$data['pay_amount'] = $goods->goods_sales_price;
|
|
}
|
|
}
|
|
|
|
+ $orderExtendJson['referee_dept_id'] = $params['dept_id'] ?? '';
|
|
|
|
+ $orderExtendJson['referee'] = $params['referee'] ?? '';
|
|
|
|
+ if (!empty($params['dept_id'])) {
|
|
|
|
+ $orderExtendJson['referee_premises'] = SysDept::where('dept_id', $params['dept_id'])->value('dept_name');
|
|
|
|
+ }
|
|
|
|
|
|
$orderId = "OD" . date('ymdHi') . random_string(4, 'up');
|
|
$orderId = "OD" . date('ymdHi') . random_string(4, 'up');
|
|
$orderGroupId = "OD" . date('ymdHi') . random_string(4, 'up');
|
|
$orderGroupId = "OD" . date('ymdHi') . random_string(4, 'up');
|
|
@@ -512,6 +519,8 @@ class PayDetailController extends Curd
|
|
'order_status_system' => 'PAYING',
|
|
'order_status_system' => 'PAYING',
|
|
'order_status_storage' => 'PENDING',
|
|
'order_status_storage' => 'PENDING',
|
|
'order_config_json' => json_encode(['order_category' => 'RECHARGE']),
|
|
'order_config_json' => json_encode(['order_category' => 'RECHARGE']),
|
|
|
|
+ 'order_extend_json' => json_encode($orderExtendJson),
|
|
|
|
+ 'order_platform' => 'SYSTEM',
|
|
'order_addtimes' => time()
|
|
'order_addtimes' => time()
|
|
];
|
|
];
|
|
if ($type == 'WELFARE') {
|
|
if ($type == 'WELFARE') {
|