From a82e96e259cfc33b17e63e6d7a7a98851c889447 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 16:44:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=9F=A5=E8=AF=A2=E5=92=8C=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 2 +- app/api/controller/store/StoreController.php | 17 ++++++++++---- app/api/logic/user/UserLogic.php | 2 +- app/common/logic/PayNotifyLogic.php | 23 ++++++++++--------- .../store_order/StoreOrderController.php | 6 ++--- app/store/lists/user/UserLists.php | 2 +- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 894799e9..b2ea61db 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -147,7 +147,7 @@ class UserLogic extends BaseLogic public static function detail(int $userId): array { $field = [ - 'id', 'account', 'nickname', 'avatar', 'real_name', + 'id', 'account', 'nickname', 'avatar', 'real_name','integral', 'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds' ]; diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index c4368e49..4bb7e039 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -24,15 +24,24 @@ class StoreController extends BaseApiController } + /** + * 门店信息 + */ public function detail() { $store_id = (int)$this->request->get('store_id'); - $where = [ - 'id' => $store_id - ]; + $phone = (int)$this->request->get('phone'); + $where = []; + if($phone){ + $where['phone'] = $phone; + } + if($store_id){ + $where['id'] = $store_id; + } + $info = StoreLogic::search($where); if ($info) { - return $this->data($info); + return $this->data($info?->toArray()); } else { return $this->fail('店铺不存在'); } diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index 5ba8704c..bdbd7351 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -68,7 +68,7 @@ class UserLogic extends BaseLogic { $data = User::with(['userShip'])->where('id',$uid) ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship - ,purchase_funds') + ,purchase_funds,integral') ->find(); //判断是不是员工 if($data){ diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 49e30112..f73cbd93 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -81,7 +81,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } @@ -115,7 +115,7 @@ class PayNotifyLogic extends BaseLogic $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']); // self::afterPay($order); // Redis::send('push-platform-print', ['id' => $order['id']], 60); - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); } /** @@ -153,12 +153,13 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); Redis::send('push-platform-print', ['id' => $order['id']]); - } else { - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + } + // else { + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); // Db::name('order_middle')->insert(['c_order_id' => $order['id']]); - } + // } if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5); } @@ -280,12 +281,12 @@ class PayNotifyLogic extends BaseLogic if ($order->pay_type == 9) { $extra['create_time'] = $order['create_time']; - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); Redis::send('push-platform-print', ['id' => $order['id']]); - - } else { - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - } + } + // else { + // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + // } return true; } diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 692ee5a0..b9f70c37 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -183,12 +183,12 @@ class StoreOrderController extends BaseAdminController case PayEnum::PURCHASE_FUNDS: //采购款支付 PayNotifyLogic::handle('purchase_funds', $order['order_id'],['uid'=>$this->request->post('uid')]); - return $this->success('采购款支付成功',[],1,0); + return $this->success('采购款支付成功',['id'=>$order['id']]); case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功'); + return $this->success('现金支付成功',['id'=>$order['id']]); case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 @@ -250,7 +250,7 @@ class StoreOrderController extends BaseAdminController case PayEnum::CASH_PAY: //现金支付 PayNotifyLogic::handle('cash_pay', $order['order_id']); - return $this->success('现金支付成功'); + return $this->success('现金支付成功',['id'=>$order['id']]); break; case PayEnum::WECHAT_PAY_BARCODE: //微信条码支付 diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index fb274657..e410ceec 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -38,7 +38,7 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface public function lists(): array { - $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds"; + $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds,integral"; $lists = User::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->field($field)