From 6170e98fecca7c2660712c931e986cb9484a396a Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 15:37:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=E6=A0=87=E8=AF=86=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 23 ++++++++++++++++------- app/common/logic/PayNotifyLogic.php | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 3cf62ac2f..96d197bb5 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -19,6 +19,7 @@ use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\model\finance\CapitalFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; +use app\common\model\store_order\StoreOrder; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; @@ -189,24 +190,32 @@ class UserLogic extends BaseLogic switch ($params['type']){ case 1: //采购款明细 - $query =CapitalFlow::where(['uid'=>$params['id']]); + $categories = ['user_balance_recharge', 'user_order_purchase_pay']; + $query = CapitalFlow::where('uid', $params['id']) + ->whereIn('category', $categories); $count = $query->count(); $data = $query ->page($params['page_no'],$params['page_size']) ->select()->toArray(); + foreach ($data as &$value){ + if($value['category'] == 'user_order_purchase_pay'){ + $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id'); + }elseif($value['category'] == 'user_balance_recharge'){ + $value['order_sn'] = UserRecharge::where('id',$value['link_id'])->value('order_id'); + } + } break; case 2: //余额明细 - - $query = StoreFinanceFlow::with(['store']) - ->where([ - 'other_uid'=>$params['id'],'financial_type'=> OrderEnum::VIP_ORDER_OBTAINS, - 'financial_pm'=>YesNoEnum::YES - ]); + $query = CapitalFlow::where('uid', $params['id']) + ->where('category', 'user_order_balance_pay'); $count = $query->count(); $data = $query ->page($params['page_no'],$params['page_size']) ->select()->toArray(); + foreach ($data as &$value){ + $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id'); + } break; case 3: diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index a7aa59456..4db3e0832 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -86,7 +86,7 @@ class PayNotifyLogic extends BaseLogic } } $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); + $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']); // 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' => '您有一笔新的订单']); From 6b29a324703653ac67b8dac792e11b1fe6f66152 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 15:54:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/validate/CartValidate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/validate/CartValidate.php b/app/api/validate/CartValidate.php index cf9a36619..bc84fc754 100644 --- a/app/api/validate/CartValidate.php +++ b/app/api/validate/CartValidate.php @@ -19,7 +19,7 @@ class CartValidate extends BaseValidate * @var string[] */ protected $rule = [ - 'cart_num' => 'require|number', + 'cart_num' => 'require', 'product_attr_unique' => 'require', 'store_id' => 'require|number', 'staff_id' => 'require|number', From 85a8d1809fc41d43db08658c6d44d9db0f84e1a8 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 15:55:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9C=80=E4=BD=8E?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index dcfa9efab..260b9ad20 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -134,6 +134,9 @@ class OrderLogic extends BaseLogic }else{ $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 } + if($pay_price < 500){ + throw new Exception('金额低于500'); + } $vipPrice = 0; //成本价 收益 From 3ab512f49d0028810990c3270974dcd2cdde3994 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Thu, 20 Jun 2024 16:35:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E9=99=84=E5=8A=A0=E5=95=86=E5=93=81=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/CartLogic.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/api/logic/order/CartLogic.php b/app/api/logic/order/CartLogic.php index ad3ee17cb..8afb470ba 100644 --- a/app/api/logic/order/CartLogic.php +++ b/app/api/logic/order/CartLogic.php @@ -5,6 +5,7 @@ namespace app\api\logic\order; use app\common\model\order\Cart; use app\common\logic\BaseLogic; +use app\common\model\store_product_log\StoreProductLog; use think\facade\Db; @@ -32,7 +33,7 @@ class CartLogic extends BaseLogic } Db::startTrans(); try { - Cart::create([ + $cart = Cart::create([ 'uid' => $params['uid'], 'type' => $params['type']??'', 'product_id' => $params['product_id'], @@ -42,6 +43,15 @@ class CartLogic extends BaseLogic 'cart_num' => $params['cart_num'], 'is_new' => $params['is_new']??0, ]); + StoreProductLog::create([ + 'type'=>'cart', + 'uid' => $params['uid'], + 'cart_id' => $cart['id'], + 'store_id' => $params['store_id']??0, + 'visit_num' => 1, + 'product_id' => $params['product_id'], + 'cart_num' => $params['cart_num'], + ]); Db::commit(); return true; } catch (\Exception $e) {