Kaynağa Gözat

[营销结算][修改][B端查询]

release_toaliyun_real
gongbiao 6 yıl önce
ebeveyn
işleme
50134c1456
2 değiştirilmiş dosya ile 17 ekleme ve 3 silme
  1. +17
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java

+ 17
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Dosyayı Görüntüle

@@ -3,7 +3,6 @@ package com.iformall.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxMerchantSubsidy;
import com.iformall.domain.vo.WxMerchantSubsidyVo; import com.iformall.domain.vo.WxMerchantSubsidyVo;
import com.iformall.service.WxMerchantSubsidyService; import com.iformall.service.WxMerchantSubsidyService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@@ -12,7 +11,10 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.List;
import java.util.Map; import java.util.Map;
@@ -54,4 +56,17 @@ public class WxMerchantSubsidyController extends BaseController {
return new ResultData(page); 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<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy);
return new ResultData(data);
}


} }

+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java Dosyayı Görüntüle

@@ -51,7 +51,6 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {
@Override @Override
public ResultData saveOrUpdate(WxMerchantSubsidy record) { public ResultData saveOrUpdate(WxMerchantSubsidy record) {
if (record.getId() == null) { if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
wxMerchantSubsidyMapper.insert(record); wxMerchantSubsidyMapper.insert(record);


Yükleniyor…
İptal
Kaydet