fix 清算预估微信到账金额

luoyang 5 years ago
parent 832ce04069
commit 50ba01ce48

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.2.33</version> <version>1.2.34</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@ -228,13 +228,13 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
//预计到账金额 //预计到账金额
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(date); cal.setTime(date);
cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 0, 0, 0); cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 2, 0, 0);
Date datefrom = cal.getTime(); Date datefrom = cal.getTime();
if (DateUtils.isSameDay(new Date(), datefrom)) { if (DateUtils.isSameDay(new Date(), datefrom)) {
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
params.put("datefrom", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss")); params.put("datefrom", DateFormatUtils.format(DateUtils.addDays(datefrom, -1), "yyyy-MM-dd HH:mm:ss"));
params.put("dateto", DateFormatUtils.format(DateUtils.addDays(datefrom, 1), "yyyy-MM-dd HH:mm:ss")); params.put("dateto", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
List<JSONObject> lastDayClearingAmount = transactionMapper.getLastDaytransAmount(params); List<JSONObject> lastDayClearingAmount = transactionMapper.getLastDaytransAmount(params);
BigDecimal total_clearing = BigDecimal.ZERO; BigDecimal total_clearing = BigDecimal.ZERO;

Loading…
Cancel
Save