添加关联

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

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.controller;
+
+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.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.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import org.springblade.sing.goods.vo.ActiveIdAndGoodsIdVO;
+import org.springblade.sing.goods.wrapper.ActiveIdAndGoodsIdWrapper;
+import org.springblade.sing.goods.service.IActiveIdAndGoodsIdService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("sing_goods/activeidandgoodsid")
+@Api(value = "", tags = "接口")
+public class ActiveIdAndGoodsIdController extends BladeController {
+
+	private final IActiveIdAndGoodsIdService activeIdAndGoodsIdService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入activeIdAndGoodsId")
+	public R<ActiveIdAndGoodsIdVO> detail(ActiveIdAndGoodsId activeIdAndGoodsId) {
+		ActiveIdAndGoodsId detail = activeIdAndGoodsIdService.getOne(Condition.getQueryWrapper(activeIdAndGoodsId));
+		return R.data(ActiveIdAndGoodsIdWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入activeIdAndGoodsId")
+	public R<IPage<ActiveIdAndGoodsIdVO>> list(ActiveIdAndGoodsId activeIdAndGoodsId, Query query) {
+		IPage<ActiveIdAndGoodsId> pages = activeIdAndGoodsIdService.page(Condition.getPage(query), Condition.getQueryWrapper(activeIdAndGoodsId));
+		return R.data(ActiveIdAndGoodsIdWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入activeIdAndGoodsId")
+	public R<IPage<ActiveIdAndGoodsIdVO>> page(ActiveIdAndGoodsIdVO activeIdAndGoodsId, Query query) {
+		IPage<ActiveIdAndGoodsIdVO> pages = activeIdAndGoodsIdService.selectActiveIdAndGoodsIdPage(Condition.getPage(query), activeIdAndGoodsId);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入activeIdAndGoodsId")
+	public R save(@Valid @RequestBody ActiveIdAndGoodsId activeIdAndGoodsId) {
+		return R.status(activeIdAndGoodsIdService.save(activeIdAndGoodsId));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入activeIdAndGoodsId")
+	public R update(@Valid @RequestBody ActiveIdAndGoodsId activeIdAndGoodsId) {
+		return R.status(activeIdAndGoodsIdService.updateById(activeIdAndGoodsId));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入activeIdAndGoodsId")
+	public R submit(@Valid @RequestBody ActiveIdAndGoodsId activeIdAndGoodsId) {
+		return R.status(activeIdAndGoodsIdService.saveOrUpdate(activeIdAndGoodsId));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(activeIdAndGoodsIdService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

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

@@ -16,27 +16,33 @@
  */
 package org.springblade.sing.goods.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.user.entity.LoginUser;
-import org.springblade.sing.user.service.ILoginUserService;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+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.service.IPointGoodsService;
 import org.springblade.sing.goods.vo.PointGoodsVO;
 import org.springblade.sing.goods.wrapper.PointGoodsWrapper;
-import org.springblade.sing.goods.service.IPointGoodsService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.sing.user.entity.LoginUser;
+import org.springblade.sing.user.service.ILoginUserService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 积分商城 控制器
@@ -52,6 +58,7 @@ public class PointGoodsController extends BladeController {
 
 	private final IPointGoodsService pointGoodsService;
 	private final ILoginUserService loginUserService;
+	private final IActiveIdAndGoodsIdService activeIdAndGoodsIdService;
 
 	/**
 	 * 详情
@@ -114,7 +121,8 @@ public class PointGoodsController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入pointGoods")
 	public R submit(@Valid @RequestBody PointGoods pointGoods) {
-		return R.status(pointGoodsService.saveOrUpdate(pointGoods));
+		return R.status(updatePointGoodsAndActiveId(pointGoods.getActiveId(),pointGoods.getId())
+			&& pointGoodsService.saveOrUpdate(pointGoods));
 	}
 
 
@@ -124,8 +132,13 @@ public class PointGoodsController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Transactional
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(pointGoodsService.deleteLogic(Func.toLongList(ids)));
+		List<Long> longs = Func.toLongList(ids);
+		for (Long aLong : longs) {
+			deletePointGoodsAndActiveId(aLong);
+		}
+		return R.status(pointGoodsService.deleteLogic(longs));
 	}
 
 	/**
@@ -137,4 +150,26 @@ public class PointGoodsController extends BladeController {
 		return R.data(loginUser);
 	}
 
+	/**
+	 * 修改积分商品的活动ID
+	 * @param activeIds
+	 * @param goodsId
+	 */
+	private boolean updatePointGoodsAndActiveId(String activeIds,Long goodsId){
+		//先删除原有的,再添加新的
+		return deletePointGoodsAndActiveId(goodsId)
+			&& activeIdAndGoodsIdService.saveBatch(Arrays.stream(activeIds.split(",")).map(activeId -> new ActiveIdAndGoodsId() {{
+			setActiveId(Long.valueOf(activeId));
+			setGoodsId(goodsId);
+		}}).collect(Collectors.toList()));
+	}
+
+	/**
+	 * 修改积分商品的活动ID
+	 * @param goodsId
+	 */
+	private boolean deletePointGoodsAndActiveId(Long goodsId){
+		return activeIdAndGoodsIdService.remove(Wrappers.<ActiveIdAndGoodsId>lambdaUpdate()
+			.eq(ActiveIdAndGoodsId::getGoodsId,goodsId));
+	}
 }

src/main/java/org/springblade/sing/goods/dto/ActiveIdAndGoodsIdDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.dto;
+
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ActiveIdAndGoodsIdDTO extends ActiveIdAndGoodsId {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/sing/goods/entity/ActiveIdAndGoodsId.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+@Data
+@TableName("sing_active_id_and_goods_id")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ActiveIdAndGoodsId对象", description = "ActiveIdAndGoodsId对象")
+public class ActiveIdAndGoodsId extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long activeId;
+	private Long goodsId;
+
+
+}

src/main/java/org/springblade/sing/goods/mapper/ActiveIdAndGoodsIdMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.mapper;
+
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import org.springblade.sing.goods.vo.ActiveIdAndGoodsIdVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+public interface ActiveIdAndGoodsIdMapper extends BaseMapper<ActiveIdAndGoodsId> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param activeIdAndGoodsId
+	 * @return
+	 */
+	List<ActiveIdAndGoodsIdVO> selectActiveIdAndGoodsIdPage(IPage page, ActiveIdAndGoodsIdVO activeIdAndGoodsId);
+
+}

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.sing.goods.mapper.ActiveIdAndGoodsIdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="activeIdAndGoodsIdResultMap" type="org.springblade.sing.goods.entity.ActiveIdAndGoodsId">
+        <id column="active_id" property="activeId"/>
+        <result column="goods_id" property="goodsId"/>
+    </resultMap>
+
+
+    <select id="selectActiveIdAndGoodsIdPage" resultMap="activeIdAndGoodsIdResultMap">
+        select * from sing_active_id_and_goods_id where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/sing/goods/service/IActiveIdAndGoodsIdService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.service;
+
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import org.springblade.sing.goods.vo.ActiveIdAndGoodsIdVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+public interface IActiveIdAndGoodsIdService extends BaseService<ActiveIdAndGoodsId> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param activeIdAndGoodsId
+	 * @return
+	 */
+	IPage<ActiveIdAndGoodsIdVO> selectActiveIdAndGoodsIdPage(IPage<ActiveIdAndGoodsIdVO> page, ActiveIdAndGoodsIdVO activeIdAndGoodsId);
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.service.impl;
+
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import org.springblade.sing.goods.vo.ActiveIdAndGoodsIdVO;
+import org.springblade.sing.goods.mapper.ActiveIdAndGoodsIdMapper;
+import org.springblade.sing.goods.service.IActiveIdAndGoodsIdService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+@Service
+public class ActiveIdAndGoodsIdServiceImpl extends BaseServiceImpl<ActiveIdAndGoodsIdMapper, ActiveIdAndGoodsId> implements IActiveIdAndGoodsIdService {
+
+	@Override
+	public IPage<ActiveIdAndGoodsIdVO> selectActiveIdAndGoodsIdPage(IPage<ActiveIdAndGoodsIdVO> page, ActiveIdAndGoodsIdVO activeIdAndGoodsId) {
+		return page.setRecords(baseMapper.selectActiveIdAndGoodsIdPage(page, activeIdAndGoodsId));
+	}
+
+}

src/main/java/org/springblade/sing/goods/vo/ActiveIdAndGoodsIdVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.vo;
+
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ActiveIdAndGoodsIdVO对象", description = "ActiveIdAndGoodsIdVO对象")
+public class ActiveIdAndGoodsIdVO extends ActiveIdAndGoodsId {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/sing/goods/wrapper/ActiveIdAndGoodsIdWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.sing.goods.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
+import org.springblade.sing.goods.vo.ActiveIdAndGoodsIdVO;
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-12-10
+ */
+public class ActiveIdAndGoodsIdWrapper extends BaseEntityWrapper<ActiveIdAndGoodsId, ActiveIdAndGoodsIdVO>  {
+
+	public static ActiveIdAndGoodsIdWrapper build() {
+		return new ActiveIdAndGoodsIdWrapper();
+ 	}
+
+	@Override
+	public ActiveIdAndGoodsIdVO entityVO(ActiveIdAndGoodsId activeIdAndGoodsId) {
+		ActiveIdAndGoodsIdVO activeIdAndGoodsIdVO = Objects.requireNonNull(BeanUtil.copy(activeIdAndGoodsId, ActiveIdAndGoodsIdVO.class));
+
+		//User createUser = UserCache.getUser(activeIdAndGoodsId.getCreateUser());
+		//User updateUser = UserCache.getUser(activeIdAndGoodsId.getUpdateUser());
+		//activeIdAndGoodsIdVO.setCreateUserName(createUser.getName());
+		//activeIdAndGoodsIdVO.setUpdateUserName(updateUser.getName());
+
+		return activeIdAndGoodsIdVO;
+	}
+
+}