diff --git a/app/controller/api/community/Community.php b/app/controller/api/community/Community.php index 93fc3d12..105d600b 100644 --- a/app/controller/api/community/Community.php +++ b/app/controller/api/community/Community.php @@ -559,7 +559,7 @@ class Community extends BaseController Db::name('store_product_attr_value')->where('product_id', $prod['product_id'])->where('unique', $prod['product_attr_unique'])->inc('stock', $prod['number'])->update(); } Db::name('resale')->where('community_id', $id)->where('status', 0)->update(['is_del' => 1]); - Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->where('is_del', 0)->update(['is_del' => 1, 'status' => $status, 'mer_status' => 2]); + Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->where('is_del', 0)->update(['is_del' => 1, 'status' => -2, 'mer_status' => 2]); Db::commit(); } catch (\Exception $e) { Db::rollback(); @@ -602,7 +602,7 @@ class Community extends BaseController Db::name('store_product_attr_value')->where('product_id', $prod['product_id'])->where('unique', $prod['product_attr_unique'])->inc('stock', $prod['number'])->update(); } Db::name('resale')->where('community_id', $id)->where('status', 0)->update(['is_del' => 1]); - Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->update(['is_del' => 1, 'status' => -1]); + Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->update(['is_del' => 1, 'status' => -2]); Db::commit(); } catch (\Exception $e) { Db::rollback(); @@ -637,14 +637,17 @@ class Community extends BaseController */ public function checkEntrust($id) { - $communityInfo = Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->where('is_del', 0)->find(); + $communityInfo = Db::name('community')->where('community_id', $id)->where('is_del', 0)->find(); if (!$communityInfo) { return app('json')->fail('委托商品不存在'); } + if ($communityInfo['mer_status'] > 0) { + return app('json')->fail('该委托商品已审核'); + } $merchantId = Db::name('merchant')->where('uid', $this->request->uid())->value('mer_id'); $entrustInfo = Db::name('entrust')->where('community_id', $id)->where('entrust_mer_id', $merchantId)->where('is_del', 0)->where('status', 0)->fetchSql(false)->find(); if (!$entrustInfo) { - return app('json')->fail('用户无审核此委托商品权限'); + return app('json')->fail('当前商户无审核此委托商品权限'); } $status = $this->request->param('status'); if (!$status) { @@ -652,7 +655,7 @@ class Community extends BaseController } // 同意 if ($status == 1) { - Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->where('is_del', 0)->update(['status' => $status, 'mer_status' => 1]); + Db::name('community')->where('community_id', $id)->where('is_del', 0)->update(['status' => $status, 'mer_status' => 1]); } // 拒绝 if ($status == 2) { @@ -664,7 +667,7 @@ class Community extends BaseController Db::name('store_product_attr_value')->where('product_id', $prod['product_id'])->where('unique', $prod['product_attr_unique'])->inc('stock', $prod['number'])->update(); } Db::name('entrust')->where('community_id', $id)->where('status', 0)->update(['is_del' => 1]); - Db::name('community')->where('uid', $this->request->uid())->where('community_id', $id)->where('is_del', 0)->update(['is_del' => 1, 'status' => $status, 'mer_status' => 2]); + Db::name('community')->where('community_id', $id)->where('is_del', 0)->update(['is_del' => 1, 'status' => -2, 'mer_status' => 2]); Db::commit(); } catch (\Exception $e) { Db::rollback(); diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index bcf75479..33590406 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -118,7 +118,7 @@ class StoreOrder extends BaseController if (!empty($hasCourierData) && is_string($hasCourierData)) { $courierData = json_decode($hasCourierData, true); if (empty($courierData['code']) || $courierData['code'] != 1) { - throw new ValidateException('该收货区域未配送快递员'); + throw new ValidateException('该收货区域未设置快递员'); } } }