短信

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

@@ -110,8 +110,7 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 		pointRecord.setPointType(PointTypeEnum.PUFA_POINT_EXCHANGE);
 		pointRecord.setPhone(phone);
 		pointRecord.setActiveId(activeId);
-		boolean save = pointRecordService.save(pointRecord);
-		System.out.println(save);
+		Assert.isTrue(pointRecordService.save(pointRecord),"兑换失败");
 
 		//更新商品库存
 		goods.setRemain(goods.getRemain() - num);

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

@@ -68,7 +68,7 @@ public class ActiveRecordController extends BladeController {
 	@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));
+		IPage<ActiveRecord> pages = activeRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(activeRecord).lambda().orderByDesc(ActiveRecord::getStartTime));
 		return R.data(ActiveRecordWrapper.build().pageVO(pages));
 	}
 	/**

src/main/java/org/springblade/sing/goods/mapper/PointGoodsMapper.xml

@@ -20,8 +20,6 @@
         <result column="content" property="content"/>
     </resultMap>
 
-
-
     <select id="selectPointGoodsPage" resultMap="pointGoodsResultMap">
         select * from sing_point_goods where is_deleted = 0
     </select>

src/main/java/org/springblade/sing/goods/service/impl/PointGoodsServiceImpl.java

@@ -18,11 +18,11 @@ package org.springblade.sing.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.sing.active.entity.ActiveRecord;
 import org.springblade.sing.active.mapper.ActiveRecordMapper;
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
 import org.springblade.sing.goods.entity.PointGoods;
+import org.springblade.sing.goods.service.IActiveIdAndGoodsIdService;
 import org.springblade.sing.goods.vo.PointGoodsVO;
 import org.springblade.sing.goods.mapper.PointGoodsMapper;
 import org.springblade.sing.goods.service.IPointGoodsService;
@@ -47,6 +47,8 @@ public class PointGoodsServiceImpl extends BaseServiceImpl<PointGoodsMapper, Poi
 
 	@Autowired
 	private ActiveRecordMapper activeRecordMapper;
+	@Autowired
+	private IActiveIdAndGoodsIdService activeIdAndGoodsIdService;
 
 	@Override
 	public IPage<PointGoodsVO> selectPointGoodsPage(IPage<PointGoodsVO> page, PointGoodsVO pointGoods) {
@@ -56,10 +58,18 @@ public class PointGoodsServiceImpl extends BaseServiceImpl<PointGoodsMapper, Poi
     @Override
     public IPage<PointGoods> queryList(Long activeId,Query query) {
 
+		List<Long> ids = new ArrayList<>();
+
+//		List<ActiveIdAndGoodsId> activeIdAndGoodsIds = activeIdAndGoodsIdService.list(new LambdaQueryWrapper<ActiveIdAndGoodsId>().eq(ActiveIdAndGoodsId::getActiveId, activeId));
+//
+//		for (ActiveIdAndGoodsId activeIdAndGoodsId : activeIdAndGoodsIds) {
+//			ids.add(activeIdAndGoodsId.getGoodsId());
+//		}
+
 		ActiveRecord activeRecord = activeRecordMapper.selectById(activeId);
 		Assert.notNull(activeRecord,"此活动不存在");
 
-		List<Long> ids = new ArrayList<>();
+
 		List<PointGoods> list = baseMapper.selectList(null);
 		for (PointGoods pointGoods : list) {
 			String goodsActiveId = pointGoods.getActiveId();