充值

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

@@ -15,6 +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 org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,10 +59,11 @@ public class RechargeRecordApiController {
 	@PostMapping("/add")
 	@ApiOperation(value = "创建充值订单",httpMethod = "POST")
     public Result add(@RequestParam Long goodsId, HttpServletRequest request) {
-    	if(goodsId == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-    	}
-    	try {
+		Long userId = authService.getTokenUserId(request);
+		if(goodsId == null){
+			return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+		}
+		try {
 			Goods goods = goodsService.findById(goodsId);
 			if (goods == null){
 				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
@@ -69,7 +71,6 @@ public class RechargeRecordApiController {
 			if (goods.getStatus() != 1){
 				return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
 			}
-			Long userId = authService.getTokenUserId(request);
 			User user = userService.findById(userId);
 			if (user == null){
 				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
@@ -133,21 +134,49 @@ public class RechargeRecordApiController {
 
     @PostMapping("/list")
 	@ApiOperation(value = "rechargeRecord获取列表",httpMethod = "POST")
-    public Result<List<RechargeRecord>> list(@RequestBody RechargeRecord rechargeRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+	public Result<List<RechargeRecord>> 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(rechargeRecord.getClass());
-        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
+		Condition condition = new Condition(RechargeRecord.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<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
+			condition.setOrderByClause("create_time desc");
+			List<RechargeRecord> list = rechargeRecordService.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/RechargeRecordController.java

@@ -1,4 +1,5 @@
 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;
@@ -8,6 +9,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,15 +59,41 @@ public class RechargeRecordController {
 
     @PostMapping("/list")
 	@ApiOperation(value = "rechargeRecord获取列表",httpMethod = "POST")
-    public Result<List<RechargeRecord>> list(@RequestBody RechargeRecord rechargeRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+    public Result<List<RechargeRecord>> list(@RequestBody RecordParam param) {
 
-        PageHelper.startPage(page, size);
+        PageHelper.startPage(param.getPage(), param.getSize());
 
-        Condition condition = new Condition(rechargeRecord.getClass());
+        Condition condition = new Condition(RechargeRecord.class);
         Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
+		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 {
+			condition.setOrderByClause("create_time desc");
     		 List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
     		 pageInfo = new PageInfo(list);
 		} catch (Exception e) {

cif-service/src/main/java/com/txz/cif/web/para/RecordParam.java

@@ -0,0 +1,78 @@
+package com.txz.cif.web.para;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+
+@ApiModel(value="集合查询")
+public class RecordParam {
+
+
+    /**
+     * 订单号
+     */
+    @Column(name = "order_no")
+    @ApiModelProperty(value="orderNo订单号")
+    private String orderNo;
+
+
+    /**
+     * 状态 1处理中 2充值成功 3充值失败 4超时取消
+     */
+    @ApiModelProperty(value="status状态 1处理中 2充值成功 3充值失败 4超时取消")
+    private Integer status;
+
+    /**
+     * 渠道
+     */
+    @ApiModelProperty(value="channel渠道")
+    private String channel;
+
+
+
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value="userName用户名")
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value="userPhone手机号")
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    @ApiModelProperty(value="开始时间")
+    private String startTime;
+
+    /**
+     * 交易成功时间
+     */
+    @ApiModelProperty(value="结束时间")
+    private String endTime;
+
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(value="page")
+    private Integer page;
+
+    @ApiModelProperty(value="size")
+    private Integer size;
+
+    @ApiModelProperty(value="时间类型 1下单时间 2成功时间")
+    private Integer timeType;
+
+}