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

feat(user): 修改用户编辑逻辑，优化支付通知逻辑

Browse Source
This commit is contained in:
mkm 2024-06-18 09:37:01 +08:00
parent 9841e1886a
commit c8d20b33d6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/controller/user/UserController.php
View File

@ -57,7 +57,8 @@ class UserController extends BaseAdminController
*/ */
public function edit() public function edit()
{ {
$params = (new UserValidate())->post()->goCheck('edit'); // $params = (new UserValidate())->post()->goCheck('edit');
$params = $this->request->post();
$result = UserLogic::edit($params); $result = UserLogic::edit($params);
if (true === $result) { if (true === $result) {
return $this->success('编辑成功', [], 1, 1); return $this->success('编辑成功', [], 1, 1);

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

@ -306,7 +306,7 @@ class PayNotifyLogic extends BaseLogic
$financeLogic->order = $order; $financeLogic->order = $order;
$financeLogic->user = ['uid' => $order['uid']]; $financeLogic->user = ['uid' => $order['uid']];
// if ($order->pay_type != 9 || $order->pay_type != 10) { // if ($order->pay_type != 9 || $order->pay_type != 10) {
$financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户订单支付 $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY,$order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付
$count_frees = 0; $count_frees = 0;
//商户应该获得的钱 每个商品的price-ot_price 利润 //商户应该获得的钱 每个商品的price-ot_price 利润
// if (isset($order->profit) && $order->profit > 0) { // if (isset($order->profit) && $order->profit > 0) {