From 9a396c6a4634607bdef63dc6cfe10f23de5a3602 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 21 Aug 2018 12:46:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E5=8D=95][=E6=B7=BB=E5=8A=A0]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=BD=93=E6=97=A5=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 8 +++- .../java/com/simple/common/ErrorCode.java | 13 ++++-- .../java/com/simple/common/ResultData.java | 5 +++ .../service/WxMerchantTradeDailyService.java | 7 +++- .../impl/WxMerchantTradeDailyServiceImpl.java | 42 +++++++++++++++++-- 5 files changed, 65 insertions(+), 10 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java index 73d367ab0..a72efcc83 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -25,7 +25,13 @@ public class WxMerchantTradeDailyController extends BaseController private WxMerchantTradeDailyService wxMerchantTradeDailyService; private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); - + + + @ApiOperation("获得当日解单") + @GetMapping("/getVolume") + public ResultData getVolume() { + return wxMerchantTradeDailyService.getVolume(getUser().getId()); + } @ApiOperation("上报每日解单") @GetMapping("/reportDailyVolume") diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 8c86b9ec7..ee5b2ba40 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -127,14 +127,19 @@ public enum ErrorCode{ PROFIT_SHARING_APPLY_FAILED(12031, "分账业务失败"), PROFIT_SHARING_RETURN_INVALID(12032, "分账请求返回校验失败"), PROFIT_SHARING_RECEIVER_INVALID(12033, "分账接受方查寻无效"), - PROFIT_SHARING_QUERY_REQUEST_FAILED(12030, "分账查询请求失败"), - PROFIT_SHARING_QUERY_APPLY_FAILED(12031, "分账查询业务失败"), - PROFIT_SHARING_QUERY_RETURN_INVALID(12032, "分账查询返回校验失败"), + PROFIT_SHARING_QUERY_REQUEST_FAILED(12034, "分账查询请求失败"), + PROFIT_SHARING_QUERY_APPLY_FAILED(12035, "分账查询业务失败"), + PROFIT_SHARING_QUERY_RETURN_INVALID(12036, "分账查询返回校验失败"), /** * 核销 */ VERIFY_ERROR(12050, "核销异常"), - MSG_REPEAT_SEND(12061, "短信重新发送") + MSG_REPEAT_SEND(12061, "短信重新发送"), + + /** + * 解单 + */ + DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在") ; diff --git a/mallinkService/src/main/java/com/simple/common/ResultData.java b/mallinkService/src/main/java/com/simple/common/ResultData.java index 563c0cede..e224fe358 100644 --- a/mallinkService/src/main/java/com/simple/common/ResultData.java +++ b/mallinkService/src/main/java/com/simple/common/ResultData.java @@ -82,6 +82,11 @@ public class ResultData extends Result { this.data = data; } + public ResultData(ErrorCode errorCode) { + this.code = errorCode.getCode(); + this.message = errorCode.getMessage(); + } + public HashMap toHashMap() { HashMap map = new HashMap<>(3); map.put("code", this.code); diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java index 7aab8e1be..de7eb8354 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java @@ -41,7 +41,7 @@ public interface WxMerchantTradeDailyService { /** - * 根据Id删除实体 + * 上传当日解单数据 * * @param id * @param volume @@ -49,6 +49,11 @@ public interface WxMerchantTradeDailyService { public ResultData saveDailyTradingVolume(Long userId, Integer volume); + /** + * 获取当日解单数据 + */ + + public ResultData getVolume(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 49eae696e..c738748da 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -67,20 +67,19 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public ResultData saveDailyTradingVolume(Long userId, Integer volume) { - Map resultMap = new HashMap(); WxMerchantBUser user = wxMerchantBUserService.getById(userId); if (user==null) - return new ResultData(ErrorCode.USER_IS_EMPTY, ErrorCode.USER_IS_EMPTY.getMessage()); + return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); if (merchant==null) - return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND, ErrorCode.MCH_INFO_NOT_FOUND.getMessage()); + return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND); WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); if (mall==null) - return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND, ErrorCode.MCH_INFO_NOT_FOUND.getMessage()); + return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); @@ -114,7 +113,42 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } + @Override + public ResultData getVolume(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.MCH_INFO_NOT_FOUND); + + WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); + if (mall==null) + return new ResultData(ErrorCode.MCH_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.findList(wxMerchantTradeDaily); + + if (tradeList.size() > 0 ) { + wxMerchantTradeDaily = tradeList.get(0); + return new ResultData(wxMerchantTradeDaily); + } + + return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_TODAY_NULL); + + }