submit:商品规格BUG修改

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

@@ -24,8 +24,10 @@ import com.zhongzheng.modules.course.service.ICourseSubjectService;
 import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
+import com.zhongzheng.modules.goods.domain.GoodsSpecTemplate;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeRelationService;
+import com.zhongzheng.modules.goods.service.IGoodsSpecTemplateService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,8 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     private IGoodsSpecAttributeRelationService goodsSpecAttributeRelationService;
     @Autowired
     private ICourseSubjectService iCourseSubjectService;
+    @Autowired
+    private IGoodsSpecTemplateService goodsSpecTemplateService;
 
 
     @Override
@@ -206,7 +210,10 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
         }
         page.getRecords().forEach(item -> {
             Goods goods = iGoodsService.getById(item.getGoodsId());
-            if (ObjectUtils.isNotNull(goods.getSpecTemplateId())){
+            if (ObjectUtils.isNotNull(goods.getSpecTemplateId()) &&
+                    goodsSpecTemplateService.count(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                    .eq(GoodsSpecTemplate::getSpecTemplateId,goods.getSpecTemplateId())
+                    .eq(GoodsSpecTemplate::getStatus,1)) > 0){
                 item.setSpecTemplateId(goods.getSpecTemplateId());
             }else {
                 List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -144,6 +144,23 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 vo.setTotalExamNum(totalNum);
             }
         }
+        list.forEach(goods -> {
+            if (ObjectUtils.isNotNull(goods.getSpecTemplateId()) &&
+                    goodsSpecTemplateService.count(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                            .eq(GoodsSpecTemplate::getSpecTemplateId,goods.getSpecTemplateId())
+                            .eq(GoodsSpecTemplate::getStatus,1)) > 0){
+                goods.setSpecTemplateId(goods.getSpecTemplateId());
+            }else {
+                List<GoodsSpecAttributeRelation> relationList = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                        .eq(GoodsSpecAttributeRelation::getGoodsId, goods.getGoodsId())
+                        .orderByAsc(GoodsSpecAttributeRelation::getCreateTime)
+                        .last("LIMIT 1"));
+                if (CollectionUtils.isNotEmpty(relationList)){
+                    GoodsSpecAttributeRelation relation = relationList.stream().findFirst().get();
+                    goods.setSpecTemplateId(relation.getSpecTemplateId());
+                }
+            }
+        });
         //继教二建统计学时
         if (Validator.isNotEmpty(bo.getChapterNum())) {
             list.forEach(goodsVo -> {
@@ -194,7 +211,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public GoodsVo selectDetail(Long goodsId) {
         GoodsVo goodsVo = baseMapper.selectDetail(goodsId);
-        if (ObjectUtils.isNotNull(goodsVo) && ObjectUtils.isNull(goodsVo.getSpecTemplateId())){
+        if (ObjectUtils.isNull(goodsVo.getSpecTemplateId()) ||
+                goodsSpecTemplateService.count(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                        .eq(GoodsSpecTemplate::getSpecTemplateId,goodsVo.getSpecTemplateId())
+                        .eq(GoodsSpecTemplate::getStatus,1)) < 1){
             //没有绑定规格模板
             //查询是否有绑定的模板
             List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService

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

@@ -629,6 +629,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         mockTimeVo.setEndTime(endTimeStr);
         mockTimeVo.setApplyId(bo.getApplyId());
         mockTimeVo.setExamTime(nowTime);
+        mockTimeVo.setMockActivity(apply.getMockActivity());
         return mockTimeVo;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockTimeVo.java

@@ -26,4 +26,7 @@ public class MockTimeVo {
 
     @ApiModelProperty("结束时间")
     private String endTime;
+
+    @ApiModelProperty("是否活动模考 0否 1是")
+    private Integer mockActivity;
 }

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml

@@ -41,15 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="knowledgeIds" column="knowledge_ids"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="code" column="code"/>
-        <result property="examId" column="exam_id"/>
-        <result property="goodsId" column="goods_id"/>
-        <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="examId" column="collect_exam_id"/>
+        <result property="goodsId" column="collect_goods_id"/>
+        <result property="orderGoodsId" column="collect_order_goods_id"/>
         <result property="collectQuestionId" column="collect_question_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo"  resultMap="QuestionResultVo">
         SELECT
-        DISTINCT q.*
+        DISTINCT q.*,
+        cq.question_id as collect_question_id,
+        cq.exam_id as collect_exam_id,
+        cq.goods_id as collect_goods_id,
+        cq.order_goods_id as collect_order_goods_id
         FROM
         collect_question cq
         LEFT JOIN question q ON cq.question_id = q.question_id