From e2ed1627305810d9d87cd2acb5bc785f642ba864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sun, 24 May 2020 11:54:35 +0800 Subject: [PATCH] 1 --- .../ActivityInstanceController.java | 23 ++++++++++- .../service/IPmnPromotionSrcService.java | 2 + .../impl/PmnPromotionSrcServiceImpl.java | 41 ++++++++++++++++--- src/main/resources/application-dev.yml | 2 + .../activity/PmnActivityInstanceDOMapper.xml | 12 +++++- 5 files changed, 71 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/controller/ActivityInstanceController.java b/src/main/java/com/kiisoo/ic/activity/controller/ActivityInstanceController.java index 51bef77..bb96b2d 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityInstanceController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityInstanceController.java @@ -7,6 +7,7 @@ import com.kiisoo.ic.activity.mapper.PmnActivityStoreRelationMapper; import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; import com.kiisoo.ic.activity.service.IPmnActivityScheduleService; import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; +import com.kiisoo.ic.activity.service.IPmnPromotionSrcService; import com.kiisoo.ic.common.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -38,6 +39,8 @@ public class ActivityInstanceController extends BaseController { IPmnActivityInstanceService pmnActivityInstanceService; @Resource IPmnActivityScheduleService pmnActivityScheduleService; + @Resource + IPmnPromotionSrcService pmnPromotionSrcService; @ApiOperation(value = "活动实例分页列表") @GetMapping(value = "/list") @@ -51,7 +54,7 @@ public class ActivityInstanceController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "当前页数", dataType = "int", paramType = "form"), @ApiImplicitParam(name = "pageSize", value = "每页条数", defaultValue = "10", dataType = "int", paramType = "form"), }) - public Map instanceList(Long userId, String startDate, String endDate, Long organizationId, Long storeId, Integer status, @RequestParam("pageNum") int pageNum, @RequestParam("pageSize")int pageSize) { + public Map instanceList(Long userId, String startDate, String endDate, Long organizationId, Long storeId, Integer status, @RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { // TODO 需要根据当前用户角色分开查询 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); try { @@ -61,6 +64,22 @@ public class ActivityInstanceController extends BaseController { return fail(); } } + @ApiOperation(value = "店铺码分页列表") + @GetMapping(value = "/StoreCode") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "form"), + @ApiImplicitParam(name = "instanceId", value = "活动实例ID", dataType = "string", paramType = "form"), + @ApiImplicitParam(name = "pageNum", value = "当前页数", dataType = "int", paramType = "form"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", defaultValue = "10", dataType = "int", paramType = "form"), + }) + public Map storeCode(Long userId, Long instanceId, @RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { + try { + return data(pmnPromotionSrcService.pageStoreCode(userId, instanceId, pageNum, pageSize)); + } catch (Exception e) { + log.error("查询出错", e); + return fail(); + } + } @ApiOperation(value = "根据活动池新建/编辑实例") @PostMapping(value = "/save") @@ -126,7 +145,7 @@ public class ActivityInstanceController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "活动id", dataType = "int", paramType = "form"), }) - public Map codeList(){ + public Map codeList() { return data(null); } } diff --git a/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java b/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java index e1d1ab1..f850e58 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java +++ b/src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java @@ -5,6 +5,7 @@ import com.kiisoo.ic.activity.bean.PromotionSrcVO; import com.kiisoo.ic.activity.entity.PmnPromotionSrc; import com.kiisoo.ic.store.entity.PoiStoreStaff; +import java.util.Date; import java.util.List; /** @@ -17,6 +18,7 @@ import java.util.List; */ public interface IPmnPromotionSrcService extends IService { List listUserCodes(Long userId) throws Exception; + List pageStoreCode(Long userId, Long instanceId, Integer pageNum, Integer pageSize) throws Exception; String saveCodeFile(String fileUrl, String code); boolean createCode(PoiStoreStaff staff, Long instanceId); } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java index ab2d898..21768a7 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java @@ -2,14 +2,18 @@ package com.kiisoo.ic.activity.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import com.kiisoo.ic.activity.bean.ActivityInstanceVO; import com.kiisoo.ic.activity.bean.PromotionSrcVO; import com.kiisoo.ic.activity.entity.PmnActivityInstance; import com.kiisoo.ic.activity.entity.PmnActivityInstanceConfig; +import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation; import com.kiisoo.ic.activity.entity.PmnPromotionSrc; import com.kiisoo.ic.activity.mapper.PmnPromotionSrcDOMapper; import com.kiisoo.ic.activity.service.IPmnActivityInstanceConfigService; import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; +import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; import com.kiisoo.ic.activity.service.IPmnPromotionSrcService; import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; @@ -30,6 +34,7 @@ import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.system.service.PrivilageAccountService; import com.kiisoo.ic.webappmy.vo.StafferInfoVO; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.shiro.crypto.hash.SimpleHash; import org.springframework.beans.BeanUtils; @@ -41,9 +46,8 @@ import java.io.File; import java.io.FileOutputStream; import java.net.URL; import java.sql.Wrapper; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; /** *

@@ -74,6 +78,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl srcs = list(Wrappers.lambdaQuery().eq(PmnPromotionSrc::getPromoterId, userId).eq(PmnPromotionSrc::getType, type)); for (PmnPromotionSrc src : srcs) { File codeFile = new File("activity/" + src.getCode() + ".png"); @@ -164,6 +173,28 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl pageStoreCode(Long userId, Long instanceId, Integer pageNum, Integer pageSize) throws Exception { + Map results = new HashMap<>(); + PageHelper.startPage(pageNum, pageSize); + List storeRelations = pmnActivityStoreRelationService.list(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instanceId)); + if (CollectionUtils.isEmpty(storeRelations)) { + results.put("this", null); + } + AtomicInteger number = new AtomicInteger(1 + ((pageNum - 1) * pageSize)); + for (PmnActivityStoreRelation store : storeRelations) { + PmnPromotionSrc src = getOne(Wrappers.lambdaQuery().eq(PmnPromotionSrc::getPromoterId, store.getStoreId()).eq(PmnPromotionSrc::getInstanceId, instanceId).eq(PmnPromotionSrc::getType, 2)); + if(src == null || src.getCode() == null) { + File codeFile = new File("activity/" + src.getCode() + ".png"); + + } + } + //求分页总数 +// Page pageList = (Page) storeRelations; +// Long totalSize = pageList.getTotal(); + return null; + } + @Override public String saveCodeFile(String fileUrl, String code) { try { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c6111e7..d4ffb6b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,6 +5,8 @@ logging: mybatis: mapperLocations: classpath:mapper/*.xml + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl spring: datasource: diff --git a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml index fb760ed..321557f 100644 --- a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml +++ b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml @@ -24,8 +24,16 @@ select * from pmn_activity_promotion_param where id in(select param_id from pmn_