22.1.7(后台完善)

src/main/java/org/springblade/gateway/active_gateway/controller/IActiveHelpController.java

@@ -1,20 +1,14 @@
 package org.springblade.gateway.active_gateway.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
-import org.springblade.gateway.active_gateway.service.ProductSortService;
-import org.springblade.gateway.active_gateway.vo.ProductSortVO;
 import org.springblade.sing.active.entity.ActiveHelp;
 import org.springblade.sing.active.service.IActiveHelpService;
 import org.springblade.sing.active.vo.ActiveHelpVO;
-import org.springblade.sing.active.vo.ActiveProductRecordVO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,7 +27,7 @@ public class IActiveHelpController {
 	@GetMapping("/help")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我的代言", notes = "传入activeHelpVO")
-	public R<ActiveHelp> list(ActiveHelpVO activeHelpVO) throws IllegalAccessException {
+	public R<ActiveHelp> list(ActiveHelpVO activeHelpVO) {
 		return R.data(activeHelpService.queryIndex(activeHelpVO));
 	}
 

src/main/java/org/springblade/gateway/common_gateway/controller/IndexCensusController.java

@@ -11,6 +11,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: Silent
  * @Description
@@ -43,4 +46,11 @@ public class IndexCensusController {
 	public R<IndexCensusDto> censusTodayTotal(){
 		return R.data(indexCensusService.censusTotalCount(true));
 	}
+
+	@GetMapping("/activeTotal")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "统计今日数量")
+	public R<List<Map<String,Object>>> activeTotal(){
+		return R.data(indexCensusService.activeTotal());
+	}
 }

src/main/java/org/springblade/gateway/common_gateway/service/IndexCensusService.java

@@ -2,6 +2,9 @@ package org.springblade.gateway.common_gateway.service;
 
 import org.springblade.gateway.common_gateway.dto.IndexCensusDto;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: Silent
  * @Description
@@ -10,4 +13,11 @@ import org.springblade.gateway.common_gateway.dto.IndexCensusDto;
  */
 public interface IndexCensusService {
 	IndexCensusDto censusTotalCount(boolean today);
+
+	/**
+	 * 活动名
+	 * @return
+	 */
+	List<Map<String,Object>> activeTotal();
+
 }

src/main/java/org/springblade/gateway/common_gateway/service/impl/IndexCensusServiceImpl.java

@@ -16,6 +16,11 @@ import org.springblade.sing.user.service.ILoginUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: Silent
  * @Description
@@ -60,4 +65,18 @@ public class IndexCensusServiceImpl implements IndexCensusService {
 				.build();
 		}
 	}
+
+	@Override
+	public List<Map<String,Object>> activeTotal() {
+		List<Map<String,Object>> list = new ArrayList<>();
+		List<ActiveRecord> activeRecords = activeRecordService.list();
+		for (ActiveRecord activeRecord : activeRecords) {
+			HashMap<String, Object> map = new HashMap<>();
+			map.put("name",activeRecord.getTitle());
+			map.put("value",activeProductRecordService.selectProductCountByActiveId(activeRecord.getId()));
+			list.add(map);
+		}
+
+		return list;
+	}
 }

src/main/java/org/springblade/sing/active/entity/ActiveProductRecord.java

@@ -92,4 +92,6 @@ public class ActiveProductRecord extends BaseEntity {
 	@ApiModelProperty(value = "手机号")
 	private String phone;
 
+	private String player;
+
 }

src/main/java/org/springblade/sing/active/service/IActiveProductRecordService.java

@@ -37,4 +37,9 @@ public interface IActiveProductRecordService extends BaseService<ActiveProductRe
 	 * @return
 	 */
 	IPage<ActiveProductRecordVO> selectActiveProductRecordPage(IPage<ActiveProductRecordVO> page, ActiveProductRecordVO activeProductRecord);
+
+	/**
+	 * 活动作品数
+	 */
+	Long selectProductCountByActiveId(Long activeId);
 }

src/main/java/org/springblade/sing/active/service/IActiveRecordService.java

