diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index e1b7a6da4..64c5f5443 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -9,6 +9,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; +import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.QrCodeService; import com.iformall.service.WxMerchantService; @@ -250,4 +251,19 @@ public class WxMerchantController extends BaseController { return new ResultData(has); } + @ApiOperation("商户会员消费分页列表接口") + @GetMapping("userTradeList") + @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 userTradeList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + final PageInfo page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 967ff7abd..3af71dcf1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -125,6 +125,12 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux") private String talkUserAux; + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") + private Date starttime; + + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime") + private Date endtime; + public String getShopsStr() { if (shopVos != null && shopVos.size() > 0) { return String.join("\n", diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java new file mode 100644 index 000000000..8c825de66 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java @@ -0,0 +1,28 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxMerchantTradeVo extends BaseEntity { + @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") + protected Long id; + @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "cover") + private String cover; + @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") + private String merchantName; + @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkName") + private String linkName; + @io.swagger.annotations.ApiModelProperty(value = "消费会员人数", name = "consumeCount") + private Integer consumeCount; + @io.swagger.annotations.ApiModelProperty(value = "消费会员人次(去重)", name = "consumeCountP") + private Integer consumeCountP; + @io.swagger.annotations.ApiModelProperty(value = "会员消费金额", name = "tradeAmt") + private Integer tradeAmt; + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 23e5a4ac3..85ebcc787 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.dto.WxMerchantDto; +import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import java.util.HashMap; @@ -27,4 +28,7 @@ public interface WxMerchantMapper extends CommonMapper { void updateCreditLocked(WxMerchant wxMerchant); + List userTradeList(WxMerchant wxMerchant); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 4a0afe927..9115ec06d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -6,6 +6,7 @@ import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantSimpleVo; +import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import javax.servlet.http.HttpServletRequest; @@ -18,6 +19,15 @@ import java.util.Optional; * @author gongbiao */ public interface WxMerchantService { + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo userTradeList(WxMerchant record, Integer pageIndex, Integer pageSize); /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index d1ff5ccf1..875af3f51 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxMerchantSimpleVo; +import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -739,4 +740,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; } + + @Override + public PageInfo userTradeList(WxMerchant record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.userTradeList(record)); + } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index cacd534e4..228824413 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -423,4 +423,54 @@ update wx_merchant set credit_locked = #{creditLocked} where tenant_id = #{tenantId} + + + diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index fa2f3bbaf..c5ab1e9e2 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; @@ -47,21 +48,6 @@ public class WxMerchantController extends BaseController { return new ResultData(page); } - @ApiOperation("商户会员消费分页列表接口") - @GetMapping("userTradeList") - @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 userTradeList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); - if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); - final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); - return new ResultData(page); - } - @ApiOperation("分页列表接口") @GetMapping("listVo") @ApiImplicitParams({