|
|
|
@@ -27,10 +27,10 @@ public class WxMerchantSubsidyController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation("补贴记录汇总") |
|
|
|
@GetMapping("sum") |
|
|
|
public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) { |
|
|
|
public ResultData count(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy) { |
|
|
|
String ipStr = getIpAddr(); |
|
|
|
logger.info("subsidy/sum: " + 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()); |
|
|
|
|