From 7268ed6c1801838cd8cc687111172bae22ac1404 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 30 Jun 2022 15:06:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8E=B0=E9=87=91=E7=BA=A2?= =?UTF-8?q?=E5=8C=85=E6=B4=BB=E5=8A=A8=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/XhpcActivityApplication.java | 2 -- .../service/impl/XhpcActivityCashServiceImpl.java | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java index 259574ba..bddf8ad0 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java @@ -22,10 +22,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @MapperScan("com.xhpc.activity.mapper") public class XhpcActivityApplication { - public static void main(String[] args) { - SpringApplication.run(XhpcActivityApplication.class, args); } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityCashServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityCashServiceImpl.java index 67aca9f7..2fd5b050 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityCashServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityCashServiceImpl.java @@ -39,9 +39,7 @@ public class XhpcActivityCashServiceImpl extends BaseService implements XhpcActi @Override public List getPage(Map params) { - List domainList = cashMapper.selectByParams(params); - - return domainList; + return cashMapper.selectByParams(params); } @@ -63,7 +61,6 @@ public class XhpcActivityCashServiceImpl extends BaseService implements XhpcActi public boolean insertDomain(XhpcActivityCashDomain domain) { cashMapper.insert(domain); - for (XhpcActivityImgDomain imgDomain : domain.getCheckImgList()) { imgDomain.setActivityType(ActivityTypeEnum.CASH.getCode()); imgDomain.setActivityId(domain.getActivityId()); @@ -95,6 +92,7 @@ public class XhpcActivityCashServiceImpl extends BaseService implements XhpcActi throw new CustomException("活动不存在"); } cashDomain.setStatus(domain.getStatus()); + cashDomain.setCheckBy(domain.getCheckBy()); return cashMapper.checkByPrimaryKey(cashDomain) > 0; } @@ -137,8 +135,7 @@ public class XhpcActivityCashServiceImpl extends BaseService implements XhpcActi params.put("bUserIds", bUserIds); startPage(); - List> userList = cashMapper.selectUserListByParams(params); - return userList; + return cashMapper.selectUserListByParams(params); }