he2802 2 роки тому
батько
коміт
8204ec81eb

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ShoppingCartEditBo.java

@@ -43,4 +43,5 @@ public class ShoppingCartEditBo {
 
     private List<Long> ids;
 
+
 }

+ 12 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ShoppingCartServiceImpl.java

@@ -24,6 +24,9 @@ import com.zhongzheng.modules.base.vo.ShoppingCartVo;
 import com.zhongzheng.modules.course.domain.CourseChapter;
 import com.zhongzheng.modules.distribution.domain.DistributionActivity;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
+import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,6 +53,9 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, Sho
     @Autowired
     private IActivityGoodsPriceService iActivityGoodsPriceService;
 
+    @Autowired
+    private IClassGradeService iClassGradeService;
+
     @Override
     public ShoppingCartVo queryById(Long id){
         ShoppingCart db = this.baseMapper.selectById(id);
@@ -84,6 +90,12 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, Sho
                     item.setDistributionStatus(1);
                 }
             }
+            ClassGradeQueryBo gradeQueryBo = new ClassGradeQueryBo();
+            gradeQueryBo.setGoodsId(item.getGoodsId());
+            gradeQueryBo.setPastDue(1L);
+            List<ClassGradeVo> gradeList = iClassGradeService.getList(gradeQueryBo);
+            item.setGradeList(gradeList);
+
         });
         return shoppingCartVos;
     }

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/ShoppingCartVo.java

@@ -1,12 +1,13 @@
 package com.zhongzheng.modules.base.vo;
 
 import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-
+import java.util.List;
 
 
 /**
@@ -67,4 +68,6 @@ public class ShoppingCartVo {
 	private Integer distributionStatus;
 	@ApiModelProperty("勾选状态 0无 1已勾选")
 	private Integer choiceStatus;
+	@ApiModelProperty("班级列表")
+	private List<ClassGradeVo> gradeList;
 }

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -22,6 +22,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
     Collection<ClassGradeVo> queryList(ClassGradeQueryBo bo);
 
+
     List<GoodsVo> queryGoodsList(Long classId);
 
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -28,6 +28,8 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	 */
 	List<ClassGradeVo> queryList(ClassGradeQueryBo bo);
 
+	List<ClassGradeVo> getList(ClassGradeQueryBo bo);
+
 	List<ClassGradeGoodsVo> listGoodsBatch(ClassGradeQueryBo bo);
 
 	/**

+ 9 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -193,6 +193,15 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return classGradeVos;
     }
 
+    @Override
+    public List<ClassGradeVo> getList(ClassGradeQueryBo bo) {
+        List<ClassGradeVo> classGradeVos = entity2Vo(baseMapper.queryList(bo));
+        if (CollectionUtils.isEmpty(classGradeVos)) {
+            return new ArrayList<>();
+        }
+        return classGradeVos;
+    }
+
     @Override
     public List<ClassGradeGoodsVo> listGoodsBatch(ClassGradeQueryBo bo) {
         return baseMapper.listGoodsBatch(bo);