merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/ActivityRecommendController.java

@@ -2,17 +2,17 @@ package com.zhongzheng.controller.cmmon;
 
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo;
 import com.zhongzheng.modules.activity.service.IActivityRecommendService;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -42,6 +42,14 @@ public class ActivityRecommendController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询商品推荐列表
+     */
+    @ApiOperation("查询商品推荐列表")
+    @GetMapping("/goodsList")
+    public TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo) {
+        return iActivityRecommendService.getGoodsList(bo);
+    }
 
 
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -149,7 +149,6 @@ public class CommonController extends BaseController {
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
             String hideVersion = configService.selectConfigByKey("version.hide");
-            System.out.println(hideVersion);
             if(bo.getVersion().equals(hideVersion)){
                 map.put("hide",true);
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityRecommendService.java

@@ -1,10 +1,13 @@
 package com.zhongzheng.modules.activity.service;
 
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityRecommend;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
 
 import java.util.Collection;
@@ -53,4 +56,6 @@ public interface IActivityRecommendService extends IService<ActivityRecommend> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -3,30 +3,29 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo;
+import com.zhongzheng.modules.activity.bo.*;
 import com.zhongzheng.modules.activity.domain.ActivityRecommend;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 import com.zhongzheng.modules.activity.mapper.ActivityRecommendMapper;
 import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
 import com.zhongzheng.modules.activity.service.IActivityRecommendService;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +39,8 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
 
     @Autowired
     private IActivityRecommendGoodsService iActivityRecommendGoodsService;
+    @Autowired
+    private IGoodsService iGoodsService;
 
 
     @Override
@@ -85,6 +86,7 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ActivityRecommendAddBo bo) {
         ActivityRecommend add = BeanUtil.toBean(bo, ActivityRecommend.class);
+        add.setSubjectIds("");
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -124,6 +126,7 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     @Override
     public Boolean updateByEditBo(ActivityRecommendEditBo bo) {
         ActivityRecommend update = BeanUtil.toBean(bo, ActivityRecommend.class);
+        update.setSubjectIds("");
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         if (CollectionUtils.isNotEmpty(bo.getSubjectIds())&&bo.getSubjectIds().size()>0){
@@ -161,4 +164,33 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo) {
+        TableDataInfo<ActivityRecommendGoodsVo> result = new TableDataInfo<>();
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoods> page = iActivityRecommendGoodsService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),
+                new LambdaQueryWrapper<ActivityRecommendGoods>()
+                        .eq(ActivityRecommendGoods::getRecommendId, bo.getRecommendId())
+                        .orderByAsc(ActivityRecommendGoods::getSort));
+        if (CollectionUtils.isEmpty(page.getRecords())){
+            return result;
+        }
+        List<ActivityRecommendGoods> list = page.getRecords();
+        List<ActivityRecommendGoodsVo> listVos = list.stream().map(item -> {
+            ActivityRecommendGoodsVo vo = new ActivityRecommendGoodsVo();
+            BeanUtil.copyProperties(item, vo);
+            Goods goods = iGoodsService.getById(item.getGoodsId());
+            vo.setGoodsName(goods.getGoodsName());
+            vo.setGoodsType(goods.getGoodsType());
+            vo.setCoverUrl(goods.getCoverUrl());
+            vo.setYear(goods.getYear());
+            vo.setStandPrice(goods.getStandPrice());
+            vo.setLinePrice(goods.getLinePrice());
+            return vo;
+        }).collect(Collectors.toList());
+        result.setTotal(page.getTotal());
+        result.setRows(listVos);
+        result.setCode(200);
+        return result;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityRecommendGoodsVo.java

@@ -40,10 +40,14 @@ public class ActivityRecommendGoodsVo {
 	private Integer sort;
 	@ApiModelProperty("商品名")
 	private String goodsName;
+	@ApiModelProperty("商品类型")
+	private Integer goodsType;
 	/** 标准价格 */
 	@Excel(name = "标准价格")
 	@ApiModelProperty("标准价格")
 	private BigDecimal standPrice;
+	@ApiModelProperty("划线价格")
+	private BigDecimal LinePrice;
 	@ApiModelProperty("商品编码")
 	private String code;
 	/** 年份 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -361,7 +361,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
 
         tableDataInfo.setTotal(page.getTotal());
         tableDataInfo.setRows(result);
-
+        tableDataInfo.setCode(200);
         return tableDataInfo;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -50,6 +50,10 @@ GoodsQueryBo extends BaseEntity {
 	/** 商品类型 1视频2题库 3补考 4前培 */
 	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
 	private Integer goodsType;
+
+	/** 商品类型 1视频2题库 3补考 4前培 */
+	@ApiModelProperty("商品类型集合 1视频2题库 3补考 4前培 ")
+	private List<Integer> goodsTypes;
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")
 	private Long educationTypeId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockTimeAddBo.java

@@ -21,6 +21,9 @@ public class MockTimeAddBo {
     @ApiModelProperty("科目ID")
     private Long subjectId;
 
+    @ApiModelProperty("关联科目ID")
+    private Integer mockMajorSubjectId;
+
     @ApiModelProperty("用户ID")
     private Long userId;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -613,7 +613,8 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
 
         UserMockSubscribe userMockSubscribe = iUserMockSubscribeService.getOne(new LambdaQueryWrapper<UserMockSubscribe>()
                 .eq(UserMockSubscribe::getUserId, bo.getUserId())
-                .eq(UserMockSubscribe::getApplyId, bo.getApplyId()));
+                .eq(UserMockSubscribe::getApplyId, bo.getApplyId())
+                .eq(UserMockSubscribe::getMockMajorSubjectId,bo.getMockMajorSubjectId()));
         if (ObjectUtils.isNull(userMockSubscribe)){
             throw new CustomException("我的模考信息获取失败");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -975,6 +975,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 update.setStatus(2);
                 update.setUpdateTime(DateUtils.getNowTime());
                 examApplyMapper.updateById(update);
+                ExamApplyQueryBo applyQueryBo = new ExamApplyQueryBo();
+                applyQueryBo.setApplyId(examApplyVo.getApplyId());
+                wisdomSyncApplyUserInfo(applyQueryBo);
             }
         }
         ExamBeforeQueryBo examBeforeQueryBo = new ExamBeforeQueryBo();

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -219,6 +219,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="goodsTypes != null and goodsTypes.size()!=0 ">
+            AND g.goods_type  in
+            <foreach collection="goodsTypes" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="goodsType != null and goodsType != ''">
             AND g.goods_type = #{goodsType}
         </if>