linxk vor 2 Wochen
Ursprung
Commit
3e113c2041

+ 0 - 2
cif-service/src/main/java/com/txz/cif/web/mng/ConfigMemberController.java

@@ -11,7 +11,6 @@ import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.txz.core.ServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -20,7 +19,6 @@ import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
 
 /**
 * Created by CodeGenerator on 2025/07/15.

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

@@ -10,7 +10,6 @@ import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.Account;
 import com.txz.cif.model.BizLog;
 import com.txz.cif.model.RechargeRecord;
-import com.txz.cif.model.User;
 import com.txz.cif.service.AccountService;
 import com.txz.cif.service.BizLogService;
 import com.txz.cif.service.RechargeRecordService;
@@ -20,12 +19,10 @@ import com.txz.cif.core.ResultCode;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.web.bo.RechargeRecordBO;
-import com.txz.cif.web.para.MyUserParam;
 import com.txz.cif.web.para.RecordParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.txz.core.ServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -37,7 +34,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
 
 /**
 * Created by CodeGenerator on 2025/07/15.
@@ -187,12 +183,11 @@ public class RechargeRecordController {
 				for (RechargeRecord temp : list) {
 					List<Object> rowA = CollUtil.newArrayList(temp.getId(),
 							temp.getOrderNo(),
-							temp.getAmount(),
-							temp.getDiscount(),
-							temp.getStatus(),
+							temp.getAmount().toPlainString(),
+							temp.getDiscount().toPlainString(),
+							temp.getStatus()+"",
 							temp.getChannel(),
 							temp.getCurrency(),
-							temp.getBankAccountName(),
 							temp.getUserName(),
 							temp.getUserPhone(),
 							temp.getTransTime() == null? "":DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),

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

@@ -6,23 +6,17 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
-import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.model.RedEnvelope;
-import com.txz.cif.model.WithdrawRecord;
 import com.txz.cif.service.RedEnvelopeService;
 
 import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.txz.cif.web.para.RecordParam;
-import com.txz.cif.web.para.RedEnvelopeListParam;
 import com.txz.cif.web.para.RedEnvelopeListParam2;
-import com.txz.cif.web.para.RedEnvelopeParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.txz.core.ServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -34,7 +28,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
 
 /**
 * Created by CodeGenerator on 2025/07/15.
@@ -153,12 +146,11 @@ public class RedEnvelopeController {
 					List<Object> rowA = CollUtil.newArrayList(temp.getId(),
 							temp.getOrderNo(),
 							temp.getTranNo(),
-							temp.getUserId(),
-							temp.getStatus(),
-							temp.getAmount(),
-							temp.getBalance(),
-							temp.getStatus(),
-							temp.getBizType(),
+							temp.getUserId()+"",
+							temp.getAmount().toPlainString(),
+							temp.getBalance().toPlainString(),
+							temp.getStatus()+"",
+							temp.getBizType()+"",
 							temp.getTransTime() == null? "": DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),
 							temp.getSettleTime() == null? "":DateUtil.format(temp.getSettleTime(), "yyyy-MM-dd HH:mm:ss"),
 							temp.getName(),

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

@@ -5,14 +5,11 @@ import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -20,18 +17,13 @@ import cn.hutool.poi.excel.ExcelWriter;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.enums.BizTypeEnum;
-import com.txz.cif.util.IpUtils;
-import com.txz.cif.web.bo.UserBo;
 import com.txz.cif.web.bo.UserBo2;
 import com.txz.cif.web.bo.UserDetailBo;
-import com.txz.cif.web.bo.UserInfoBO;
 import com.txz.cif.web.para.*;
 import com.txz.cif.core.*;
 import com.txz.cif.model.*;
 import com.txz.cif.service.*;
-import com.txz.cif.core.AuthService;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import lombok.extern.slf4j.Slf4j;
 import tk.mybatis.mapper.entity.Condition;
@@ -304,8 +296,8 @@ 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);
                 }
             }

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

@@ -19,14 +19,12 @@ import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.txz.cif.web.bo.RechargeRecordBO;
 import com.txz.cif.web.bo.WithdrawRecordBO;
 import com.txz.cif.web.para.RecordParam;
 import com.txz.cif.web.para.ReviewParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.txz.core.ServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -38,7 +36,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
 
 /**
 * Created by CodeGenerator on 2025/07/15.
@@ -220,12 +217,11 @@ public class WithdrawRecordController {
 				for (WithdrawRecord temp : list) {
 					List<Object> rowA = CollUtil.newArrayList(temp.getId(),
 							temp.getOrderNo(),
-							temp.getAmount(),
-							temp.getFee(),
+							temp.getAmount().toPlainString(),
+							temp.getFee().toPlainString(),
 							temp.getStatus(),
 							temp.getChannel(),
 							temp.getCurrency(),
-							temp.getBankAccountName(),
 							temp.getUserName(),
 							temp.getUserPhone(),
 							temp.getTransTime() == null? "": DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),