fux 虚拟课程

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsController.java

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.order.bo.OrderSubjectUserBuyBo;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.vo.OrderGoodsLiveExportVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
@@ -201,9 +202,7 @@ public class OrderGoodsController extends BaseController {
     @ApiOperation("业务层次，科目查询用户的购买商品列表")
     @PreAuthorize("@ss.hasPermi('system:invoice:list')")
     @GetMapping("/listUserSubjectGoods")
-    public TableDataInfo<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
-        startPage();
-        List<OrderGoodsVo> list = iOrderGoodsService.listUserSubjectGoods(bo);
-        return getDataTable(list);
+    public AjaxResult<List<OrderUserGoodsVo>> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
+        return AjaxResult.success(iOrderGoodsService.listUserSubjectGoods(bo));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseAddBo.java

@@ -75,5 +75,8 @@ public class CourseAddBo {
     /** 项目id */
     @ApiModelProperty("项目id")
     private Long projectId;
+    /** 1显示 0隐藏 */
+    @ApiModelProperty("1显示 0隐藏")
+    private Integer courseShow;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEditBo.java

@@ -93,5 +93,7 @@ public class CourseEditBo {
     /** 项目id */
     @ApiModelProperty("项目id")
     private Long projectId;
-
+    /** 1显示 0隐藏 */
+    @ApiModelProperty("1显示 0隐藏")
+    private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -67,4 +67,6 @@ private static final long serialVersionUID=1L;
     private Long subjectId;
     /** 项目id */
     private Long projectId;
+    /** 1显示 0隐藏 */
+    private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -146,6 +146,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         addBo.setEducationTypeId(goodsVo.getEducationTypeId());
         addBo.setProjectId(goodsVo.getProjectId());
         addBo.setBusinessId(goodsVo.getBusinessId());
+        addBo.setCourseShow(0);//隐藏课程
         Long courseId = iCourseService.insertByAddBo(addBo);
         GoodsCourseAddBo courseAddBo = new GoodsCourseAddBo();
         courseAddBo.setCourseId(courseId);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseVo.java

@@ -115,4 +115,5 @@ public class CourseVo {
 	/** 1显示 0隐藏 */
 	@ApiModelProperty("1显示 0隐藏")
 	private Integer courseShow;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderSubjectUserBuyBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 订单添加对象 order
@@ -18,7 +19,7 @@ public class OrderSubjectUserBuyBo {
 
     @NotNull(message = "身份证号不能为空")
     @ApiModelProperty("身份证号")
-    private String idCard;
+    private List<String> idCard;
 
 
     @ApiModelProperty("业务层次ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -81,5 +82,5 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
 
-    List<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo);
+    List<OrderUserGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -8,12 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.bank.mapper.QuestionMapper;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
-import com.zhongzheng.modules.course.domain.CourseModule;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
-import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -25,14 +22,13 @@ import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.grade.vo.ClassPeriodVo;
 import com.zhongzheng.modules.order.bo.*;
-import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.mapper.OrderGoodsMapper;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderListVo;
-import com.zhongzheng.modules.order.vo.OrderVo;
+import com.zhongzheng.modules.order.vo.OrderUserGoodsVo;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.User;
@@ -40,7 +36,6 @@ import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -401,17 +396,25 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     }
 
     @Override
-    public List<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
-        User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
-        if(Validator.isNull(user)){
-            throw new CustomException("该身份证号码用户不存在");
+    public List<OrderUserGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
+        List<OrderUserGoodsVo> allList = new ArrayList<>();
+        for(String idCard : bo.getIdCard()){
+            User user = iUserService.getOne(new LambdaQueryWrapper<User>()
+                    .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+            if(Validator.isNull(user)){
+                throw new CustomException("该身份证号码用户不存在");
+            }
+            GoodsQueryBo queryBo = new GoodsQueryBo();
+            queryBo.setSubjectId(bo.getSubjectId());
+            queryBo.setBusinessId(bo.getBusinessId());
+            queryBo.setUserId(user.getUserId());
+            List<OrderGoodsVo> list = this.baseMapper.listUserSubjectGoods(queryBo);
+            OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
+            goodsBo.setIdCard(idCard);
+            goodsBo.setGoodsList(list);
+            allList.add(goodsBo);
         }
-        GoodsQueryBo queryBo = new GoodsQueryBo();
-        queryBo.setSubjectId(bo.getSubjectId());
-        queryBo.setBusinessId(bo.getBusinessId());
-        queryBo.setUserId(user.getUserId());
-        return this.baseMapper.listUserSubjectGoods(queryBo);
+        return allList;
     }
 
     public boolean joinGrade(Long orderGoodsId, Long gradeId, Long userId, Long goodsId) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderUserGoodsVo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 订单添加对象 order
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单用户购买状态对象")
+public class OrderUserGoodsVo {
+
+    @NotNull(message = "身份证号不能为空")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+
+    @ApiModelProperty("商品列表")
+    private List<OrderGoodsVo> goodsList;
+
+
+
+}

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -25,6 +25,7 @@
         <result property="code" column="code"/>
         <result property="subjectId" column="subject_id"/>
         <result property="projectId" column="project_id"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseVo" id="CourseResultVo">
@@ -54,6 +55,7 @@
         <result property="schoolName" column="school_name"/>
         <result property="categoryName" column="category_name"/>
         <result property="subjectName" column="subject_name"/>
+        <result property="courseShow" column="course_show"/>
         <collection property="goodsList" column="course_id" select="findGoodsList"/>
     </resultMap>