@@ -38,4 +38,5 @@ public interface IActiveRecordService extends BaseService<ActiveRecord> {
 	 */
 	IPage<ActiveRecordVO> selectActiveRecordPage(IPage<ActiveRecordVO> page, ActiveRecordVO activeRecord);
 
+
 }

src/main/java/org/springblade/sing/active/service/impl/ActiveHelpServiceImpl.java

@@ -56,10 +56,10 @@ public class ActiveHelpServiceImpl extends BaseServiceImpl<ActiveHelpMapper, Act
     public ActiveHelp queryIndex(ActiveHelpVO activeHelpVO) {
 
 		Assert.notNull(activeHelpVO.getPhone(), "请添加手机号");
-		Assert.notNull(activeHelpVO.getActiveId(), "非法操作");
+		Assert.notNull(activeHelpVO.getActiveId(), "该活动不存在");
 
 		ActiveRecord activeRecord = activeRecordService.getById(activeHelpVO.getActiveId());
-		Assert.notNull(activeRecord, "非法操作");
+		Assert.notNull(activeRecord, "该活动不存在");
 
 		synchronized(activeHelpVO.getPhone().intern()){
 			ActiveHelp activeHelp = baseMapper.selectOne(new LambdaQueryWrapper<ActiveHelp>().eq(ActiveHelp::getActiveId,activeHelpVO.getActiveId()).eq(ActiveHelp::getPhone,

src/main/java/org/springblade/sing/active/service/impl/ActiveProductRecordServiceImpl.java

@@ -38,4 +38,9 @@ public class ActiveProductRecordServiceImpl extends BaseServiceImpl<ActiveProduc
 		return page.setRecords(baseMapper.selectActiveProductRecordPage(page, activeProductRecord));
 	}
 
+    @Override
+    public Long selectProductCountByActiveId(Long activeId) {
+		return baseMapper.selectProductByActiveId(activeId);
+    }
+
 }

src/main/java/org/springblade/sing/active/service/impl/ActiveRecordServiceImpl.java

@@ -38,4 +38,5 @@ public class ActiveRecordServiceImpl extends BaseServiceImpl<ActiveRecordMapper,
 	public IPage<ActiveRecordVO> selectActiveRecordPage(IPage<ActiveRecordVO> page, ActiveRecordVO activeRecord) {
 		return page.setRecords(baseMapper.selectActiveRecordPage(page, activeRecord));
 	}
+
 }

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

@@ -133,5 +133,13 @@ public class HelpGoodsController extends BladeController {
 		return R.status(helpGoodsService.deleteLogic(longs));
 	}
 
+	@PostMapping("/shelves")
+	public R shelves(@RequestParam List<String> ids){
+		return R.status(helpGoodsService.shelvesByIds(ids));
+	}
 
+	@PostMapping("/UnShelves")
+	public R UnShelves(@RequestParam List<String> ids){
+		return R.status(helpGoodsService.unShelvesByIds(ids));
+	}
 }

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

@@ -160,4 +160,14 @@ public class PointGoodsController extends BladeController {
 		return activeIdAndGoodsIdService.remove(Wrappers.<ActiveIdAndGoodsId>lambdaUpdate()
 			.eq(ActiveIdAndGoodsId::getGoodsId,goodsId));
 	}
+
+	@PostMapping("/shelves")
+	public R shelves(@RequestParam List<String> ids){
+		return R.status(pointGoodsService.shelvesByIds(ids));
+	}
+
+	@PostMapping("/UnShelves")
+	public R UnShelves(@RequestParam List<String> ids){
+		return R.status(pointGoodsService.unShelvesByIds(ids));
+	}
 }

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

