diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java index a72efcc83..2efde81d3 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -33,6 +33,12 @@ public class WxMerchantTradeDailyController extends BaseController return wxMerchantTradeDailyService.getVolume(getUser().getId()); } + @ApiOperation("获得近7日解单") + @GetMapping("/getVolumeOfWeek") + public ResultData getVolumeOfWeek() { + return wxMerchantTradeDailyService.getVolumeOfWeek(getUser().getId()); + } + @ApiOperation("上报每日解单") @GetMapping("/reportDailyVolume") @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 3ba3ef047..4bc398383 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -156,8 +156,8 @@ public enum ErrorCode{ /** * 解单 */ - DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在") - + DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在"), + DALIY_REPORT_VOLUME_WEEK_NULL(12070, "无解单数据") ; diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java index f08ec96df..d138eb02c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java @@ -8,9 +8,9 @@ import com.simple.domain.po.WxMerchantTradeDaily; public interface WxMerchantTradeDailyMapper extends CommonMapper { List findList(WxMerchantTradeDaily wxMerchantTradeDaily); - - + + List findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily); diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java index de7eb8354..f7ae4d9b3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java @@ -54,8 +54,13 @@ public interface WxMerchantTradeDailyService { */ public ResultData getVolume(Long userId); - - + + + /** + * 获取近7日解单数据 + */ + + public ResultData getVolumeOfWeek(Long userId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java index daf381fed..c6c6b3fe8 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -149,7 +149,42 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_TODAY_NULL); } - + + @Override + public ResultData getVolumeOfWeek(Long userId) { + + WxMerchantBUser user = wxMerchantBUserService.getById(userId); + + if (user==null) + return new ResultData(ErrorCode.USER_IS_EMPTY); + + WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); + + if (merchant==null) + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + + WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); + if (mall==null) + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + + + WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + + wxMerchantTradeDaily.setMerchantId(merchant.getId()); + + SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); + + + List tradeList = wxMerchantTradeDailyMapper.findListOfWeek(wxMerchantTradeDaily); + + if (tradeList.size() > 0 ) { + return new ResultData(tradeList); + } + + return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_WEEK_NULL); + + } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 2ca6a11f3..6675ec93b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -63,8 +63,24 @@ select from wx_merchant_trade_daily - - + +