Merge remote-tracking branch 'origin/master'

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

@@ -16,27 +16,30 @@
  */
 package org.springblade.sing.active.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 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.sing.active.service.IActiveProductRecordService;
-import org.springblade.sing.goods.service.IHelpGoodsService;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.sing.active.entity.ActiveHelpRecord;
+import org.springblade.sing.active.service.IActiveHelpRecordService;
+import org.springblade.sing.active.service.IActiveProductRecordService;
 import org.springblade.sing.active.vo.ActiveHelpRecordVO;
 import org.springblade.sing.active.wrapper.ActiveHelpRecordWrapper;
-import org.springblade.sing.active.service.IActiveHelpRecordService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import org.springblade.sing.goods.service.IActiveIdAndGoodsIdService;
+import org.springblade.sing.goods.service.IHelpGoodsService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 活动助力记录 控制器
@@ -51,8 +54,9 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class ActiveHelpRecordController extends BladeController {
 
 	private final IActiveHelpRecordService activeHelpRecordService;
-	private IActiveProductRecordService activeProductRecordService;
-	private IHelpGoodsService helpGoodsService;
+	private final IActiveProductRecordService activeProductRecordService;
+	private final IHelpGoodsService helpGoodsService;
+	private final IActiveIdAndGoodsIdService activeIdAndGoodsIdService;
 
 	/**
 	 * 详情
@@ -126,8 +130,19 @@ public class ActiveHelpRecordController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(activeHelpRecordService.deleteLogic(Func.toLongList(ids)));
+		List<Long> longs = Func.toLongList(ids);
+		for (Long aLong : longs) {
+			deletePointGoodsAndActiveId(aLong);
+		}
+		return R.status(activeHelpRecordService.deleteLogic(longs));
 	}
 
-
+	/**
+	 * 删除积分商品的活动
+	 * @param activeId
+	 */
+	private boolean deletePointGoodsAndActiveId(Long activeId){
+		return activeIdAndGoodsIdService.remove(Wrappers.<ActiveIdAndGoodsId>lambdaUpdate()
+			.eq(ActiveIdAndGoodsId::getActiveId,activeId));
+	}
 }

src/main/java/org/springblade/sing/goods/controller/PointGoodsController.java

@@ -120,6 +120,7 @@ public class PointGoodsController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入pointGoods")
+	@Transactional
 	public R submit(@Valid @RequestBody PointGoods pointGoods) {
 		return R.status(updatePointGoodsAndActiveId(pointGoods.getActiveId(),pointGoods.getId())
 			&& pointGoodsService.saveOrUpdate(pointGoods));
@@ -165,7 +166,7 @@ public class PointGoodsController extends BladeController {
 	}
 
 	/**
-	 * 修改积分商品的活动ID
+	 * 删除积分商品的活动
 	 * @param goodsId
 	 */
 	private boolean deletePointGoodsAndActiveId(Long goodsId){