fix export bill

mec-web/src/main/java/com/ym/mec/web/controller/AdapayController.java

@@ -116,17 +116,14 @@ public class AdapayController extends BaseController {
                     JSONArray divMembers = (JSONArray) paymentMap.get("div_members");
                     for (Object divMember : divMembers) {
                         Map<String, Object> divMemberMap = (Map<String, Object>) divMember;
-                        paymentMap.put("member_id", divMemberMap.get("member_id"));
+                        divMemberMap.putAll(paymentMap);
                         if (divMemberMap.get("member_id").equals("0")) {
-                            paymentMap.put("member_id", ConfigInit.merNo);
+                            divMemberMap.put("member_id", ConfigInit.merNo);
                         }
-                        paymentMap.put("fee_amount", 0);
-                        if (divMemberMap.get("fee_flag").equals("Y")) {
-                            paymentMap.put("fee_amount", paymentMap.get("fee_amt"));
+                        if (divMemberMap.get("fee_flag").equals("N")) {
+                            divMemberMap.put("fee_amt", "0.00");
                         }
-                        paymentMap.put("route_amount", divMemberMap.get("amount"));
-                        paymentMap.put("fee_flag", divMemberMap.get("fee_flag"));
-                        data.add(paymentMap);
+                        data.add(divMemberMap);
                     }
 
                 }
@@ -140,7 +137,7 @@ public class AdapayController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             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"};
+            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");