From 0d25c1c36b2601b3f09bb60af33e5ff21c15b4c0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 16 Jan 2019 17:37:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=A7=A3=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 14 +++++++-- .../service/WxMerchantTradeDailyService.java | 2 ++ .../impl/WxMerchantTradeDailyServiceImpl.java | 30 ++++++++++++++++++- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 29aefedb0..43ac1ebfc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -2,7 +2,6 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.service.WxMerchantTradeDailyService; import io.swagger.annotations.ApiImplicitParam; @@ -11,7 +10,10 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -60,5 +62,13 @@ public class WxMerchantTradeDailyController extends BaseController { return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantId()); } + @ApiOperation("更新解单数据") + @GetMapping("/updateYesterday") + public ResultData updateYesterday(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily) { + logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::updateYesterday"); + wxMerchantTradeDaily.setTenantId(getTenantId()); + return wxMerchantTradeDailyService.updateYesterday(wxMerchantTradeDaily); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 9cc09fc36..240393e2c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -82,4 +82,6 @@ public interface WxMerchantTradeDailyService { */ PageInfo listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize); + ResultData updateYesterday(WxMerchantTradeDailyVo tradeDailyVo); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index ff57ec903..46f462c35 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchant; @@ -21,7 +22,6 @@ import com.iformall.service.WxMerchantService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @@ -124,6 +124,34 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findListVo(record)); } + @Override + public ResultData updateYesterday(WxMerchantTradeDailyVo tradeDailyVo) { + + WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); + wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); + List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); + + if (tradeList.size() > 0) { + wxMerchantTradeDaily = tradeList.get(0); + wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()); + wxMerchantTradeDaily.setUpdateDate(new Date()); + wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); + return new ResultData(wxMerchantTradeDaily); + } + + final IdWorker idWorker = IdWorker.get(); + wxMerchantTradeDaily.setId(idWorker.nextId()); + wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId()); + wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); + wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()); + wxMerchantTradeDaily.setCreateDate(new Date()); + wxMerchantTradeDaily.setUpdateDate(new Date()); + wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); + + return new ResultData(Result.SUCCESS, "操作成功"); + } + @Override public ResultData getVolumeOfMonth(Long merchantId) {