diff --git a/pom.xml b/pom.xml index f410b33..7b85996 100644 --- a/pom.xml +++ b/pom.xml @@ -213,6 +213,12 @@ com.github.pagehelper pagehelper-spring-boot-starter 1.2.5 + + + mybatis-spring-boot-starter + org.mybatis.spring.boot + + 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 89b0b01..ab2d898 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 @@ -55,6 +55,7 @@ import java.util.List; */ @Service public class PmnPromotionSrcServiceImpl extends ServiceImpl implements IPmnPromotionSrcService { + @Autowired private StoreEmployeeService storeEmployeeService; @Autowired @@ -62,12 +63,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl staff(@RequestParam(value = "instanceId") Long instanceId, + @RequestParam(value = "storeId") Long storeId, + @RequestParam("pageNum") int pageNum, + @RequestParam("pageSize") int pageSize) { + try { + Map map = promotionSrcService.listStaff(instanceId, storeId, pageNum, pageSize); + return data(map); + } catch (Exception e) { + log.error("查询失败", e); + return fail(); + } + + } + + +} diff --git a/src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java b/src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java new file mode 100644 index 0000000..09b65d2 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java @@ -0,0 +1,27 @@ +package com.kiisoo.ic.promotion.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PmnPromotionSrcVO { + + private String name; + private String staffCode; + private String mobile; + private String storeName; + private int type; + private String code; + + /* + *分页总条数 + */ + @ApiModelProperty(value = "分页总条数", hidden = true) + private long totalSize; + + /**序号*/ + @ApiModelProperty(value = "序号", hidden = true) + private int number; + + +} diff --git a/src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java b/src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java new file mode 100644 index 0000000..eb35913 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java @@ -0,0 +1,15 @@ +package com.kiisoo.ic.promotion.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kiisoo.ic.activity.entity.PmnPromotionSrc; +import com.kiisoo.ic.promotion.entity.PmnPromotionSrcVO; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface PmnPromotionSrcMapper extends BaseMapper { + + List queryList(@Param("instanceId") Long instanceId, @Param("storeId") Long storeId); +} \ No newline at end of file diff --git a/src/main/java/com/kiisoo/ic/promotion/service/PromotionSrcService.java b/src/main/java/com/kiisoo/ic/promotion/service/PromotionSrcService.java new file mode 100644 index 0000000..1536eb7 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/promotion/service/PromotionSrcService.java @@ -0,0 +1,51 @@ +package com.kiisoo.ic.promotion.service; + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.kiisoo.ic.promotion.entity.PmnPromotionSrcVO; +import com.kiisoo.ic.promotion.mapper.PmnPromotionSrcMapper; +import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +@Service +public class PromotionSrcService { + + @Autowired + PmnPromotionSrcMapper pmnPromotionSrcMapper; + @Autowired + PoiStoreStaffDOMapper poiStoreStaffDOMapper; + + + public Map listStaff(Long instanceId, Long storeId, int pageNum, int pageSize) { + + Map results = new HashMap<>(); + + PageHelper.startPage(pageNum, pageSize); + List pmnPromotionSrcList = pmnPromotionSrcMapper.queryList(instanceId, storeId); + if (CollectionUtils.isEmpty(pmnPromotionSrcList)) { + results.put("this", null); + return results; + } + AtomicInteger number = new AtomicInteger(1 + ((pageNum - 1) * pageSize)); + //求分页总数 + Page pageList = (Page) pmnPromotionSrcList; + Long totalSize = pageList.getTotal(); + for (PmnPromotionSrcVO m : pmnPromotionSrcList) { + + m.setTotalSize(totalSize); + m.setNumber(number.get()); + number.incrementAndGet(); + } + results.put("this", new PageInfo<>(pmnPromotionSrcList)); + return results; + + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1c30771..556dec4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,7 +8,7 @@ spring: profiles: - active: $profiles.active$ + active: dev mvc: view: prefix: / diff --git a/src/main/resources/mapper/PmnPromotionSrcMapper.xml b/src/main/resources/mapper/PmnPromotionSrcMapper.xml new file mode 100644 index 0000000..fef8c83 --- /dev/null +++ b/src/main/resources/mapper/PmnPromotionSrcMapper.xml @@ -0,0 +1,18 @@ + + + + + + + +