From 872f27305a26b58a4d31f8fb8589e2fd480bcbb2 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 27 Apr 2024 11:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/goods/GoodsController.php | 8 ++ .../controller/goods/GoodsLabelController.php | 95 +++++++++++++++++++ .../operation/OpurchaseclassController.php | 95 +++++++++++++++++++ app/admin/lists/goods/GoodsLabelLists.php | 65 +++++++++++++ .../lists/operation/OpurchaseclassLists.php | 65 +++++++++++++ app/admin/logic/goods/GoodsLabelLogic.php | 94 ++++++++++++++++++ app/admin/logic/goods/GoodsLogic.php | 30 +++++- .../logic/operation/OpurchaseclassLogic.php | 94 ++++++++++++++++++ .../validate/goods/GoodsLabelValidate.php | 82 ++++++++++++++++ .../operation/OpurchaseclassValidate.php | 82 ++++++++++++++++ .../order/OpurchaseOrderController.php | 37 ++++++++ .../order/PurchaseOrderController.php | 50 ---------- .../order/RetailOrderController.php | 14 ++- app/api/logic/order/OrderLogic.php | 91 +++++++++++------- app/ceshi/controller/IndexController.php | 29 ------ app/common/cache/UserTokenCache.php | 4 +- app/common/logic/order/RetailOrderLogic.php | 16 +++- app/common/model/goods/Goods.php | 15 +++ app/common/model/goods/GoodsLabel.php | 22 +++++ app/common/model/operation/Opurchaseclass.php | 22 +++++ app/common/model/opurchase/Opurchaseclass.php | 22 +++++ app/common/model/opurchase/Opurchaseinfo.php | 22 +++++ composer.json | 1 - composer.lock | 58 +---------- config/exception.php | 2 +- config/middleware.php | 12 +-- config/thinkorm.php | 2 +- 27 files changed, 938 insertions(+), 191 deletions(-) create mode 100644 app/admin/controller/goods/GoodsLabelController.php create mode 100644 app/admin/controller/operation/OpurchaseclassController.php create mode 100644 app/admin/lists/goods/GoodsLabelLists.php create mode 100644 app/admin/lists/operation/OpurchaseclassLists.php create mode 100644 app/admin/logic/goods/GoodsLabelLogic.php create mode 100644 app/admin/logic/operation/OpurchaseclassLogic.php create mode 100644 app/admin/validate/goods/GoodsLabelValidate.php create mode 100644 app/admin/validate/operation/OpurchaseclassValidate.php create mode 100644 app/api/controller/order/OpurchaseOrderController.php delete mode 100644 app/api/controller/order/PurchaseOrderController.php delete mode 100644 app/ceshi/controller/IndexController.php create mode 100644 app/common/model/goods/GoodsLabel.php create mode 100644 app/common/model/operation/Opurchaseclass.php create mode 100644 app/common/model/opurchase/Opurchaseclass.php create mode 100644 app/common/model/opurchase/Opurchaseinfo.php diff --git a/app/admin/controller/goods/GoodsController.php b/app/admin/controller/goods/GoodsController.php index 49d03e0..7961f4d 100644 --- a/app/admin/controller/goods/GoodsController.php +++ b/app/admin/controller/goods/GoodsController.php @@ -92,4 +92,12 @@ class GoodsController extends BaseAdminController } + public function setLabel(){ + $params=$this->request->post(); + $result = GoodsLogic::setLabel($params); + if (true === $result) { + return $this->success('设置成功', [], 1, 1); + } + return $this->fail(GoodsLogic::getError()); + } } \ No newline at end of file diff --git a/app/admin/controller/goods/GoodsLabelController.php b/app/admin/controller/goods/GoodsLabelController.php new file mode 100644 index 0000000..d52d214 --- /dev/null +++ b/app/admin/controller/goods/GoodsLabelController.php @@ -0,0 +1,95 @@ +dataLists(new GoodsLabelLists()); + } + + + /** + * @notes 添加商品标签 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function add() + { + $params = (new GoodsLabelValidate())->post()->goCheck('add'); + $result = GoodsLabelLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(GoodsLabelLogic::getError()); + } + + + /** + * @notes 编辑商品标签 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function edit() + { + $params = (new GoodsLabelValidate())->post()->goCheck('edit'); + $result = GoodsLabelLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(GoodsLabelLogic::getError()); + } + + + /** + * @notes 删除商品标签 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function delete() + { + $params = (new GoodsLabelValidate())->post()->goCheck('delete'); + GoodsLabelLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取商品标签详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function detail() + { + $params = (new GoodsLabelValidate())->goCheck('detail'); + $result = GoodsLabelLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/operation/OpurchaseclassController.php b/app/admin/controller/operation/OpurchaseclassController.php new file mode 100644 index 0000000..fb0686f --- /dev/null +++ b/app/admin/controller/operation/OpurchaseclassController.php @@ -0,0 +1,95 @@ +dataLists(new OpurchaseclassLists()); + } + + + /** + * @notes 添加采购订单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function add() + { + $params = (new OpurchaseclassValidate())->post()->goCheck('add'); + $result = OpurchaseclassLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(OpurchaseclassLogic::getError()); + } + + + /** + * @notes 编辑采购订单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function edit() + { + $params = (new OpurchaseclassValidate())->post()->goCheck('edit'); + $result = OpurchaseclassLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(OpurchaseclassLogic::getError()); + } + + + /** + * @notes 删除采购订单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function delete() + { + $params = (new OpurchaseclassValidate())->post()->goCheck('delete'); + OpurchaseclassLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取采购订单详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function detail() + { + $params = (new OpurchaseclassValidate())->goCheck('detail'); + $result = OpurchaseclassLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/lists/goods/GoodsLabelLists.php b/app/admin/lists/goods/GoodsLabelLists.php new file mode 100644 index 0000000..6711603 --- /dev/null +++ b/app/admin/lists/goods/GoodsLabelLists.php @@ -0,0 +1,65 @@ + ['name'], + ]; + } + + + /** + * @notes 获取商品标签列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function lists(): array + { + return GoodsLabel::where($this->searchWhere) + ->field(['id', 'name']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取商品标签数量 + * @return int + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function count(): int + { + return GoodsLabel::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/operation/OpurchaseclassLists.php b/app/admin/lists/operation/OpurchaseclassLists.php new file mode 100644 index 0000000..d3d2061 --- /dev/null +++ b/app/admin/lists/operation/OpurchaseclassLists.php @@ -0,0 +1,65 @@ + ['merchant', 'order_arr', 'number'], + ]; + } + + + /** + * @notes 获取采购订单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function lists(): array + { + return Opurchaseclass::where($this->searchWhere) + ->field(['id', 'merchant', 'order_arr', 'cart_id', 'number', 'total', 'deduction_price', 'actual', 'money', 'paid']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取采购订单数量 + * @return int + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function count(): int + { + return Opurchaseclass::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/goods/GoodsLabelLogic.php b/app/admin/logic/goods/GoodsLabelLogic.php new file mode 100644 index 0000000..88c8c64 --- /dev/null +++ b/app/admin/logic/goods/GoodsLabelLogic.php @@ -0,0 +1,94 @@ + $params['name'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑商品标签 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + GoodsLabel::where('id', $params['id'])->update([ + 'name' => $params['name'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除商品标签 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public static function delete(array $params): bool + { + return GoodsLabel::destroy($params['id']); + } + + + /** + * @notes 获取商品标签详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public static function detail($params): array + { + return GoodsLabel::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/goods/GoodsLogic.php b/app/admin/logic/goods/GoodsLogic.php index df8ec65..9b8a2db 100644 --- a/app/admin/logic/goods/GoodsLogic.php +++ b/app/admin/logic/goods/GoodsLogic.php @@ -46,7 +46,7 @@ class GoodsLogic extends BaseLogic 'stocktip' => $params['stocktip'], 'retail_name' => $params['retail_name'], 'imgs' => $params['imgs'], - 'details' => $params['details']?implode(',',$params['details']):'', + 'details' => $params['details'] ? implode(',', $params['details']) : '', 'data' => $params['data'], 'more' => $params['more'], 'sort' => $params['sort'] @@ -91,7 +91,7 @@ class GoodsLogic extends BaseLogic 'stocktip' => $params['stocktip'], 'retail_name' => $params['retail_name'], 'imgs' => $params['imgs'], - 'details' => $params['details']?implode(',',$params['details']):'', + 'details' => $params['details'] ? implode(',', $params['details']) : '', 'data' => $params['data'], 'more' => $params['more'], 'sort' => $params['sort'] @@ -131,4 +131,28 @@ class GoodsLogic extends BaseLogic { return Goods::findOrEmpty($params['id'])->toArray(); } -} \ No newline at end of file + /** + * @notes 设置标签 + * @param $params + * @return bool + * @date 2024/04/23 11:28 + */ + public static function setLabel($params) + { + try { + $value = $params['sys_labels']; + if (!empty($value)) { + if (!is_array($value)){ + $value= ',' . $value . ','; + }else{ + $value = ',' . implode(',', $value) . ','; + } + } + Goods::where('id', $params['id'])->update(['sys_labels' => $value]); + return true; + } catch (\Exception $e) { + self::setError($e->getMessage()); + return false; + } + } +} diff --git a/app/admin/logic/operation/OpurchaseclassLogic.php b/app/admin/logic/operation/OpurchaseclassLogic.php new file mode 100644 index 0000000..b234ce2 --- /dev/null +++ b/app/admin/logic/operation/OpurchaseclassLogic.php @@ -0,0 +1,94 @@ +getMessage()); + return false; + } + } + + + /** + * @notes 编辑采购订单 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + Opurchaseclass::where('id', $params['id'])->update([ + + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除采购订单 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public static function delete(array $params): bool + { + return Opurchaseclass::destroy($params['id']); + } + + + /** + * @notes 获取采购订单详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public static function detail($params): array + { + return Opurchaseclass::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/goods/GoodsLabelValidate.php b/app/admin/validate/goods/GoodsLabelValidate.php new file mode 100644 index 0000000..058526b --- /dev/null +++ b/app/admin/validate/goods/GoodsLabelValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return GoodsLabelValidate + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return GoodsLabelValidate + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return GoodsLabelValidate + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return GoodsLabelValidate + * @author likeadmin + * @date 2024/04/27 09:23 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/operation/OpurchaseclassValidate.php b/app/admin/validate/operation/OpurchaseclassValidate.php new file mode 100644 index 0000000..2a209f8 --- /dev/null +++ b/app/admin/validate/operation/OpurchaseclassValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return OpurchaseclassValidate + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return OpurchaseclassValidate + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return OpurchaseclassValidate + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return OpurchaseclassValidate + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/api/controller/order/OpurchaseOrderController.php b/app/api/controller/order/OpurchaseOrderController.php new file mode 100644 index 0000000..e54394f --- /dev/null +++ b/app/api/controller/order/OpurchaseOrderController.php @@ -0,0 +1,37 @@ +request->get(); + $res=OrderLogic::cartIdByPurchaseOrderInfo($this->request->userInfo,$params); + if($res==false){ + return $this->fail(OrderLogic::getError()); + } + return $this->data($res); + } + + /** + * @notes 创建购货订单 + */ + public function createOrder(){ + $params=$this->request->post(); + $order=OrderLogic::createOpurchaseOrder(request()->userInfo,$params); + if($order==false){ + return $this->fail(OrderLogic::getError()); + }else{ + return $this->success('支付成功'); + } + } +} \ No newline at end of file diff --git a/app/api/controller/order/PurchaseOrderController.php b/app/api/controller/order/PurchaseOrderController.php deleted file mode 100644 index f3894fc..0000000 --- a/app/api/controller/order/PurchaseOrderController.php +++ /dev/null @@ -1,50 +0,0 @@ -request->get(); - $params['store_id']=1; - $res=OrderLogic::cartIdByPurchaseOrderInfo($params); - return $this->data($res); - } - - /** - * @notes 创建购货订单 - */ - public function createOrder(){ - - $user=User::where('id',$this->request->userId)->find(); - $cartId = (Array)$this->request->post('cart_id', []); - $addressId = (int)$this->request->post('address_id'); - $pay_type = (int)$this->request->post('pay_type'); - $auth_code = $this->request->post('auth_code'); //微信支付条码 - $params=$this->request->post(); - $order=OrderLogic::createOrder($cartId,$addressId,null,$params); - if(is_object($order)){ - if($pay_type==PayEnum::BALANCE_PAY){ - $user=User::where('id',$this->request->userId)->find(); - RetailOrderLogic::payBalance($user,$order); - return $this->success('支付成功'); - } - return $this->data(['order_id'=>$order->id]); - }else{ - return $this->fail(OrderLogic::getError()); - } - } -} \ No newline at end of file diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php index f59fe40..0391d11 100644 --- a/app/api/controller/order/RetailOrderController.php +++ b/app/api/controller/order/RetailOrderController.php @@ -35,11 +35,19 @@ class RetailOrderController extends BaseApiController $auth_code = $this->request->post('auth_code'); //微信支付条码 $params=$this->request->post(); $order=OrderLogic::createOrder($cartId,$addressId,null,$params); - if(is_object($order)){ + if($order!=false){ if($pay_type==PayEnum::BALANCE_PAY){ $user=User::where('id',$this->request->userId)->find(); - RetailOrderLogic::payBalance($user,$order); - return $this->success('支付成功'); + $res=RetailOrderLogic::payBalance($user,$order); + if($res==true){ + $res=RetailOrderLogic::paySuccess($order, ['money'=>$order['actual']]); + if($res){ + }else{ + return $this->fail(RetailOrderLogic::getError()); + } + }else{ + return $this->fail(RetailOrderLogic::getError()); + } } return $this->data(['order_id'=>$order->id]); }else{ diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 8e9c0fe..e11ae3d 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -4,6 +4,9 @@ namespace app\api\logic\order; use app\common\logic\BaseLogic; use app\common\model\goods\Goods; +use app\common\model\merchat\Merchant; +use app\common\model\opurchase\Opurchaseclass; +use app\common\model\opurchase\Opurchaseinfo; use app\common\model\order\Cart; use app\common\model\retail\Cashierclass; use app\common\model\retail\Cashierinfo; @@ -40,19 +43,18 @@ class OrderLogic extends BaseLogic 'time' => time(), 'number' => static::getNewOrderId('PF'), 'total' => array_sum(array_column($cart_select, 'total')), - 'pay_type' => $params['pay_type'], - 'cart_id'=>explode(',',$cartId) + 'pay_type' => $params['pay_type']??0, + 'cart_id'=>implode(',',$cartId) ]; return ['order' => $order, 'cart_list' => $cart_select]; } /** * 创建新订单 - * @return Object + * @return Object|bool */ - static public function createOrder($cartId, $addressId, $user = null, $params = []): Object + static public function createOrder($cartId, $addressId, $user = null, $params = []) { - $orderInfo = self::cartIdByOrderInfo($cartId, $addressId, $user, $params); $_order = $orderInfo['order']; $_order['deduction_price'] = 0; @@ -91,16 +93,29 @@ class OrderLogic extends BaseLogic * @param $params * @return array */ - static public function cartIdByPurchaseOrderInfo($params = []) + static public function cartIdByPurchaseOrderInfo($user, $params) { + if(!$user){ + self::setError('没有用户信息,请先登录'); + return false; + } + $mer_id=$user['merchant']['mer_id']; $where1=['paid'=>1]; - d(222); - $cartId=Cashierinfo::where('store_id',$params['store_id'])->where($where1)->select(); - throw new \RuntimeException("Command has no defaultName"); - $cartId=implode(',',$cartId); - var_dump($cartId); - $where = ['is_pay' => 0, 'is_fail' => 0]; - $cart_select = Cart::whereIn('cart_id', $cartId)->where($where)->field('goods_id as goods,cart_num')->select()->toArray(); + $cartId=Cashierclass::where('merchant',$mer_id)->whereDay('create_time')->where($where1)->column('cart_id'); + if(empty($cartId)){ + self::setError('没有购物车信息'); + return false; + } + $order_id=Cashierclass::where('merchant',$mer_id)->whereDay('create_time')->where($where1)->column('id'); + $cart_arr=[]; + foreach($cartId as $k=>$v){ + $arr=explode(',',$v); + foreach($arr as $kk=>$vv){ + $cart_arr[]=$vv; + } + } + $where = ['is_pay' => 1, 'is_fail' => 0]; + $cart_select = Cart::whereIn('cart_id', $cart_arr)->where($where)->field('goods_id as goods,cart_num')->select()->toArray(); if (empty($cart_select)) { self::setError('购物车为空'); return false; @@ -113,44 +128,52 @@ class OrderLogic extends BaseLogic } $order = [ 'time' => time(), - 'number' => static::getNewOrderId('PF'), + 'number' => static::getNewOrderId('CG'), 'total' => array_sum(array_column($cart_select, 'total')), - 'pay_type' => $params['pay_type'], - 'cart_id'=>explode(',',$cartId) + 'pay_type' => $params['pay_type']??0, + 'cart_id'=>implode(',',$cart_arr), + 'order_arr'=>implode(',',$order_id) ]; return ['order' => $order, 'cart_list' => $cart_select]; } /** * 创建购货订单 - * @return Object + * @return Object|bool */ - static public function createPurchaseOrder($cartId, $addressId, $user = null, $params = []): Object + static public function createOpurchaseOrder($user = null, $params = []) { - $orderInfo = self::cartIdByOrderInfo($cartId, $addressId, $user, $params); + if(!$user){ + self::setError('没有用户信息,请先登录'); + return false; + } + $mer_id=$user['merchant']['mer_id']; + $merchant=Merchant::where('mer_id',$mer_id)->find(); + $orderInfo = self::cartIdByPurchaseOrderInfo($user, $params); + if(!$orderInfo){ + return false; + } $_order = $orderInfo['order']; - $_order['deduction_price'] = 0; - $_order['merchant'] = 0; - $_order['customer'] = request()->userId; - $_order['money'] = 0; - $_order['user'] = request()->userId; - $_order['account'] = 0; - $_order['payinfo'] = ''; - $_order['type'] = 0; + if($_order['total']<$merchant['mer_money']){ + self::setError('商户余额不足'); + return false; + } + $_order['merchant'] = $mer_id; + $_order['money'] = $_order['total']; $_order['actual'] = $_order['total']; + $_order['paid'] = 1; Db::startTrans(); try { - $order = Cashierclass::create($_order); + $order = Opurchaseclass::create($_order); + $goods_list = $orderInfo['cart_list']; foreach ($goods_list as $k => $v) { - $goods_list[$k]['pid'] = $order->id; - $goods_list[$k]['merchant'] = 0; - $goods_list[$k]['room'] = 0; - $goods_list[$k]['discount'] = 0; - $goods_list[$k]['warehouse'] = 0; $goods_list[$k]['nums'] = $v['cart_num']; } - (new Cashierinfo())->saveAll($goods_list); + (new Opurchaseinfo())->saveAll($goods_list); + $merchant->mer_money=bcsub($merchant->mer_money,$_order['total'],2); + $order_arr=explode(',',$_order['order_arr']); + Cashierclass::where('id','in',$order_arr)->update(['is_opurchase'=>1]); Db::commit(); return $order; } catch (\Exception $e) { diff --git a/app/ceshi/controller/IndexController.php b/app/ceshi/controller/IndexController.php deleted file mode 100644 index 845e8e4..0000000 --- a/app/ceshi/controller/IndexController.php +++ /dev/null @@ -1,29 +0,0 @@ - 'webman']); - } - - public function json(Request $request) - { - return json(['code' => 0, 'msg' => 'ok']); - } - -} diff --git a/app/common/cache/UserTokenCache.php b/app/common/cache/UserTokenCache.php index 13148a9..2e71cdd 100644 --- a/app/common/cache/UserTokenCache.php +++ b/app/common/cache/UserTokenCache.php @@ -15,6 +15,7 @@ namespace app\common\cache; +use app\common\model\merchat\Merchant; use app\common\model\user\User; use app\common\model\user\UserSession; use support\Cache; @@ -72,10 +73,11 @@ class UserTokenCache extends BaseCache $user = User::where('id', '=', $userSession->user_id) ->find(); - + $merchant=Merchant::where('uid',$userSession->user_id)->find(); $userInfo = [ 'user_id' => $user->id, 'nickname' => $user->nickname, + 'merchant' => $merchant, 'token' => $token, 'sn' => $user->sn, 'mobile' => $user->mobile, diff --git a/app/common/logic/order/RetailOrderLogic.php b/app/common/logic/order/RetailOrderLogic.php index 2a87437..5088337 100644 --- a/app/common/logic/order/RetailOrderLogic.php +++ b/app/common/logic/order/RetailOrderLogic.php @@ -64,8 +64,6 @@ class RetailOrderLogic extends BaseLogic 'mer_id' => $order['merchant'], ]; (new FinancialRecord())->saveAll($record); - $CallbackData = ['money' => $order['actual']]; - self::paySuccess($order, $CallbackData); Db::commit(); return true; } catch (Exception $e) { @@ -90,16 +88,24 @@ class RetailOrderLogic extends BaseLogic $order->paid = 1; $order->save(); if($order['cart_id']){ - $cart_arr=implode(',',$order['cart_id']); - Cart::whereIn('id',$cart_arr)->update(['is_pay'=>1]); + if(!is_array($order['cart_id'])){ + $cart_arr=explode(',',$order['cart_id']); + Cart::whereIn('cart_id',$cart_arr)->update(['is_pay'=>1]); + }else{ + Cart::whereIn('cart_id',$order['cart_id'])->update(['is_pay'=>1]); + } } + Log::info('支付成功'); // 提交事务 Db::commit(); + return true; } catch (\Exception $e) { // 回滚事务 Db::rollback(); + Log::error('支付失败'.$e->getMessage().'。like:'.$e->getLine()); + self::setError('支付失败'.$e->getMessage()); + return false; } - // TODO: Implement paySuccess() method. } } diff --git a/app/common/model/goods/Goods.php b/app/common/model/goods/Goods.php index 3e5bb15..aab29ae 100644 --- a/app/common/model/goods/Goods.php +++ b/app/common/model/goods/Goods.php @@ -23,6 +23,21 @@ class Goods extends BaseModel { return explode(',',$value); } + public function setSysLabelAttr($value) + { + if (!empty($value)) { + if (!is_array($value)) + return ','. $value .','; + return ','. implode(',', $value) .','; + } + return $value; + } + + public function getSysLabelAttr($value) + { + if (!$value) return []; + return explode(',',rtrim(ltrim($value,','),',')); + } public function className() { return $this->hasOne(Goodsclass::class,'id','class')->bind(['class_name'=>'name']); diff --git a/app/common/model/goods/GoodsLabel.php b/app/common/model/goods/GoodsLabel.php new file mode 100644 index 0000000..4dd5140 --- /dev/null +++ b/app/common/model/goods/GoodsLabel.php @@ -0,0 +1,22 @@ +=7.4", - "symfony/var-dumper": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.1.x-dev" - } - }, - "autoload": { - "files": [ - "src/helpers.php" - ], - "psr-4": { - "Max\\VarDumper\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "chengyao", - "email": "987861463@qq.com" - } - ], - "homepage": "https://github.com/marxphp/var-dumper", - "support": { - "issues": "https://github.com/next-laboratory/var-dumper/issues", - "source": "https://github.com/next-laboratory/var-dumper/tree/0.1.1" - }, - "abandoned": "next/var-dumper", - "time": "2023-07-07T12:54:36+00:00" - }, { "name": "monolog/monolog", "version": "2.9.2", diff --git a/config/exception.php b/config/exception.php index b222357..9669395 100644 --- a/config/exception.php +++ b/config/exception.php @@ -15,5 +15,5 @@ return [ // '' => support\exception\Handler::class, // '' => app\common\exception\Handler::class, - '' => \App\ExceptionHandler::class, + '' => app\ExceptionHandler::class, ]; \ No newline at end of file diff --git a/config/middleware.php b/config/middleware.php index 3aa85db..adf239a 100644 --- a/config/middleware.php +++ b/config/middleware.php @@ -24,13 +24,13 @@ return [ // 权限认证 app\admin\middleware\AuthMiddleware::class, ], - // 'api' => [ - // // 跨域中间件 - // app\common\http\middleware\AdminAllowMiddleware::class, + 'api' => [ + // 跨域中间件 + app\common\http\middleware\AdminAllowMiddleware::class, - // app\api\http\middleware\InitMiddleware::class, + app\api\http\middleware\InitMiddleware::class, - // app\api\http\middleware\LoginMiddleware::class, + app\api\http\middleware\LoginMiddleware::class, - // ] + ] ]; diff --git a/config/thinkorm.php b/config/thinkorm.php index 77eb1a6..9be215f 100644 --- a/config/thinkorm.php +++ b/config/thinkorm.php @@ -23,7 +23,7 @@ return [ // 断线重连 'break_reconnect' => true, // 关闭SQL监听日志 - 'trigger_sql' => true, + 'trigger_sql' => false, // 自定义分页类 'bootstrap' => '' ],