diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 6acd3d655..7d6a097b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -94,37 +94,6 @@ public class WxMerchantTradeDailyController extends BaseController { return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); } - - - - /** - * 详情 - * @param wxMerchantTradeDaily - * @return - */ - @ApiOperation("详情") - @GetMapping("findById") - public ResultData findById(WxMerchantTradeDaily wxMerchantTradeDaily) { - logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::findById"); - String tenantId = getTenantId(); - wxMerchantTradeDaily.setTenantId(tenantId); - return new ResultData(wxMerchantTradeDailyService.getById(wxMerchantTradeDaily.getId())); - } - - /** - * 保存或编辑 - * @param wxMerchantTradeDaily - * @return - */ - @ApiOperation("保存或编辑") - @PostMapping("saveOrUpdate") - public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { - logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); - wxMerchantTradeDaily.setTenantId(super.getTenantId()); - wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); - return new ResultData(); - } - /** * 列表 * @@ -153,9 +122,9 @@ public class WxMerchantTradeDailyController extends BaseController { String startTime; String endTime; - //month为空默认本月第一天到今天 + //month为空取查询区间开始时间 结束时间 if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ - startTime = sd.format(DateUtils.getFirstDayForCurrMonth()); + startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate()); endTime = sd.format(new Date()); }else { startTime = wxMerchantTradeDaily.getMonth()+"-01"; @@ -183,10 +152,11 @@ public class WxMerchantTradeDailyController extends BaseController { } pageInfo.setList(resultList); - for (WxMerchantTradeDaily w:resultList) { - System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); - System.out.println("---------"); - } + +// for (WxMerchantTradeDaily w:resultList) { +// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); +// System.out.println("---------"); +// } return new ResultData(pageInfo); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 496df221e..cb0a9f63e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -118,9 +118,9 @@ public class WxMerchantTradeDailyController extends BaseController { String startTime; String endTime; - //month为空默认本月第一天到今天 + //month为空取查询区间开始时间 结束时间 if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){ - startTime = sd.format(DateUtils.getFirstDayForCurrMonth()); + startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate()); endTime = sd.format(new Date()); }else { startTime = wxMerchantTradeDaily.getMonth()+"-01"; @@ -146,8 +146,8 @@ public class WxMerchantTradeDailyController extends BaseController { resultList.get(0).setIsToday(1); } } + pageInfo.setList(resultList); -// pageInfo.setList(resultList); // for (WxMerchantTradeDaily w:resultList) { // System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt()); // System.out.println("---------"); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index e2f5485cd..ff76e22f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -71,7 +71,30 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "bUserPhone") private String bUserPhone; + /*交易笔数**/ + @io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount") + @Transient + private String tradeCount; + /*凭证**/ + @io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") + @Transient + private String proof; + public String getTradeCount() { + return tradeCount; + } + + public void setTradeCount(String tradeCount) { + this.tradeCount = tradeCount; + } + + public String getProof() { + return proof; + } + + public void setProof(String proof) { + this.proof = proof; + } public String getMerchantName() { return merchantName; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 1dd9e0aec..0008199ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -11,8 +11,6 @@ public interface WxMerchantTradeDailyService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit * @return */ PageInfo listAsPage(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize); 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 c009f7b40..5b0498a7a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -142,6 +142,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily = tradeList.get(0); wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()); wxMerchantTradeDaily.setUpdateDate(new Date()); + + wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); + wxMerchantTradeDaily.setProof(tradeDailyVo.getProof()); wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily); } @@ -153,6 +156,8 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); + wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); + wxMerchantTradeDaily.setProof(tradeDailyVo.getProof()); wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); return new ResultData(Result.SUCCESS, "操作成功");