diff --git a/app/Constants/Common/GoodCode.php b/app/Constants/Common/GoodCode.php index 3b96833..99b1ef9 100644 --- a/app/Constants/Common/GoodCode.php +++ b/app/Constants/Common/GoodCode.php @@ -27,4 +27,10 @@ class GoodCode */ CONST INT LISTING = 1; CONST INT DELIST = 2; + + /** + * @var int 加主食 1=是 2=否 + */ + CONST INT IS_ADD_STAPLE_FOOD = 1; + CONST INT IS_NOT_ADD_STAPLE_FOOD = 2; } \ No newline at end of file diff --git a/app/Controller/Api/GoodController.php b/app/Controller/Api/GoodController.php index 514f1c0..13f0af7 100644 --- a/app/Controller/Api/GoodController.php +++ b/app/Controller/Api/GoodController.php @@ -3,6 +3,7 @@ namespace App\Controller\Api; use App\Controller\AbstractController; +use App\Service\Api\Good\AddStapleFoodInfoService; use App\Service\Api\Good\MealListService; use App\Service\Api\Good\OptionalListService; use Hyperf\HttpServer\Annotation\Controller; @@ -34,4 +35,15 @@ class GoodController extends AbstractController { return (new MealListService)->handle(); } + + /** + * @return array + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + */ + #[RequestMapping(path: 'add_staple_food',methods: 'GET')] + public function add_staple_food() + { + return (new AddStapleFoodInfoService)->handle(); + } } \ No newline at end of file diff --git a/app/Controller/Api/UserController.php b/app/Controller/Api/UserController.php index 9d87737..24f50b9 100644 --- a/app/Controller/Api/UserController.php +++ b/app/Controller/Api/UserController.php @@ -11,6 +11,7 @@ use App\Service\Api\Login\LogOutService; use App\Service\Api\User\BindPhoneByWxService; use App\Service\Api\User\InviteListService; use App\Service\Api\User\SiteService; +use App\Service\Api\User\UnBindPhoneService; use Hyperf\HttpServer\Annotation\Controller; use Hyperf\HttpServer\Annotation\Middlewares; use Hyperf\HttpServer\Annotation\RequestMapping; @@ -37,6 +38,11 @@ class UserController extends AbstractController return (new BindPhoneByWxService)->handle(); } + public function unbind_phone() + { + return (new UnBindPhoneService)->handle(); + } + /** * @return array * @throws ContainerExceptionInterface diff --git a/app/Model/Sku.php b/app/Model/Sku.php index 0539ef1..70b8bff 100644 --- a/app/Model/Sku.php +++ b/app/Model/Sku.php @@ -26,6 +26,8 @@ use Hyperf\DbConnection\Model\Model; * @property int $saleable * @property int $sort * @property int $is_del + * @property int $code_number + * @property int $is_add_staple_food * @property string $create_time * @property string $update_time */ @@ -46,7 +48,7 @@ class Sku extends Model /** * The attributes that should be cast to native types. */ - protected array $casts = ['id' => 'integer', 'spu_id' => 'integer', 'total_stock' => 'integer', 'surplus_stock' => 'integer', 'sales_num' => 'integer', 'order_num' => 'integer', 'cancel_num' => 'integer', 'refund_num' => 'integer', 'saleable' => 'integer','sort' => 'integer']; + protected array $casts = ['id' => 'integer', 'spu_id' => 'integer', 'total_stock' => 'integer', 'surplus_stock' => 'integer', 'sales_num' => 'integer', 'order_num' => 'integer', 'cancel_num' => 'integer', 'refund_num' => 'integer', 'saleable' => 'integer','sort' => 'integer','is_add_staple_food' => 'integer','code_number' => 'integer']; const string CREATED_AT = 'create_time'; const string UPDATED_AT = 'update_time'; diff --git a/app/Model/Spu.php b/app/Model/Spu.php index 77eb3fd..00539e6 100644 --- a/app/Model/Spu.php +++ b/app/Model/Spu.php @@ -83,7 +83,7 @@ class Spu extends Model ->where('type',$type) ->where('saleable',GoodCode::LISTING) ->orderBy('sort') - ->select(['id','cycle_id','chef_id','title','title','sub_title','category_id']) + ->select(['id','cycle_id','chef_id','title','title','sub_title','category_id','is_add_staple_food']) ->get(); } } diff --git a/app/Service/Admin/Good/SkuService.php b/app/Service/Admin/Good/SkuService.php index 945bca1..2e2cb04 100644 --- a/app/Service/Admin/Good/SkuService.php +++ b/app/Service/Admin/Good/SkuService.php @@ -104,6 +104,8 @@ class SkuService extends BaseService $insertModel->refund_num = 0; // $insertModel->behind_refund_num = 0; $insertModel->saleable = $this->request->input('saleable'); + $insertModel->is_add_staple_food = $this->request->input('is_add_staple_food'); + $insertModel->code_number = $this->request->input('code_number'); $insertModel->sort = $this->request->input('sort'); if (!$insertModel->save()) throw new ErrException('添加失败'); @@ -165,6 +167,8 @@ class SkuService extends BaseService $skuInfo->saleable = $this->request->input('saleable'); $skuInfo->title = $this->request->input('title'); $skuInfo->sort = $this->request->input('sort'); + $skuInfo->is_add_staple_food = $this->request->input('is_add_staple_food'); + $skuInfo->code_number = $this->request->input('code_number'); if (!$skuInfo->save()) throw new ErrException('修改失败'); diff --git a/app/Service/Api/Good/AddStapleFoodInfoService.php b/app/Service/Api/Good/AddStapleFoodInfoService.php new file mode 100644 index 0000000..061020b --- /dev/null +++ b/app/Service/Api/Good/AddStapleFoodInfoService.php @@ -0,0 +1,67 @@ +initTodayCycleId(); + + if (empty($cycleId)) return $this->return->success('success', ['list' => []]); + + $siteInfo = $this->siteCache->getSiteInfo((int)$this->request->input('site_id')); + + if (empty($siteInfo) || empty($siteInfo['kitchen_id'])) return $this->return->success('success', ['list' => []]); + + $this->goodCache->cycleId = (int)$cycleId; + $this->goodCache->kitchenId = (int)$siteInfo['kitchen_id']; + $data = $this->goodCache->getMealGoodList(); + + $res = []; + foreach ($data as $item) { + if ($item['is_add_staple_food'] != GoodCode::IS_ADD_STAPLE_FOOD) continue; + + $res[] = $item; + break; + } + + return $this->return->success('success', ['add_food_info' => $res]); + } +} \ No newline at end of file diff --git a/app/Service/Api/User/UnBindPhoneService.php b/app/Service/Api/User/UnBindPhoneService.php new file mode 100644 index 0000000..f702d64 --- /dev/null +++ b/app/Service/Api/User/UnBindPhoneService.php @@ -0,0 +1,39 @@ +userModel->find($this->userId); + + if ($userInfo->isEmpty()) throw new ErrException('用户不存在'); + + $userInfo->phone = ''; + + if (!$userInfo->save()) throw new ErrException('解绑失败'); + + return $this->return->success('解绑成功'); + } +} \ No newline at end of file