From db12c5e7064876262d472a6a03e49b60b1faea90 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Tue, 1 Apr 2025 10:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E6=94=AF=E4=BB=98=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E6=97=B6=E4=B8=8D=E6=94=B9=E5=8F=98=E5=B7=B2=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=E4=BD=9C=E5=93=81=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSystemController.java | 1 + .../controller/app/pay/PayBackController.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index 8745c828..74630450 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -1037,6 +1037,7 @@ public class AppSystemController extends BaseController { // 发布用户作品-------新版 // 由于APP前端不支持预订时间-----startTime一定是从明天开始 // 20250313更新---- 订单时间从明天12点开始. 修改LocalDate 为LocalDateTime + // 20250401更新---- 已通过审核的作品发布时直接通过审核? @Transactional @PostMapping("/publishUserWorkNew") public AjaxResult publishUserWorkNew(@RequestBody List publishUserWorkDtoList) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java index 8cd5ecc2..55a98dfd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java @@ -120,17 +120,23 @@ public class PayBackController { //------------------------------------------更新资源位表 sys_source end------------------------------------------ + //---------------------------------------------20250401更新 不修改work_status的状态, 审核通过的直接过了------------------------------------------------- //------------------------------------------更新作品表 user_work 中的 work_status 为 2 以发表待审核---------------------------------- UserWork userWork = userWorkService.selectUserWorkByWorkId(orderCacheVo.getWorkId()); userWork.setPostTime(DateUtils.getNowDate()); - // 更新作品状态 - if(!userWork.getWorkStatus().equals("2")) { + + + + //------------------------------------ 更新作品状态 旧版-------------------------------------------------------------- + if(!userWork.getWorkStatus().equals("3")) { userWork.setWorkStatus("2"); - userWork.setScenic(sysSource.getScenic()); - userWork.setCity(sysSource.getCity()); - userWork.setPart(sysSource.getPart()); - userWorkService.updateUserWork(userWork); } + userWork.setScenic(sysSource.getScenic()); + userWork.setCity(sysSource.getCity()); + userWork.setPart(sysSource.getPart()); + userWorkService.updateUserWork(userWork); + + //--------------------------------------更新作品状态 旧版end---------------------------------------------------------- //------------------------------------------更新作品表 user_work 中的 work_status end------------------------------- //---------------------------------------daily_source 中 资源位 b_bought+1-----------------------------------------