|
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
+
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.*;
|
|
import java.io.*;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -80,7 +81,7 @@ public class AdapayController extends BaseController {
|
|
|
@ApiOperation("查询企业用户信息")
|
|
@ApiOperation("查询企业用户信息")
|
|
|
@GetMapping(value = "exportBill")
|
|
@GetMapping(value = "exportBill")
|
|
|
@PreAuthorize("@pcs.hasPermissions('adapay/exportBill')")
|
|
@PreAuthorize("@pcs.hasPermissions('adapay/exportBill')")
|
|
|
- public HttpResponseResult exportBill(Date startTime, Date endTime, HttpServletResponse response) throws Exception {
|
|
|
|
|
|
|
+ public void exportBill(Date startTime, Date endTime, HttpServletResponse response) throws Exception {
|
|
|
|
|
|
|
|
long createdGte = startTime.getTime();
|
|
long createdGte = startTime.getTime();
|
|
|
long createdLte = DateUtil.getLastSecondWithDay(endTime).getTime();
|
|
long createdLte = DateUtil.getLastSecondWithDay(endTime).getTime();
|
|
@@ -138,8 +139,8 @@ public class AdapayController extends BaseController {
|
|
|
|
|
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
try {
|
|
|
- String[] header = {"支付流水号", "订单号", "支付渠道", "交易金额", "商户号", "分润金额", "是否承担手续费", "手续费", "交易时间","交易状态"};
|
|
|
|
|
- String[] body = {"id", "order_no", "pay_channel", "pay_amt", "member_id", "route_amount", "fee_flag", "fee_amount", "created_time","status"};
|
|
|
|
|
|
|
+ String[] header = {"支付流水号", "订单号", "支付渠道", "交易金额", "商户号", "分润金额", "是否承担手续费", "手续费", "第三方订单号", "支付宝/微信订单号", "交易时间", "交易状态"};
|
|
|
|
|
+ String[] body = {"id", "order_no", "pay_channel", "pay_amt", "member_id", "route_amount", "fee_flag", "fee_amount", "party_order_id", "out_trans_id", "created_time", "status"};
|
|
|
|
|
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, data);
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, data);
|
|
|
response.setContentType("application/octet-stream");
|
|
response.setContentType("application/octet-stream");
|
|
@@ -159,9 +160,5 @@ public class AdapayController extends BaseController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-// return succeed(new CorpMember().executeQueryMember(memberId));
|
|
|
|
|
- return null;
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
周箭河