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); }