diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index 7b743c5dd..3195021b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -14,6 +14,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Map; + @RestController @RequestMapping("subsidy") public class WxMerchantSubsidyController extends BaseController { @@ -22,6 +24,18 @@ public class WxMerchantSubsidyController extends BaseController { @Autowired WxMerchantSubsidyService wxMerchantSubsidyService; + @ApiOperation("补贴记录汇总") + @GetMapping("sum") + public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) { + String ipStr = getIpAddr(); + logger.info("subsidysum: " + ipStr + " :" + wxMerchantSubsidy.toString()); + if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); + MallUserInfo user = getUser(); + wxMerchantSubsidy.setTenantId(user.getTenantId()); + Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); + return new ResultData(retMap); + } + @ApiOperation("补贴记录") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java index c6a20e73a..c90856231 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java @@ -10,10 +10,7 @@ public interface WxMerchantSubsidyMapper extends CommonMapper findList(WxMerchantSubsidy wxMerchantSubsidy); List findVoList(WxMerchantSubsidy wxMerchantSubsidy); - - - - + Map sumVoList(WxMerchantSubsidy wxMerchantSubsidy); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index fecee4d60..02c8347f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -4,8 +4,16 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.vo.WxMerchantSubsidyVo; +import java.util.Map; + public interface WxMerchantSubsidyService { + /** + * 汇总计算 + * @param record + * @return + */ + Map sumForSubsidy(WxMerchantSubsidy record); /** * 根据实体查询分页列表 * 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 8a4d5461e..ca35c2fe8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -10,12 +10,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.Map; + @Service public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Autowired WxMerchantSubsidyMapper wxMerchantSubsidyMapper; + @Override + public Map sumForSubsidy(WxMerchantSubsidy record) { + return wxMerchantSubsidyMapper.sumVoList(record); + } + @Override public PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 9ad125b6d..571ed3a76 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -180,6 +180,18 @@ left join wx_merchant m on m.id = ms.merchant_id + +