Merge remote-tracking branch 'origin/sit-three-categories' into sit-three-categories

alien-store/src/main/java/shop/alien/store/controller/StoreCuisineController.java

@@ -114,7 +114,7 @@ public class StoreCuisineController {
             @ApiImplicitParam(name = "shelfStatus", value = "上下架状态：1-上架，2-下架", dataType = "Integer", paramType = "query", required = true)
     })
     @PostMapping("/changeShelfStatus")
-    public R<String> changeShelfStatus(Integer id, Integer shelfStatus) {
+    public R<String> changeShelfStatus(@RequestParam("id") Integer id, @RequestParam("shelfStatus") Integer shelfStatus) {
         log.info("StoreCuisineController.changeShelfStatus?id={},shelfStatus={}", id, shelfStatus);
         if (shelfStatus == null || (shelfStatus != 1 && shelfStatus != 2)) {
             return R.fail("上下架状态不合法（只能为1或2）");
@@ -142,7 +142,9 @@ public class StoreCuisineController {
             @RequestParam(required = false) Integer storeId,
             @RequestParam(required = false) String name,
             @RequestParam(required = false) Integer status,
-            @RequestParam(required = true) Integer type) {
+            @RequestParam(required = true) Integer type,
+            @RequestParam(required = false) Integer origin)
+    {
         log.info("StoreCuisineController.getPage?pageNum={},pageSize={},storeId={},name={},status={},type={}", pageNum, pageSize, storeId, name, status, type);
         List<PriceListVo> priceListVo = new ArrayList<>();
 
@@ -150,7 +152,9 @@ public class StoreCuisineController {
             Page<StoreCuisine> page = new Page<>(pageNum, pageSize);
             LambdaQueryWrapper<StoreCuisine> queryWrapper = new LambdaQueryWrapper<>();
             // 默认只查询已上架的菜品/套餐（shelf_status = 1）
-            queryWrapper.eq(StoreCuisine::getShelfStatus, 1);
+            if(null==origin){
+                queryWrapper.eq(StoreCuisine::getShelfStatus, 1);
+            }
             if (storeId != null) {
                 queryWrapper.eq(StoreCuisine::getStoreId, storeId);
             }

alien-store/src/main/java/shop/alien/store/controller/StorePriceController.java

@@ -139,11 +139,15 @@ public class StorePriceController {
             @RequestParam(required = false) Integer storeId,
             @RequestParam(required = false) String name,
             @RequestParam(required = false) Integer status,
-            @RequestParam(required = false) Integer shelfStatus) {
+            @RequestParam(required = false) Integer shelfStatus,
+            @RequestParam(required = false) Integer origin) {
         log.info("StorePriceController.getPage?pageNum={},pageSize={},storeId={},name={},status={},shelfStatus={}",
                 pageNum, pageSize, storeId, name, status, shelfStatus);
         Page<StorePrice> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<StorePrice> queryWrapper = new LambdaQueryWrapper<>();
+        if(null==origin){
+            queryWrapper.eq(StorePrice::getShelfStatus, 1);
+        }
         if (storeId != null) {
             queryWrapper.eq(StorePrice::getStoreId, storeId);
         }
@@ -192,11 +196,11 @@ public class StorePriceController {
     @ApiOperation("上下架操作：1-上架，2-下架")
     @ApiOperationSupport(order = 8)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "通用价目id", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "shelfStatus", value = "上下架状态：1-上架，2-下架", dataType = "Integer", paramType = "query", required = true)
+            @ApiImplicitParam(name = "id", value = "通用价目id", dataType = "Integer", paramType = "query", required = false),
+            @ApiImplicitParam(name = "shelfStatus", value = "上下架状态：1-上架，2-下架", dataType = "Integer", paramType = "query", required = false)
     })
     @PostMapping("/changeShelfStatus")
-    public R<String> changeShelfStatus(@RequestParam Integer id, @RequestParam Integer shelfStatus) {
+    public R<String> changeShelfStatus(@RequestParam("id") Integer id, @RequestParam("shelfStatus") Integer shelfStatus) {
         log.info("StorePriceController.changeShelfStatus?id={},shelfStatus={}", id, shelfStatus);
         if (shelfStatus == null || (shelfStatus != 1 && shelfStatus != 2)) {
             return R.fail("上下架状态不合法（只能为1或2）");

alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffConfigServiceImpl.java

@@ -247,15 +247,15 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
                             (videoAuditResult == null || videoAuditResult.isPassed());
 
         // 根据 AI 审核结果更新状态
-        // 审核通过：状态保持为"0"（审核中），等待人工审核
+        // 审核通过：状态保持为"1"（审核通过）
         // 审核失败：状态设置为"2"（审核拒绝）
         StoreStaffConfig auditUpdate = new StoreStaffConfig();
         auditUpdate.setId(staffId);
         if (allPassed) {
-            // AI审核通过，状态保持为"审核中"（0），等待人工审核
-            auditUpdate.setStatus("0");
+            // AI审核通过，状态保持为"审核中"（1）
+            auditUpdate.setStatus("1");
             auditUpdate.setRejectionReason(null);
-            log.info("人员AI审核通过，状态保持为审核中，等待人工审核：staffId={}", staffId);
+            log.info("人员AI审核通过，状态设置为审核通过：staffId={}", staffId);
         } else {
             // AI审核失败，状态设置为"审核拒绝"（2）
             // 收集所有失败原因