tixian

cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -15,7 +15,7 @@ import com.txz.cif.core.ResultCode;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.core.AuthService;
-import com.txz.cif.web.para.RechargeRecordParam;
+import com.txz.cif.web.para.RecordParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

cif-service/src/main/java/com/txz/cif/web/WithdrawRecordApiController.java

@@ -1,9 +1,11 @@
 package com.txz.cif.web;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.dubbo.client.OperatingConfigDubboServiceClient;
 import com.txz.cif.model.Account;
+import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.model.WithdrawRecord;
 import com.txz.cif.service.AccountService;
 import com.txz.cif.service.SequenceService;
@@ -13,6 +15,7 @@ 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.WithdrawParam;
 import com.txz.cif.core.AuthService;
 import com.txz.operating.dto.ConfigDTO;
@@ -28,6 +31,7 @@ import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
@@ -160,21 +164,49 @@ public class WithdrawRecordApiController {
 
     @PostMapping("/list")
 	@ApiOperation(value = "withdrawRecord获取列表",httpMethod = "POST")
-    public Result<List<WithdrawRecord>> list(@RequestBody WithdrawRecord withdrawRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+	public Result<List<WithdrawRecord>> list(@RequestBody RecordParam param, HttpServletRequest request) {
+		Long userId = authService.getTokenUserId(request);
 
-        PageHelper.startPage(page, size);
+		PageHelper.startPage(param.getPage(), param.getSize());
 
-        Condition condition = new Condition(withdrawRecord.getClass());
-        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
+		Condition condition = new Condition(WithdrawRecord.class);
+		Criteria criteria = condition.createCriteria();
+		criteria.andEqualTo("userId", userId);
+		if (StrUtil.isNotBlank(param.getChannel())){
+			criteria.andEqualTo("channel", param.getChannel());
+		}
+		if (StrUtil.isNotBlank(param.getUserName())){
+			criteria.andEqualTo("userName", param.getUserName());
+		}
+		if (StrUtil.isNotBlank(param.getUserPhone())){
+			criteria.andEqualTo("userPhone", param.getUserPhone());
+		}
+		if (StrUtil.isNotBlank(param.getOrderNo())){
+			criteria.andEqualTo("orderNo", param.getOrderNo());
+		}
+		if (param.getStatus() != null){
+			criteria.andEqualTo("status", param.getStatus());
+		}
+		if (param.getTimeType() != null){
+			if (param.getTimeType() ==1 ){
+				if (StrUtil.isNotBlank(param.getStartTime())){
+					criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
+				}
+			} else  if (param.getTimeType() ==2 ){
+				if (StrUtil.isNotBlank(param.getStartTime())){
+					criteria.andBetween("successTime", param.getStartTime(),param.getEndTime());
+				}
+			}
+		}
 		PageInfo pageInfo = null;
 		try {
-    		 List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
+			condition.setOrderByClause("create_time desc");
+			List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
+			pageInfo = new PageInfo(list);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-        return ResultGenerator.genSuccessResult(pageInfo);
-    }
+		return ResultGenerator.genSuccessResult(pageInfo);
+	}
 }

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

@@ -1,6 +1,8 @@
 package com.txz.cif.web.mng;
+import cn.hutool.core.util.StrUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.model.WithdrawRecord;
 import com.txz.cif.service.WithdrawRecordService;
 
@@ -8,6 +10,7 @@ import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.web.para.RecordParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,21 +60,47 @@ public class WithdrawRecordController {
 
     @PostMapping("/list")
 	@ApiOperation(value = "withdrawRecord获取列表",httpMethod = "POST")
-    public Result<List<WithdrawRecord>> list(@RequestBody WithdrawRecord withdrawRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+	public Result<List<WithdrawRecord>> list(@RequestBody RecordParam param) {
 
-        PageHelper.startPage(page, size);
+		PageHelper.startPage(param.getPage(), param.getSize());
 
-        Condition condition = new Condition(withdrawRecord.getClass());
-        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
+		Condition condition = new Condition(WithdrawRecord.class);
+		Criteria criteria = condition.createCriteria();
+		if (StrUtil.isNotBlank(param.getChannel())){
+			criteria.andEqualTo("channel", param.getChannel());
+		}
+		if (StrUtil.isNotBlank(param.getUserName())){
+			criteria.andEqualTo("userName", param.getUserName());
+		}
+		if (StrUtil.isNotBlank(param.getUserPhone())){
+			criteria.andEqualTo("userPhone", param.getUserPhone());
+		}
+		if (StrUtil.isNotBlank(param.getOrderNo())){
+			criteria.andEqualTo("orderNo", param.getOrderNo());
+		}
+		if (param.getStatus() != null){
+			criteria.andEqualTo("status", param.getStatus());
+		}
+		if (param.getTimeType() != null){
+			if (param.getTimeType() ==1 ){
+				if (StrUtil.isNotBlank(param.getStartTime())){
+					criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
+				}
+			} else  if (param.getTimeType() ==2 ){
+				if (StrUtil.isNotBlank(param.getStartTime())){
+					criteria.andBetween("successTime", param.getStartTime(),param.getEndTime());
+				}
+			}
+		}
 		PageInfo pageInfo = null;
 		try {
-    		 List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
+			condition.setOrderByClause("create_time desc");
+			List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
+			pageInfo = new PageInfo(list);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-        return ResultGenerator.genSuccessResult(pageInfo);
-    }
+		return ResultGenerator.genSuccessResult(pageInfo);
+	}
 }