@@ -36,6 +36,9 @@
         <if test="goodsRecord.helpGoodsName != null">
             and hg.name like concat('%',#{goodsRecord.helpGoodsName},'%')
         </if>
+        <if test="goodsRecord.beginTime != null and goodsRecord.lastTime != null">
+            and gr.create_time between #{goodsRecord.beginTime} and #{goodsRecord.lastTime}
+        </if>
         order by gr.create_time DESC
     </select>
 

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

@@ -21,6 +21,8 @@ import org.springblade.sing.goods.vo.HelpGoodsVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 助力商城 服务类
  *
@@ -38,4 +40,7 @@ public interface IHelpGoodsService extends BaseService<HelpGoods> {
 	 */
 	IPage<HelpGoodsVO> selectHelpGoodsPage(IPage<HelpGoodsVO> page, HelpGoodsVO helpGoods);
 
+    boolean shelvesByIds(List<String> ids);
+
+	boolean unShelvesByIds(List<String> ids);
 }

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

@@ -48,4 +48,18 @@ public interface IPointGoodsService extends BaseService<PointGoods> {
 	 * @return
 	 */
     IPage<PointGoods> queryList(Long activeId, Query query,Integer searchType);
+
+	/**
+	 * 商品批量上架
+	 * @param ids
+	 * @return
+	 */
+	boolean shelvesByIds(List<String> ids);
+
+	/**
+	 * 商品批量下架
+	 * @param ids
+	 * @return
+	 */
+	boolean unShelvesByIds(List<String> ids);
 }

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

@@ -24,6 +24,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 助力商城 服务实现类
  *
@@ -38,4 +40,22 @@ public class HelpGoodsServiceImpl extends BaseServiceImpl<HelpGoodsMapper, HelpG
 		return page.setRecords(baseMapper.selectHelpGoodsPage(page, helpGoods));
 	}
 
+    @Override
+    public boolean shelvesByIds(List<String> ids) {
+		List<HelpGoods> helpGoods = baseMapper.selectBatchIds(ids);
+		for (HelpGoods helpGood : helpGoods) {
+			helpGood.setStatus(1);
+		}
+		return super.updateBatchById(helpGoods);
+	}
+
+	@Override
+	public boolean unShelvesByIds(List<String> ids) {
+		List<HelpGoods> helpGoods = baseMapper.selectBatchIds(ids);
+		for (HelpGoods helpGood : helpGoods) {
+			helpGood.setStatus(0);
+		}
+		return super.updateBatchById(helpGoods);
+	}
+
 }

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

@@ -106,4 +106,21 @@ public class PointGoodsServiceImpl extends BaseServiceImpl<PointGoodsMapper, Poi
 		return super.page(pointGoodsIPage,wrapper);
     }
 
+    @Override
+    public boolean shelvesByIds(List<String> ids) {
+		List<PointGoods> list = baseMapper.selectBatchIds(ids);
+		for (PointGoods pointGoods : list) {
+			pointGoods.setStatus(1);
+		}
+		return super.updateBatchById(list);
+	}
+
+	@Override
+	public boolean unShelvesByIds(List<String> ids) {
+		List<PointGoods> list = baseMapper.selectBatchIds(ids);
+		for (PointGoods pointGoods : list) {
+			pointGoods.setStatus(0);
+		}
+		return super.updateBatchById(list);
+	}
 }

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

@@ -22,6 +22,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.Date;
+
 /**
  * 商品记录视图实体类
  *
@@ -39,4 +41,8 @@ public class GoodsRecordVO extends GoodsRecord {
 
 	@ApiModelProperty("道具名")
 	private String helpGoodsName;
+
+	private Date beginTime;
+
+	private Date lastTime;
 }

src/main/java/org/springblade/sing/user/controller/LoginUserController.java

@@ -76,6 +76,7 @@ public class LoginUserController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入loginUser")
 	public R<IPage<LoginUserVO>> list(LoginUser loginUser, Query query) {
 		LambdaQueryWrapper<LoginUser> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(loginUser.getPhone() != null,LoginUser::getPhone,loginUser.getPhone());
 		wrapper.like(loginUser.getNickName() != null,LoginUser::getNickName,loginUser.getNickName());
 		IPage<LoginUser> pages = loginUserService.page(Condition.getPage(query), wrapper);
 		return R.data(LoginUserWrapper.build().pageVO(pages));