|
|
@@ -148,6 +148,9 @@ public class AdapayController extends BaseController {
|
|
|
if (payments != null && payments.size() > 0) {
|
|
|
for (Object payment : payments) {
|
|
|
Map<String, Object> paymentMap = (Map<String, Object>) payment;
|
|
|
+ if (!paymentMap.get("status").equals("succeeded")) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
paymentMap.put("created_time", DateUtil.timeStamp2Date(paymentMap.get("created_time").toString(), null));
|
|
|
if (paymentMap.get("pay_channel").equals("alipay_qr")) {
|
|
|
paymentMap.put("pay_channel", "支付宝正扫");
|
|
|
@@ -165,10 +168,21 @@ public class AdapayController extends BaseController {
|
|
|
paymentMap.put("status", "交易失败");
|
|
|
}
|
|
|
if (paymentMap.get("pay_mode").equals("delay")) {
|
|
|
- Map<String, Object> confirmMap = Payment.queryConfirmList(paymentMap.get("id").toString());
|
|
|
- JSONArray confirms = (JSONArray) confirmMap.get("payment_confirms");
|
|
|
+ if(!paymentMap.containsKey("payment_confirms")){
|
|
|
+ Map<String, Object> confirmMap = Payment.queryConfirmList(paymentMap.get("id").toString());
|
|
|
+ if(confirmMap.containsKey("payment_confirms")) {
|
|
|
+ paymentMap.put("payment_confirms", confirmMap.get("payment_confirms"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!paymentMap.containsKey("payment_confirms")){
|
|
|
+ paymentMap.put("memo","没有提交分账信息，请联系技术核查");
|
|
|
+ data.add(paymentMap);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ JSONArray confirms = (JSONArray) paymentMap.get("payment_confirms");
|
|
|
for (Object confirm : confirms) {
|
|
|
Map<String, Object> divMemberMap = (Map<String, Object>) confirm;
|
|
|
+ paymentMap.put("fee_amt",divMemberMap.get("fee_amt"));
|
|
|
divMemberMap.putAll(paymentMap);
|
|
|
|
|
|
JSONArray divMembers = (JSONArray) divMemberMap.get("div_members");
|
|
|
@@ -177,11 +191,8 @@ public class AdapayController extends BaseController {
|
|
|
if (divMemberMap.get("member_id").equals("0")) {
|
|
|
divMemberMap.put("member_id", ConfigInit.merNo);
|
|
|
}
|
|
|
- BigDecimal feeAmt = (new BigDecimal(divMemberMap.get("amount").toString())).multiply(new BigDecimal("0.28")).divide(new BigDecimal(100),2, BigDecimal.ROUND_HALF_UP);
|
|
|
- divMemberMap.put("fee_amt", feeAmt);
|
|
|
data.add(divMemberMap);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
JSONArray divMembers = (JSONArray) paymentMap.get("div_members");
|
|
|
for (Object divMember : divMembers) {
|
|
|
@@ -206,8 +217,8 @@ public class AdapayController extends BaseController {
|
|
|
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
|
- String[] header = {"支付流水号", "订单号", "支付渠道", "交易金额", "商户号", "分润金额", "是否承担手续费", "手续费", "第三方订单号", "支付宝/微信订单号", "交易时间", "交易状态"};
|
|
|
- String[] body = {"id", "order_no", "pay_channel", "pay_amt", "member_id", "amount", "fee_flag", "fee_amt", "party_order_id", "out_trans_id", "created_time", "status"};
|
|
|
+ String[] header = {"支付流水号", "订单号", "支付渠道", "交易金额", "商户号", "分润金额", "是否承担手续费", "手续费", "第三方订单号", "支付宝/微信订单号", "交易时间", "交易状态","备注"};
|
|
|
+ String[] body = {"id", "order_no", "pay_channel", "pay_amt", "member_id", "amount", "fee_flag", "fee_amt", "party_order_id", "out_trans_id", "created_time", "status",""};
|
|
|
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, data);
|
|
|
response.setContentType("application/octet-stream");
|
Joburgess