diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 470369fda..71b6a295d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -43,7 +43,7 @@ public class WxBrandController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "品牌-列表") - public ResultData list(@ModelAttribute WxBrand wxBrand, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxBrand wxBrand,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBrandController::list"); if (null == wxBrand) { wxBrand = new WxBrand(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index e01d23700..0a4f55ef3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -1,5 +1,6 @@ package com.iformall.controller.sys; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -9,12 +10,16 @@ import com.iformall.service.WxBusinessService; import com.iformall.service.WxSubBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.map.LinkedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @RequestMapping("wxBusiness") @@ -46,4 +51,67 @@ public class WxBusinessController extends BaseController { return new ResultData(busList); } + @ApiOperation("业态分析接口") + @GetMapping("businessDataList") + @SystemControllerLog(description = "业态分析接口") + public ResultData businessDataList(@ModelAttribute WxBusiness wxBusiness) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::businessDataList"); + List> result = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("title","餐饮");//业态 + map.put("volume","2323.23");//营业额 + map.put("sale","32323.23");//销售坪效 + map.put("rent","32323.23");//租赁坪效 + map.put("rentSaleRate","0.23");//租售比 + map.put("comPrice","香奈儿");//客单价 + map.put("maxCom","32323.23");//贡献率最高商户 + result.add(map); + map = new HashMap<>(); + map.put("title","娱乐");//业态 + map.put("volume","2323.23");//营业额 + map.put("sale","32323.23");//销售坪效 + map.put("rent","32323.23");//租赁坪效 + map.put("rentSaleRate","0.23");//租售比 + map.put("comPrice","香奈儿");//客单价 + map.put("maxCom","32323.23");//贡献率最高商户 + result.add(map); + map = new HashMap<>(); + map.put("title","影视");//业态 + map.put("volume","2323.23");//营业额 + map.put("sale","32323.23");//销售坪效 + map.put("rent","32323.23");//租赁坪效 + map.put("rentSaleRate","0.23");//租售比 + map.put("comPrice","香奈儿");//客单价 + map.put("maxCom","32323.23");//贡献率最高商户 + result.add(map); + return new ResultData(result); + } + + @ApiOperation("贡献率排行") + @GetMapping("devoteList") + @SystemControllerLog(description = "业态分析接口") + public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); + List> result = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("merchantName","西贝筱面"); + map.put("sale","2323.23");//营业额 + map.put("sale","32323.23");//商户销售坪效 + map.put("devoteRate","1.23");//贡献率 + result.add(map); + map = new HashMap<>(); + map.put("merchantName","肯德基"); + map.put("sale","2323.23");//营业额 + map.put("sale","32323.23");//商户销售坪效 + map.put("devoteRate","1.23");//贡献率 + result.add(map); + PageInfo> page = new PageInfo<>(); + page.setList(result); + page.setTotal(2); + page.setPageNum(1); + page.setPageSize(20); + return new ResultData(page); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index 6780d8739..8fdcf0dd3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -31,6 +31,14 @@ public class WxBusiness implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @Transient + @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") + private Date startdate; + + @Transient + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") + private Date enddate; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC")