From 42e95677ef6308edb993579f858d2da0e0e988ec Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 6 Jun 2024 18:02:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(store=5Fproduct):=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=88=90=E5=8A=9F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductController.php | 2 +- .../logic/store_product/StoreProductLogic.php | 10 +++++- app/queue/redis/CopyProductSend.php | 15 +++++++- app/queue/redis/StoreStorageSend.php | 34 +++++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 app/queue/redis/StoreStorageSend.php diff --git a/app/admin/controller/store_branch_product/StoreBranchProductController.php b/app/admin/controller/store_branch_product/StoreBranchProductController.php index e7706f37b..9c586c698 100644 --- a/app/admin/controller/store_branch_product/StoreBranchProductController.php +++ b/app/admin/controller/store_branch_product/StoreBranchProductController.php @@ -62,7 +62,7 @@ class StoreBranchProductController extends BaseAdminController return $this->fail(StoreProductLogic::getError()); } } - return $this->success('编辑成功', [], 1, 1); + return $this->success('操作成功,等待门店确认', [], 1, 1); } /** diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index ffcddac35..7d9bbb020 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -10,6 +10,8 @@ use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue use app\common\model\store_category\StoreCategory; use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\system_store\SystemStore; +use app\common\model\system_store_storage\SystemStoreStorage; +use app\Request; use think\facade\Db; use Webman\RedisQueue\Redis; @@ -264,7 +266,13 @@ class StoreProductLogic extends BaseLogic public static function stock($data){ Db::startTrans(); try { - StoreBranchProduct::where(['id' => $data['id']])->inc('stock',$data['stock'])->update(); + $find=StoreBranchProduct::where(['id' => $data['id']])->find(); + SystemStoreStorage::create([ + 'product_id' => $find['product_id'], + 'store_id' => $find['store_id'], + 'nums' => $data['stock'], + 'admin_id' => Request()->adminId, + ]); Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/queue/redis/CopyProductSend.php b/app/queue/redis/CopyProductSend.php index 05866eadb..c0854bdf5 100644 --- a/app/queue/redis/CopyProductSend.php +++ b/app/queue/redis/CopyProductSend.php @@ -3,6 +3,8 @@ namespace app\queue\redis; use app\admin\logic\store_product\StoreProductLogic; +use app\common\model\store_product\StoreProduct; +use app\common\model\system_store_storage\SystemStoreStorage; use Webman\RedisQueue\Consumer; use support\Log; @@ -22,8 +24,19 @@ class CopyProductSend implements Consumer { $store_arr=$data['store_arr']; $stock=$data['stock']??0; + $admin_id=$data['admin_id']??0; foreach ($store_arr as $key => $id) { - StoreProductLogic::copy($data['product_id'],$id,$stock); + StoreProductLogic::copy($data['product_id'],$id,0); + if($stock>0){ + $stocks=StoreProduct::where('id',$data['product_id'])->value('stock'); + if($stocks>=$stock){ + SystemStoreStorage::create(['product_id'=>$data['product_id'],'store_id'=>$id,'nums'=>$stock,'admin_id'=>$admin_id]);//设置库存 + StoreProduct::where('id',$data['product_id'])->dec('stock',$stock)->update();//减少库存 + }else{ + SystemStoreStorage::create(['product_id'=>$data['product_id'],'store_id'=>$id,'nums'=>$stock,'admin_id'=>$admin_id,'status'=>-1,'mark'=>'库存不足']);//设置库存 + + } + } } } public function onConsumeFailure(\Throwable $e, $package) diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php new file mode 100644 index 000000000..16ecc6598 --- /dev/null +++ b/app/queue/redis/StoreStorageSend.php @@ -0,0 +1,34 @@ + Date: Thu, 6 Jun 2024 18:09:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=95=86=E5=BA=97=E5=AD=98=E5=82=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lists/system_store_storage/SystemStoreStorageLists.php | 4 ++-- .../logic/system_store_storage/SystemStoreStorageLogic.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php index c3a0f24ac..243334d71 100644 --- a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php @@ -26,7 +26,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['store_id', 'admin_id', 'operating_id', 'status'], + '=' => ['store_id', 'admin_id', 'staff_id', 'status'], ]; } @@ -43,7 +43,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI public function lists(): array { return SystemStoreStorage::where($this->searchWhere) - ->field(['id', 'store_id', 'admin_id', 'operating_id', 'product_id', 'nums', 'status']) + ->field(['id', 'store_id', 'admin_id', 'staff_id', 'product_id', 'nums', 'status']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php index db821548c..2cb61584d 100644 --- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php +++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php @@ -31,7 +31,7 @@ class SystemStoreStorageLogic extends BaseLogic SystemStoreStorage::create([ 'store_id' => $params['store_id'], 'admin_id' => $params['admin_id'], - 'operating_id' => $params['operating_id'], + 'staff_id' => $params['staff_id'], 'product_id' => $params['product_id'], 'nums' => $params['nums'], 'status' => $params['status'] @@ -61,7 +61,7 @@ class SystemStoreStorageLogic extends BaseLogic SystemStoreStorage::where('id', $params['id'])->update([ 'store_id' => $params['store_id'], 'admin_id' => $params['admin_id'], - 'operating_id' => $params['operating_id'], + 'staff_id' => $params['staff_id'], 'product_id' => $params['product_id'], 'nums' => $params['nums'], 'status' => $params['status'] From 48376313a9888a19a38e4977af9af4119e7f4db9 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Fri, 7 Jun 2024 09:31:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 15 ++++++++++++++- app/api/lists/order/OrderList.php | 6 ++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 4073951c4..935a9f6d9 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -9,7 +9,6 @@ use app\api\validate\OrderValidate; use app\common\enum\PayEnum; use app\common\logic\PaymentLogic; use app\common\logic\PayNotifyLogic; -use app\common\model\retail\Cashierclass; use app\common\model\store_order\StoreOrder; use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\UserAddress; @@ -475,6 +474,20 @@ class OrderController extends BaseApiController $res = StoreOrder::where($where)->whereDay('create_time', $date)->count(); return $this->success('ok', ['order_count' => $res]); } + + + //订单退款申请 + public function apply_refund() + { + $params = (new OrderValidate())->post()->goCheck('add'); + $uid = $this->userId; +// OrderLogic::dealRefund($uid,$params); + + + + } + + } diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index 8c9eadd3d..2d1857f99 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -44,12 +44,14 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface { $userId=$this->request->userId; if(!$userId) return []; - return StoreOrder::with(['store'])->where($this->searchWhere)->where('uid',$userId) + return StoreOrder::with(['store'])->where($this->searchWhere)->where('uid',$userId) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() ->each(function($item){ - $item['goods_list']=StoreOrderCartInfo::where('oid',$item['id'])->with('goodsName')->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time')->limit(3)->select(); + $item['goods_list']=StoreOrderCartInfo::where('oid',$item['id'])->with(['goodsName'=> function ($query) { + $query->withTrashed(); + }])->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time')->limit(3)->select(); $item['goods_count']=count(explode(',',$item['cart_id'])); }) ->toArray();