|
|
|
@@ -101,12 +101,15 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"日期类型非法"); |
|
|
|
} |
|
|
|
|
|
|
|
if (_da.getCode().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue() |
|
|
|
&& StringUtils.isBlank(wxMerchantTradeDaily.getReportDate())) { |
|
|
|
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); |
|
|
|
if (_da.getCode().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()) { |
|
|
|
if (StringUtils.isBlank(wxMerchantTradeDaily.getReportDate())) { |
|
|
|
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); |
|
|
|
} |
|
|
|
}else { |
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"日期不能为空"); |
|
|
|
if (StringUtils.isBlank(wxMerchantTradeDaily.getReportDate())) { |
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"日期不能为空"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
WxMerchant merchant = wxMerchantService.getById(merchantBUser.getMerchantId()); |
|
|
|
|