msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 清算日报时间误差

Browse Source
master
luoyang 5 years ago
parent d871253368
commit 529be0e353
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.4.23</version>
<version>1.4.24</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

13
src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java
Unescape View File

@ -10,15 +10,11 @@ import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -96,14 +92,7 @@ public class PartnerCardDashboardController {
@RequestMapping("/{client_id}/settlement_logs/report_date/{reportDate}")
@ReadOnlyConnection
public JSONObject listClearingTransactionsOfMergeSettle(@PathVariable int client_id, @PathVariable String reportDate,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
Date date = new Date();
try {
date = DateUtils.parseDate(reportDate, "yyyy-MM-dd");
} catch (ParseException e) {
logger.error("parse report date error:{}", e.getMessage());
}
String realRDate = DateFormatUtils.format(DateUtils.addDays(date, 1), "yyyy-MM-dd");
return cleanService.getCleanLogTransactionsOfMergeSettle(client_id,realRDate, manager);
return cleanService.getCleanLogTransactionsOfMergeSettle(client_id,reportDate, manager);
}
@RequestMapping("/settlement_logs/{detailId}/analysis/{channel}")

29
src/main/java/au/com/royalpay/payment/manage/management/clearing/web/CleanLogClientController.java
Unescape View File

@ -5,7 +5,6 @@ import au.com.royalpay.payment.manage.permission.manager.PartnerMapping;
import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -46,14 +44,7 @@ public class CleanLogClientController {
@RequestMapping("/{client_id}/settlement_logs/report_date/{reportDate}")
public JSONObject listClearingTransactionsOfMergeSettle(@PathVariable int client_id, @PathVariable String reportDate,
@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) {
Date date = new Date();
try {
date = DateUtils.parseDate(reportDate, "yyyy-MM-dd");
} catch (ParseException e) {
logger.error("parse report date error:{}", e.getMessage());
}
String realRDate = DateFormatUtils.format(DateUtils.addDays(date, 1), "yyyy-MM-dd");
JSONObject data = cleanService.listClearingTransactionsByMergeSettle(partner.getIntValue("client_id"), realRDate, partner);
JSONObject data = cleanService.listClearingTransactionsByMergeSettle(partner.getIntValue("client_id"), reportDate, partner);
data.put("report_date", reportDate);
return data;
}
@ -67,14 +58,7 @@ public class CleanLogClientController {
@RequestMapping("/{client_id}/settlement_logs/report_date/{reportDate}/analysis/{channel}")
public Map<String,JSONObject> channelAndDayOfMergeSettleAnalysis(@PathVariable int client_id, @PathVariable String reportDate,
@PathVariable String channel, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) {
Date date = new Date();
try {
date = DateUtils.parseDate(reportDate, "yyyy-MM-dd");
} catch (ParseException e) {
logger.error("parse report date error:{}", e.getMessage());
}
String realRDate = DateFormatUtils.format(DateUtils.addDays(date, 1), "yyyy-MM-dd");
return cleanService.channelAndDayOfMergeSettleAnalysis(client_id, realRDate,channel,partner);
return cleanService.channelAndDayOfMergeSettleAnalysis(client_id, reportDate,channel,partner);
}
@PartnerMapping("/{client_id}/settlement_logs/{clearingDetailId}/export")
@ -86,14 +70,7 @@ public class CleanLogClientController {
@PartnerMapping("/{client_id}/settlement_logs/report_date/{reportDate}/export")
public void exportTransactionsByReportDate(@PathVariable int client_id, @PathVariable String reportDate,
@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, HttpServletResponse resp) {
Date date = new Date();
try {
date = DateUtils.parseDate(reportDate, "yyyy-MM-dd");
} catch (ParseException e) {
logger.error("parse report date error:{}", e.getMessage());
}
String realRDate = DateFormatUtils.format(DateUtils.addDays(date, 1), "yyyy-MM-dd");
cleanService.exportTransactionsByReportDate(realRDate, partner, resp);
cleanService.exportTransactionsByReportDate(reportDate, partner, resp);
}
// @RequestMapping(value = "/{clearId}.json")

Write Preview
Loading…
Cancel
Save