用户id

cif-service/src/main/java/com/txz/cif/web/mng/RechargeRecordController.java

@@ -210,7 +210,9 @@ public class RechargeRecordController {
         }
         condition.setOrderByClause("create_time desc");
         List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
-        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "折扣金额", "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号", "交易时间", "交易成功时间", "银行", "银行账户", "银行账户姓名");
+        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "折扣金额",
+                "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号", "交易时间",
+                "交易成功时间", "银行", "银行账户", "银行账户姓名");
         ExcelWriter writer = ExcelUtil.getWriter();
         try {
             writer.writeHeadRow(rowHead);
@@ -220,14 +222,17 @@ public class RechargeRecordController {
                     List<Object> rowA = CollUtil.newArrayList(
                             temp.getId() + "",
                             temp.getOrderNo(),
+                            temp.getUserId(),
                             temp.getAmount() == null ? "0" : temp.getAmount().toPlainString(),
                             temp.getDiscount() == null ? "0" : temp.getDiscount().toPlainString(),
+
                             temp.getStatus() + "",
                             temp.getChannel(),
                             temp.getCurrency(),
                             temp.getUserName(),
                             temp.getUserPhone(),
                             temp.getTransTime() == null ? "" : DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),
+
                             temp.getSuccessTime() == null ? "" : DateUtil.format(temp.getSuccessTime(), "yyyy-MM-dd HH:mm:ss"),
                             temp.getBank(),
                             temp.getBankAccount(),

cif-service/src/main/java/com/txz/cif/web/mng/WithdrawRecordController.java

@@ -213,7 +213,9 @@ public class WithdrawRecordController {
         }
         condition.setOrderByClause("create_time desc");
         List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
-        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "手续费", "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号", "交易时间", "交易成功时间", "银行", "银行账户", "银行账户姓名");
+        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "手续费",
+                "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号",
+                "交易时间", "交易成功时间", "银行", "银行账户", "银行账户姓名");
         ExcelWriter writer = ExcelUtil.getWriter();
         try {
             writer.writeHeadRow(rowHead);
@@ -223,13 +225,16 @@ public class WithdrawRecordController {
                     List<Object> rowA = CollUtil.newArrayList(
                             temp.getId() + "",
                             temp.getOrderNo(),
+                            temp.getUserId(),
                             temp.getAmount() == null ? "0" : temp.getAmount().toPlainString(),
                             temp.getFee() == null ? "0" : temp.getFee().toPlainString(),
+
                             temp.getStatus() + "",
                             temp.getChannel(),
                             temp.getCurrency(),
                             temp.getUserName(),
                             temp.getUserPhone(),
+
                             temp.getTransTime() == null ? "" : DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),
                             temp.getSuccessTime() == null ? "" : DateUtil.format(temp.getSuccessTime(), "yyyy-MM-dd HH:mm:ss"),
                             temp.getBank(),