youh

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

@@ -181,10 +181,11 @@ public class RechargeRecordController {
 			List<List<Object>> rows = new LinkedList<>();
 			if (CollUtil.isNotEmpty(list)) {
 				for (RechargeRecord temp : list) {
-					List<Object> rowA = CollUtil.newArrayList(temp.getId(),
+					List<Object> rowA = CollUtil.newArrayList(
+							temp.getId()+"",
 							temp.getOrderNo(),
-							temp.getAmount().toPlainString(),
-							temp.getDiscount().toPlainString(),
+							temp.getAmount() == null? "0":temp.getAmount().toPlainString(),
+							temp.getDiscount() == null? "0":temp.getDiscount().toPlainString(),
 							temp.getStatus()+"",
 							temp.getChannel(),
 							temp.getCurrency(),

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

@@ -143,12 +143,13 @@ public class RedEnvelopeController {
 			List<List<Object>> rows = new LinkedList<>();
 			if (CollUtil.isNotEmpty(list)) {
 				for (RedEnvelope temp : list) {
-					List<Object> rowA = CollUtil.newArrayList(temp.getId(),
+					List<Object> rowA = CollUtil.newArrayList(
+							temp.getId()+"",
 							temp.getOrderNo(),
 							temp.getTranNo(),
 							temp.getUserId()+"",
-							temp.getAmount().toPlainString(),
-							temp.getBalance().toPlainString(),
+							temp.getAmount() == null? "0":temp.getAmount().toPlainString(),
+							temp.getBalance() == null? "0":temp.getBalance().toPlainString(),
 							temp.getStatus()+"",
 							temp.getBizType()+"",
 							temp.getTransTime() == null? "": DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),

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

@@ -296,8 +296,21 @@ public class UserController extends AbstractApiController {
             List<List<Object>> rows = new LinkedList<>();
             if (CollUtil.isNotEmpty(users)) {
                 for (User temp : users) {
-                    List<Object> rowA = CollUtil.newArrayList(temp.getId()+"", temp.getUserNo(), temp.getInvitedCode(),temp.getNickname()
-                            ,temp.getName(),temp.getBank(),temp.getBankAccount(),temp.getBankAccountName(),temp.getPhoneNo(),temp.getVipLevel()+"",temp.getMemo(),temp.getHasWithdraw()+"",temp.getHasLogin()+"",temp.getHasOrder()+"", DateUtil.format(temp.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                    List<Object> rowA = CollUtil.newArrayList(temp.getId()+"",
+                            temp.getUserNo(),
+                            temp.getInvitedCode(),
+                            temp.getNickname()
+                            ,temp.getName(),
+                            temp.getBank(),
+                            temp.getBankAccount(),
+                            temp.getBankAccountName(),
+                            temp.getPhoneNo(),
+                            temp.getVipLevel()+"",
+                            temp.getMemo(),
+                            temp.getHasWithdraw()+"",
+                            temp.getHasLogin()+"",
+                            temp.getHasOrder()+"",
+                            DateUtil.format(temp.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
                     rows.add(rowA);
                 }
             }

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

@@ -215,11 +215,12 @@ public class WithdrawRecordController {
 			List<List<Object>> rows = new LinkedList<>();
 			if (CollUtil.isNotEmpty(list)) {
 				for (WithdrawRecord temp : list) {
-					List<Object> rowA = CollUtil.newArrayList(temp.getId(),
+					List<Object> rowA = CollUtil.newArrayList(
+							temp.getId()+"",
 							temp.getOrderNo(),
-							temp.getAmount().toPlainString(),
-							temp.getFee().toPlainString(),
-							temp.getStatus(),
+							temp.getAmount() == null? "0":temp.getAmount().toPlainString(),
+							temp.getFee() == null? "0":temp.getFee().toPlainString(),
+							temp.getStatus()+"",
 							temp.getChannel(),
 							temp.getCurrency(),
 							temp.getUserName(),