fix 更新人数

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

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.vo.ExportLiveGoodsVo;
 import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+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;
@@ -195,4 +196,14 @@ public class OrderGoodsController extends BaseController {
     public AjaxResult<List<LiveListChannelViewlogResponse.LiveChannelViewlog>> userSectionLiveLog(UserStudyRecordQueryBo bo) throws IOException, NoSuchAlgorithmException {
         return AjaxResult.success(iUserStudyRecordService.userSectionLiveLog(bo));
     }
+
+
+    @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);
+    }
 }

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

@@ -138,7 +138,7 @@ GoodsQueryBo extends BaseEntity {
 	private Long studyCount;
 
 	@ApiModelProperty("科目ID")
-	private Integer subjectId;
+	private Long subjectId;
 
 	@ApiModelProperty("用户ID")
 	private Long userId;
@@ -184,4 +184,5 @@ GoodsQueryBo extends BaseEntity {
 	/** 证书模板ID */
 	@ApiModelProperty("证书模板ID")
 	private Long certificateTpId;
+
 }

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

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 订单添加对象 order
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单用户购买状态对象")
+public class OrderSubjectUserBuyBo {
+
+    @NotNull(message = "身份证号不能为空")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+
+
+    @ApiModelProperty("科目ID")
+    private Long subjectId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsMapper.java

@@ -44,4 +44,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo);
 
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
+
+    List<OrderGoodsVo> listUserSubjectGoods(GoodsQueryBo bo);
 }

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

@@ -2,10 +2,7 @@ package com.zhongzheng.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
-import com.zhongzheng.modules.order.bo.OrderAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 
@@ -83,4 +80,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
     List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo);
 
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
+
+    List<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo);
 }

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

@@ -23,10 +23,7 @@ import com.zhongzheng.modules.grade.service.IClassGradeService;
 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.OrderAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+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;
@@ -37,7 +34,9 @@ import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
+import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,6 +87,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private IUserStudyRecordService iUserStudyRecordService;
 
+    @Autowired
+    private IUserService iUserService;
+
 
     @Override
     public OrderGoodsVo queryById(Long orderGoodsId) {
@@ -387,6 +389,20 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return list;
     }
 
+    @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("该身份证号码用户不存在");
+        }
+        GoodsQueryBo queryBo = new GoodsQueryBo();
+        queryBo.setSubjectId(bo.getSubjectId());
+        queryBo.setBusinessId(bo.getBusinessId());
+        queryBo.setUserId(user.getUserId());
+        return this.baseMapper.listUserSubjectGoods(queryBo);
+    }
+
     public boolean joinGrade(Long orderGoodsId, Long gradeId, Long userId, Long goodsId) {
         ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
         if (classGradeVo == null) {

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -408,4 +408,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY og.create_time DESC
     </select>
 
+
+    <select id="listUserSubjectGoods" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="OrderGoodsResultVo">
+        SELECT
+            og.goods_id,
+            og.grade_id,
+            og.order_sn
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+            o.user_id = #{userId}
+        AND og.`status` =1
+        and og.pay_status in (2,3,4)
+        AND og.refund_status in (0,3,1)
+          <if test="businessId != null and businessId != ''">
+          AND g.business_id = #{businessId}
+          </if>
+        <if test="subjectId != null and subjectId != ''">
+          AND FIND_IN_SET(#{subjectId},g.subject_ids)
+        </if>
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -373,7 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getConsoleInfoUpdateNum" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultType="Integer">
         SELECT
-        count( DISTINCT o.user_id )
+        count( DISTINCT uu.id )
         FROM
         `order` o
         LEFT JOIN order_goods og ON o.order_sn = og.order_sn