搜索

src/main/java/org/springblade/gateway/point_gateway/service/impl/PointExchangeServiceImpl.java

@@ -104,8 +104,8 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 
 		//添加积分消费
 		PointRecord pointRecord = new PointRecord();
-		pointRecord.setPoint(goods.getPoint().negate());
-		pointRecord.setUserId(user.getId());
+		pointRecord.setPoint(goods.getPoint());
+		pointRecord.setUserId(user.getUserId());
 		pointRecord.setPointGoodsId(goodsId);
 		pointRecord.setPointType(PointTypeEnum.PUFA_POINT_EXCHANGE);
 		pointRecord.setPhone(phone);

src/main/java/org/springblade/sing/active/controller/ActiveHelpRecordController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.sing.active.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -75,8 +76,15 @@ public class ActiveHelpRecordController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入activeHelpRecord")
-	public R<IPage<ActiveHelpRecordVO>> list(ActiveHelpRecord activeHelpRecord, Query query) {
-		IPage<ActiveHelpRecord> pages = activeHelpRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(activeHelpRecord).lambda().orderByDesc(ActiveHelpRecord::getCreateTime));
+	public R<IPage<ActiveHelpRecordVO>> list(ActiveHelpRecordVO activeHelpRecord, Query query) {
+		LambdaQueryWrapper<ActiveHelpRecord> wrapper = new LambdaQueryWrapper<>();
+
+		wrapper.between(activeHelpRecord.getBeginTime() != null && activeHelpRecord.getLastTime() != null,
+			ActiveHelpRecord::getCreateTime,activeHelpRecord.getBeginTime(),activeHelpRecord.getLastTime());
+
+		wrapper.orderByDesc(ActiveHelpRecord::getCreateTime);
+
+		IPage<ActiveHelpRecord> pages = activeHelpRecordService.page(Condition.getPage(query), wrapper);
 		return R.data(ActiveHelpRecordWrapper.build(activeProductRecordService,helpGoodsService).pageVO(pages));
 	}
 

src/main/java/org/springblade/sing/active/controller/ActiveRecordController.java

@@ -17,6 +17,7 @@
 package org.springblade.sing.active.controller;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -28,6 +29,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.sing.active.entity.ActiveRecord;
 import org.springblade.sing.active.service.IActiveRecordService;
 import org.springblade.sing.active.vo.ActiveRecordVO;
@@ -67,8 +69,20 @@ public class ActiveRecordController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入activeRecord")
-	public R<IPage<ActiveRecordVO>> list(ActiveRecord activeRecord, Query query) {
-		IPage<ActiveRecord> pages = activeRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(activeRecord).lambda().orderByDesc(ActiveRecord::getStartTime));
+	public R<IPage<ActiveRecordVO>> list(ActiveRecordVO activeRecord, Query query) {
+
+		LambdaQueryWrapper<ActiveRecord> wrapper = new LambdaQueryWrapper<>();
+
+		wrapper.like(StringUtil.hasLength(activeRecord.getTitle()),ActiveRecord::getTitle,activeRecord.getTitle());
+
+		wrapper.like(StringUtil.hasLength(activeRecord.getSponsor()),ActiveRecord::getSponsor,activeRecord.getSponsor());
+
+		wrapper.between(activeRecord.getBeginTime() != null && activeRecord.getLastTime() != null
+			,ActiveRecord::getStartTime,activeRecord.getBeginTime(),activeRecord.getLastTime());
+
+		wrapper.orderByDesc(ActiveRecord::getStartTime);
+
+		IPage<ActiveRecord> pages = activeRecordService.page(Condition.getPage(query), wrapper);
 		return R.data(ActiveRecordWrapper.build().pageVO(pages));
 	}
 	/**

src/main/java/org/springblade/sing/active/vo/ActiveHelpRecordVO.java

@@ -22,6 +22,8 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import org.springblade.sing.goods.entity.HelpGoods;
 
+import java.util.Date;
+
 /**
  * 活动助力记录视图实体类
  *
@@ -54,4 +56,8 @@ public class ActiveHelpRecordVO extends ActiveHelpRecord {
 	 */
 	private String helpGoodsName;
 
+	private Date beginTime;
+
+	private Date lastTime;
+
 }

src/main/java/org/springblade/sing/active/vo/ActiveRecordVO.java

@@ -22,6 +22,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.Date;
+
+
 /**
  * 活动记录视图实体类
  *
@@ -42,4 +45,10 @@ public class ActiveRecordVO extends ActiveRecord {
 
 	@ApiModelProperty("用户数")
 	private Long userCount;
+
+	@ApiModelProperty("开始时间")
+	private Date beginTime;
+
+	@ApiModelProperty("结束时间")
+	private Date lastTime;
 }