|
|
|
@@ -13,6 +13,8 @@ import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@@ -32,7 +34,7 @@ public class WxMerchantSubsidyController extends BaseController { |
|
|
|
WxMerchantBUser user = getUser(); |
|
|
|
wxMerchantSubsidy.setTenantId(user.getTenantId()); |
|
|
|
wxMerchantSubsidy.setMerchantId(user.getMerchantId()); |
|
|
|
Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); |
|
|
|
List<Map<String, Object>> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); |
|
|
|
return new ResultData(retMap); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -41,10 +43,10 @@ public class WxMerchantSubsidyController extends BaseController { |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) { |
|
|
|
public ResultData listMonth(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, Integer pageNum, Integer pageSize) { |
|
|
|
String ipStr = getIpAddr(); |
|
|
|
logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); |
|
|
|
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); |
|
|
|
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); |
|
|
|
WxMerchantBUser user = getUser(); |
|
|
|
wxMerchantSubsidy.setTenantId(user.getTenantId()); |
|
|
|
wxMerchantSubsidy.setMerchantId(user.getMerchantId()); |
|
|
|
|