fix 直播

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.course.vo.CourseSectionImport;
 import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportVo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.vo.UserIdCardBatchVo;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserSubscribeExport;
 import com.zhongzheng.modules.user.vo.UserVo;
@@ -106,6 +107,7 @@ public class UserController extends BaseController {
     @Log(title = "客户端用户", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Long> add(@RequestBody UserSystemRegisterBo bo) {
+        bo.setRegisterPlat("3");
         return AjaxResult.success(iUserService.systemRegisterUser(bo));
     }
 
@@ -168,4 +170,14 @@ public class UserController extends BaseController {
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         return util.exportEasyExcel(util.exportEasyData(errorList), "导出失败导入用户"+timeStr);
     }
+
+
+    @ApiOperation("批量获取用户ID")
+    @Log(title = "批量获取用户ID", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:section:import')")
+    @PostMapping("/batchUserId")
+    public AjaxResult<List<UserIdCardBatchVo>> batchUserId(@RequestBody List<UserIdCardAddBo> list)
+    {
+        return AjaxResult.success(iUserService.batchUserId(list));
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -558,7 +558,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         inertData.setIdCard(bo.getIdCard());
         inertData.setRealname(bo.getRealname());
         inertData.setStatus(1);
-        inertData.setRegisterPlat("3");
+        inertData.setRegisterPlat(bo.getRegisterPlat());
         inertData.setAvatar(Constants.DEFAULT_AVATAR);
         inertData.setLastLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
         inertData.setLastLoginTime(DateUtils.getNowTime());
@@ -740,6 +740,42 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return true;
     }
 
+    @Override
+    public List<UserIdCardBatchVo> batchUserId(List<UserIdCardAddBo> list) {
+        List<UserIdCardBatchVo> list1 = new ArrayList<>();
+        for(UserIdCardAddBo bo : list){
+            if(Validator.isEmpty(bo.getIdCard())){
+                throw new CustomException("用户身份证缺失");
+            }
+            User user1 = getOne(new LambdaQueryWrapper<User>()
+                    .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+            //身份证号存在
+            if(Validator.isNotEmpty(user1)){
+                UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
+                user.setUserId(user1.getUserId());
+                list1.add(user);
+                continue;
+            }else{
+                if(Validator.isEmpty(bo.getTelphone())){
+                    throw new CustomException("用户手机号码缺失");
+                }
+                if(Validator.isEmpty(bo.getRealname())){
+                    throw new CustomException("用户姓名缺失");
+                }
+                UserSystemRegisterBo registerBo = BeanUtil.toBean(bo, UserSystemRegisterBo.class);
+                Long userId = systemRegisterUser(registerBo);
+                if(userId.longValue()>0){
+                    UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
+                    user.setUserId(userId);
+                    list1.add(user);
+                    continue;
+                }
+            }
+
+        }
+        return list1;
+    }
+
     private Long findSubjectId(String subject){
         if(subject!=null){
             String key = "SUB_"+subject;

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

@@ -157,4 +157,7 @@ public class GoodsAddBo {
     /** 前培次数 */
     @ApiModelProperty("前培次数")
     private Long doNumber;
+    /** 讲师ID */
+    @ApiModelProperty("讲师ID")
+    private Long teacherId;
 }

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

@@ -186,4 +186,7 @@ public class GoodsEditBo {
     /** 前培次数 */
     @ApiModelProperty("前培次数")
     private Long doNumber;
+    /** 讲师ID */
+    @ApiModelProperty("讲师ID")
+    private Long teacherId;
 }

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

@@ -166,4 +166,7 @@ GoodsQueryBo extends BaseEntity {
 	private Long doNumber;
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	/** 讲师ID */
+	@ApiModelProperty("讲师ID")
+	private Long teacherId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -126,4 +126,6 @@ private static final long serialVersionUID=1L;
     private Long examNumber;
     /** 前培次数 */
     private Long doNumber;
+    /** 讲师ID */
+    private Long teacherId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -274,4 +274,8 @@ public class GoodsVo {
 	private Long totalExamNum;
 	@ApiModelProperty("订单")
 	private Long orderNum;
+	/** 讲师ID */
+	@Excel(name = "讲师ID")
+	@ApiModelProperty("讲师ID")
+	private Long teacherId;
 }

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

@@ -66,7 +66,7 @@ public class OrderAddBo {
     @ApiModelProperty("收费方式 1即刻收费 2稍后收费")
     private Integer chargingType;
     /** 订单来源 1业务员录单 */
-    @ApiModelProperty("订单来源 1业务员录单")
+    @ApiModelProperty("订单来源 1业务员普通单 2祥粤云学堂小程序 3祥粤云学堂网站 4祥粤e管证小程序 5业务员录单 6业务系统下单 ")
     private Integer orderFrom;
     @ApiModelProperty("商品列表")
     private List<OrderGoodsAddBo> goodsList;

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

@@ -375,6 +375,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
+            if (goods.getGoodsType() == 6) {
+                //直播商品
+                if(Validator.isNotEmpty(oldOrderGoodsId)&&oldOrderGoodsId.longValue()>0){
+                    throw new CustomException("直播商品不允许复购");
+                }
+            }
             //商品0元加入免费商品列表
             if (orderGoods.getGoodsPrice().compareTo(BigDecimal.ZERO) == 0) {
                 freeList.add(orderGoods);
@@ -508,6 +514,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
+            if (goods.getGoodsType() == 6) {
+                //直播商品
+                if(Validator.isNotEmpty(oldOrderGoodsId)&&oldOrderGoodsId.longValue()>0){
+                    throw new CustomException("直播商品不允许复购");
+                }
+            }
             //商品0元或已收费加入收费商品列表
             if (g.getGoodsRealPrice().compareTo(BigDecimal.ZERO) == 0) {
                 //免费的
@@ -681,6 +693,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
+            if (goods.getGoodsType() == 6) {
+                //直播商品
+                if(Validator.isNotEmpty(oldOrderGoodsId)&&oldOrderGoodsId.longValue()>0){
+                    throw new CustomException("直播商品不允许复购");
+                }
+            }
             iShoppingCartService.deleteByGoodsId(g.getGoodsId(), bo.getUserId());
             //商品0元加入免费商品列表
             if (orderGoods.getGoodsPrice().compareTo(BigDecimal.ZERO) == 0) {
@@ -825,6 +843,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
+            if (goods.getGoodsType() == 6) {
+                //直播商品
+                if(Validator.isNotEmpty(oldOrderGoodsId)&&oldOrderGoodsId.longValue()>0){
+                    throw new CustomException("直播商品不允许复购");
+                }
+            }
             iShoppingCartService.deleteByGoodsId(g.getGoodsId(), bo.getUserId());
             //商品0元加入免费商品列表
             if (orderGoods.getGoodsPrice().compareTo(BigDecimal.ZERO) == 0) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserIdCardAddBo.java

@@ -0,0 +1,29 @@
+package com.zhongzheng.modules.user.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 答疑添加对象 user_course_answer
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户信息添加对象")
+public class UserIdCardAddBo {
+    /** 身份证号 */
+    @Excel(name = "*学员身份证号码")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+    /** 手机号码 */
+    @Excel(name = "*手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+    /** 真实姓名 */
+    @ApiModelProperty("真实姓名")
+    private String realname;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSystemRegisterBo.java

@@ -22,5 +22,7 @@ public class UserSystemRegisterBo {
     /** 真实姓名 */
     @ApiModelProperty("真实姓名")
     private String realname;
+    /** 注册平台 1小程序 2网站 3后台 4老业务系统*/
+    private String registerPlat;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -99,7 +99,7 @@ private static final long serialVersionUID=1L;
 
     private String unionId;
 
-    /** 注册平台 1小程序 2网站*/
+    /** 注册平台 1小程序 2网站 3后台 4老业务系统*/
     private String registerPlat;
 
     private String lastLoginIp;
@@ -192,4 +192,7 @@ private static final long serialVersionUID=1L;
 
     /** 导入编号 */
     private String importNo;
+
+    @TableField(exist = false)
+    private Long goodsLiveNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -4,10 +4,7 @@ import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.vo.RanKingUser;
-import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
-import com.zhongzheng.modules.user.vo.UserSubscribeImport;
-import com.zhongzheng.modules.user.vo.UserVo;
+import com.zhongzheng.modules.user.vo.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.math.BigDecimal;
@@ -109,5 +106,5 @@ public interface IUserService extends IService<User> {
 
 	Boolean updatePwd(UserAppUpdatePwdBo bo);
 
-
+	List<UserIdCardBatchVo> batchUserId(List<UserIdCardAddBo> list);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserIdCardBatchVo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.goods.vo.GoodsUserVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class UserIdCardBatchVo {
+	private static final long serialVersionUID = 1L;
+	/** 身份证号 */
+	@Excel(name = "*学员身份证号码")
+	@ApiModelProperty("身份证号")
+	private String idCard;
+	/** 手机号码 */
+	@Excel(name = "*手机号码")
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 用户id */
+	@ApiModelProperty("用户id")
+	private Long userId;
+}

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -481,4 +481,51 @@
         </if>
         ORDER BY og.create_time DESC
     </select>
+
+    <select id="listLiveGoodsList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsUserQuestionVo">
+        SELECT
+        g.*,
+        cet.education_name,
+        cpt.project_name,
+        cb.business_name,
+        o.user_id,
+        o.order_sn,
+        og.create_time as order_create_time,
+        og.service_start_time,
+        og.service_end_time,
+        og.order_goods_id,
+        u.realname,
+        u.id_card,
+        u.user_id
+        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
+        LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN `user` u ON u.user_id = o.user_id
+        WHERE
+        1 = 1
+        <if test="goodsType != null and goodsType != ''">
+            AND g.goods_type = #{goodsType}
+        </if>
+        AND og.pay_status IN ( 2, 3, 4 )
+        AND og.refund_status IN (0,3,1)
+        <if test="goodsId != null and goodsId != ''">
+            AND og.goods_id = #{goodsId}
+        </if>
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="majorId != null and majorId != ''">
+            AND g.major_id = #{majorId}
+        </if>
+        <if test="searchKey != null and searchKey != ''">
+            and (g.goods_name like concat('%', #{searchKey}, '%') or g.code like concat('%', #{searchKey}, '%') or u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%'))
+        </if>
+        ORDER BY og.create_time DESC
+    </select>
 </mapper>

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

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sectionMaxNum" column="section_max_num"/>
         <result property="examNumber" column="exam_number"/>
         <result property="doNumber" column="do_number"/>
+        <result property="teacherId" column="teacher_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -111,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examNumber" column="exam_number"/>
         <result property="doNumber" column="do_number"/>
         <result property="orderNum" column="order_num"/>
+        <result property="teacherId" column="teacher_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsCourseNum" column="goods_course_num"/>
         <result property="goodsBankNum" column="goods_bank_num"/>
         <result property="importNo" column="import_no"/>
+        <result property="goodsLiveNum" column="goods_live_num"/>
     </resultMap>
 
 
@@ -140,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT DISTINCT
         u.*
         <if test="getOrderNum != null and getOrderNum == 1" >
-        ,ou.goods_course_num,ou.goods_bank_num
+        ,ou.goods_course_num,ou.goods_bank_num,ou.goods_live_num
         </if>
         FROM
         `user` u
@@ -149,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT
             sum( CASE WHEN g.goods_type = 1 THEN 1 ELSE 0 END ) AS goods_course_num,
             sum( CASE WHEN g.goods_type = 2 THEN 1 ELSE 0 END ) AS goods_bank_num,
+            sum( CASE WHEN g.goods_type = 6 THEN 1 ELSE 0 END ) AS goods_live_num,
             o.user_id
             FROM
             `order` o