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 8e25fa02d..7539f6fcc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxSubBusiness; import com.iformall.service.WxBusinessService; import com.iformall.service.WxSubBusinessService; +import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -16,10 +17,9 @@ 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; + +import java.text.SimpleDateFormat; +import java.util.*; @RestController @RequestMapping("wxBusiness") @@ -54,40 +54,18 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态分析接口") @GetMapping("businessDataList") @SystemControllerLog(description = "业态分析接口") - public ResultData businessDataList(@ModelAttribute WxBusiness wxBusiness) { + public ResultData businessDataList(@ModelAttribute WxBusiness wxBusiness) throws Exception{ logger.debug("[" + getIpAddr() + "] WxBusinessController::businessDataList"); - List> result = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("title","餐饮");//业态 - map.put("id","1");//业态id - 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("id","2");//业态id - 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("id","3");//业态id - 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); + wxBusiness.setTenantId(getTenantId()); + if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ + Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); + Date d = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + wxBusiness.setStartdate(sdT.parse(sd.format(sDate)+" 00:00:00")); + wxBusiness.setEnddate(sdT.parse(sd.format(d)+" 23:59:59")); + } + return wxBusinessService.businessDataList(wxBusiness); } @ApiOperation("贡献率排行") 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 8fdcf0dd3..62a95efdf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -38,6 +38,8 @@ public class WxBusiness implements Serializable { @Transient @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; + @Transient + private String tenantId; public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index add494ad7..c258320a4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; import io.lettuce.core.dynamic.annotation.Param; @@ -12,4 +13,9 @@ public interface WxBusinessMapper extends CommonMapper { List findListAll(); List findListForMerchant(@Param("tenantId") String tenantId); List findListForCoupon(@Param("tenantId") String tenantId); + + + List> businessDataList(WxBusiness wxBusiness); + + List> devoteList(WxBusiness wxBusiness); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index a9d7b27e0..1f0582978 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; import java.util.List; @@ -40,9 +41,11 @@ public interface WxBusinessService { */ WxBusiness getById(Integer id); - - - + + + ResultData businessDataList(WxBusiness wxBusiness); + + ResultData devoteList(WxBusiness wxBusiness,Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java index 8b9ac1af5..1369f3d5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java @@ -40,5 +40,5 @@ public interface WxSubBusinessService { */ WxSubBusiness getById(Integer id); - + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 2c3c099fd..7adf61a42 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -2,8 +2,8 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; -import com.iformall.enums.EnumBusiness; import com.iformall.enums.EnumBusinessFilter; import com.iformall.mapper.WxBusinessMapper; import com.iformall.service.WxBusinessService; @@ -50,4 +50,13 @@ public class WxBusinessServiceImpl implements WxBusinessService { } + @Override + public ResultData businessDataList(WxBusiness wxBusiness) { + return new ResultData(wxBusinessMapper.businessDataList(wxBusiness)); + } + + @Override + public ResultData devoteList(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { + return new ResultData(PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBusinessMapper.devoteList(wxBusiness))); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java index 53f3d1d0b..234ab0df3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxSubBusiness; import com.iformall.mapper.WxBusinessMapper; @@ -43,5 +44,4 @@ public class WxSubBusinessServiceImpl implements WxSubBusinessService { return wxSubBusinessMapper.selectByPrimaryKey(id); } - } diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index aaaebcb04..98b295a86 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -1166,5 +1166,15 @@ public class DateUtils { } + /** + * 获取上个月的今天 + */ + public static Date getLastMonthToDay() { + Date date = new Date(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); // 设置为当前时间 + calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月 + return calendar.getTime(); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 0861a87f2..283a6e5ff 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -80,7 +80,84 @@ order by create_date asc + +