diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index dd65b5696..142dd779c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -3,7 +3,6 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.vo.WxMerchantSubsidyVo; import com.iformall.service.WxMerchantSubsidyService; import io.swagger.annotations.ApiImplicitParam; @@ -12,7 +11,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.util.List; import java.util.Map; @@ -54,4 +56,17 @@ public class WxMerchantSubsidyController extends BaseController { return new ResultData(page); } + @ApiOperation("总计") + @GetMapping("summary") + public ResultData summary(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy) { + logger.debug("[" + getIpAddr() + "] subsidy::summary"); + if (null == wxMerchantSubsidy) { + wxMerchantSubsidy = new WxMerchantSubsidyVo(); + } + wxMerchantSubsidy.setTenantId(getTenantId()); + Map data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); + return new ResultData(data); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 2651866b3..62292345b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -51,7 +51,6 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Override public ResultData saveOrUpdate(WxMerchantSubsidy record) { if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxMerchantSubsidyMapper.insert(record);