From 0799aa381c4a0a8473eacd13188f17d4ff30eeb8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 19 Jan 2019 15:28:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9B=B4=E6=96=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantTradeDailyController.java | 9 +++------ .../service/impl/WxMerchantTradeDailyServiceImpl.java | 10 ++++++++-- .../resources/mapper/WxMerchantTradeDailyMapper.xml | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 2d7fec2b8..6c03a378b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -10,10 +10,7 @@ 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.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -63,8 +60,8 @@ public class WxMerchantTradeDailyController extends BaseController { } @ApiOperation("更新解单数据") - @GetMapping("/updateYesterday") - public ResultData updateYesterday(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily) { + @PostMapping("/updateYesterday") + public ResultData updateYesterday(@RequestBody WxMerchantTradeDailyVo wxMerchantTradeDaily) { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::updateYesterday"); wxMerchantTradeDaily.setTenantId(getTenantId()); return wxMerchantTradeDailyService.updateYesterday(wxMerchantTradeDaily); 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 4b7aba5bf..c009f7b40 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -19,6 +19,8 @@ import com.iformall.service.WxMerchantTradeDailyService; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; +import com.iformall.utils.DateUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -129,7 +131,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); - wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); + if (StringUtils.isEmpty(tradeDailyVo.getReportDate())) { + wxMerchantTradeDaily.setReportDate(DateUtils.getTimeBefore(1, new Date())); + } else { + wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); + } List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); if (tradeList.size() > 0) { @@ -158,7 +164,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); - wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : null; + wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : new WxMerchantTradeDaily(); return new ResultData(wxMerchantTradeDaily); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index ead1f2c2d..feabf8d32 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -19,8 +19,8 @@ where 1 = 1 - - and `id` = #{id} + + and `id` = #{id} @@ -119,7 +119,7 @@ where 1=1 and m.status = 1 - + and m.name like concat('%', #{merchantName},'%')