From d1b10e806d29f76ead8b5b0f7fdff2d3cd60556e Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 18 Jan 2021 17:24:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCreditHistoryController.java | 16 +++++ .../domain/po/base/BaseTenantEntity.java | 12 ++++ .../domain/vo/MerchantCreditRankingVo.java | 20 ++++++ .../mapper/WxCreditHistoryMapper.java | 3 + .../service/WxCreditHistoryService.java | 3 + .../impl/WxCreditHistoryServiceImpl.java | 6 ++ .../mapper/WxCreditHistoryMapper.xml | 69 +++++++++++++++++++ .../resources/mapper/WxMerchantMapper.xml | 1 + 8 files changed, 130 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index b0b22090c..2fba67672 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.MerchantCreditRankingVo; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumScoreType; @@ -173,4 +174,19 @@ public class WxCreditHistoryController extends BaseController { return new ResultData(Result.SUCCESS); } + @ApiOperation("门店排行榜") + @GetMapping("merchantCreditRanking") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "、-列表") + public ResultData merchantCreditRanking(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::merchantCreditRanking"); + if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); + TenantEntity tenantInfo = getTenantInfo(); + wxCreditHistory.updateTenantInfo(tenantInfo); + final PageInfo page = wxCreditHistoryService.listAsPageMcrv(wxCreditHistory, pageNum, pageSize); + return new ResultData(page); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 62b45c963..c2ee61380 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -1,6 +1,7 @@ package com.iformall.domain.po.base; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,6 +36,17 @@ public class BaseTenantEntity extends BaseEntity { public void setFinalTenantId(String finalTenantId) { this.finalTenantId = finalTenantId; } + + @JsonIgnore + @TableField(exist = false) + protected String shardFinalTableSuffix; + + public String getShardFinalTableSuffix(){ + if(StringUtils.isNotBlank(finalTenantId)){ + shardFinalTableSuffix = "_" + Integer.parseInt(finalTenantId)%100; + } + return shardFinalTableSuffix; + } @TableField(exist = false) @JsonProperty(access = JsonProperty.Access.READ_ONLY) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java new file mode 100644 index 000000000..0e3030a89 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantCreditRankingVo.java @@ -0,0 +1,20 @@ +package com.iformall.domain.vo; + +import lombok.Data; + +@Data +public class MerchantCreditRankingVo { + + private Long merchantId; + + private String merchantName; + + private Integer sumAddCredit; + + private Integer sumLesCredit; + + private Integer countAddCreditUser; + + private Integer countLesCreditUser; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index 580d1ebb4..9ca6483e0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCreditHistory; +import com.iformall.domain.vo.MerchantCreditRankingVo; import com.iformall.domain.vo.WxCreditHistoryNewIdVo; import com.iformall.domain.vo.WxCreditHistoryVo; import org.apache.ibatis.annotations.Param; @@ -38,4 +39,6 @@ public interface WxCreditHistoryMapper extends CommonMapper listAsPageMcrv(WxCreditHistory record, Integer pageIndex, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 3e5a17e6d..c99767312 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.MerchantCreditRankingVo; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -144,6 +145,11 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return wxCreditHistoryMapper.getLesCreditSummary(wxCreditHistory); } + @Override + public PageInfo listAsPageMcrv(WxCreditHistory record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.merchantCreditRanking(record)); + } + @Override public PageInfo listAsPage(WxCreditHistory record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index bba2d6f98..0a9b14f58 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -293,4 +293,73 @@ {call user_credit_clear(#{cutOffDate},#{finalTableIndex})} + + + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 4aa8444a2..af87ebc03 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -610,4 +610,5 @@ order by create_date desc +