merge

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

@@ -50,7 +50,7 @@ public class OrderBusinessConfigController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<OrderBusinessConfigVo> list(OrderBusinessConfigQueryBo bo) {
         startPage();
-        List<OrderBusinessConfigVo> list = iOrderBusinessConfigService.queryList(bo);
+        List<OrderBusinessConfigVo> list = iOrderBusinessConfigService.getList(bo);
         return getDataTable(list);
     }
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -57,4 +57,14 @@ public class PolyvVideoController extends BaseController {
         map.put("uid","egsxlptzdq");
         return AjaxResult.success(map);
     }
+
+    @ApiOperation("获取保利威PC视频播放凭证")
+    @PreAuthorize("@ss.hasPermi('modules.polyv:video:query')")
+    @GetMapping("/sign/pc/{vid}")
+    public AjaxResult<String> getPlayPcSign(@PathVariable("vid") String vid) throws Exception {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        String viewerId = String.valueOf(loginUser.getUser().getUserId());
+        String token = iPolyvVideoService.polyvbPcSignRequest(vid,viewerId);
+        return AjaxResult.success("成功",token);
+    }
 }

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

@@ -712,6 +712,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         inertData.setCreateTime(DateUtils.getNowTime());
         inertData.setUpdateTime(DateUtils.getNowTime());
         inertData.setPassword(SecurityUtils.encryptPassword(bo.getPwd()));
+        if (Validator.isNotEmpty(bo.getShareCode())) {
+            inertData.setShareCode(bo.getShareCode());
+        }
         if(!save(inertData)){
             throw new CustomException("注册失败");
         }

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

@@ -279,7 +279,7 @@ public class WxLoginService implements IWxLoginService {
      * @param tel
      * @return
      */
-    public Boolean register_small(String openId, String unionId, String tel, String inviteCode) {
+    public Boolean register_small(String openId, String unionId, String tel, String inviteCode, String shareCode) {
         User bo = new User();
         bo.setOpenId(openId);
         bo.setUnionId(unionId);
@@ -305,6 +305,9 @@ public class WxLoginService implements IWxLoginService {
                 bo.setInviteUserAccount(inviteCode);
             }
         }
+        if (Validator.isNotEmpty(shareCode)) {
+            bo.setShareCode(shareCode);
+        }
         if (iUserService.save(bo)) {
             iSmsService.sendPwdSms(bo.getTelphone(), pwd);
         }
@@ -368,7 +371,7 @@ public class WxLoginService implements IWxLoginService {
             }
         }
         if (user == null) {
-            if (!register_small(openId, unionId, phoneNumber, loginBody.getInviteCode())) {
+            if (!register_small(openId, unionId, phoneNumber, loginBody.getInviteCode(),loginBody.getShareCode())) {
                 throw new CustomException("注册失败");
             }
             user = iUserService.getOne(new LambdaQueryWrapper<User>()

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -727,8 +727,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     }
                 }
             }
+            String tempTxt = "";
             for(QuestionImportContent vo : question.getQuestionList()){
-                if(Validator.isNotEmpty(vo.getContent())){
+                if(Validator.isNotEmpty(vo.getContent())&&!tempTxt.equals(vo.getContent())){
+                    tempTxt = vo.getContent();
                     type = findType(vo.getType());
                     if(isFirst){
                         isFirst = false;
@@ -818,10 +820,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         List<QuestionChildAddBo> optionsList = new ArrayList<>(); //题目选项
         List<Long> answerList = new ArrayList<>(); //答案选项
         Long j = 1L;
+        String tempTxt = list.get(startIndex).getContent();
         for(int i = startIndex;i<list.size();i++){
             QuestionImportContent entity = list.get(i);
             if(Validator.isNotEmpty(entity.getContent())&&i>startIndex){
-                break;
+                if(!tempTxt.equals(entity.getContent())){
+                    break;
+                }
             }
             if(Validator.isEmpty(entity.getOption())){
                 continue;

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

@@ -63,7 +63,7 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
 
     @Override
     public List<CourseBusinessVo> queryList(CourseBusinessQueryBo bo) {
-        List<CourseBusinessVo> vo = baseMapper.queryList(bo).stream().collect(Collectors.toList());
+        List<CourseBusinessVo> vo = entity2Vo(baseMapper.queryList(bo));
         if (CollectionUtils.isEmpty(vo)){
             return new ArrayList<>();
         }
@@ -76,7 +76,7 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
                 item.setTopicId(courseTopic.getTopicId());
             }
         });
-        return entity2Vo(vo);
+        return vo;
     }
 
     /**

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

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.domain.OrderBusinessConfig;
+import com.zhongzheng.modules.order.vo.OrderBusinessConfigVo;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+
+import java.util.List;
 
 /**
  * 录单配置Mapper接口
@@ -10,5 +16,5 @@ import com.zhongzheng.modules.order.domain.OrderBusinessConfig;
  * @date 2022-04-01
  */
 public interface OrderBusinessConfigMapper extends BaseMapper<OrderBusinessConfig> {
-
+    List<OrderBusinessConfigVo> getList(OrderBusinessConfigQueryBo bo);
 }

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

@@ -28,6 +28,8 @@ public interface IOrderBusinessConfigService extends IService<OrderBusinessConfi
 	 */
 	List<OrderBusinessConfigVo> queryList(OrderBusinessConfigQueryBo bo);
 
+	List<OrderBusinessConfigVo> getList(OrderBusinessConfigQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入录单配置
 	 * @param bo 录单配置新增业务对象

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

@@ -42,6 +42,7 @@ public interface IOrderService extends IService<Order> {
 
 	List<OrderUserCheckBuyBo> userCheckBuyList(List<OrderUserCheckBuyBo> list);
 
+
 	OrderGoodsVo getHaveBuyGoodsNotExpired(Long goodsId, Long userId);
 
 	/**

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

@@ -48,6 +48,11 @@ public class OrderBusinessConfigServiceImpl extends ServiceImpl<OrderBusinessCon
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<OrderBusinessConfigVo> getList(OrderBusinessConfigQueryBo bo) {
+        return this.baseMapper.getList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -340,6 +340,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return list;
     }
 
+
     /**
      * 实体类转化成视图对象
      *

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

@@ -33,6 +33,10 @@ public class OrderBusinessConfigGoodsVo {
 	@Excel(name = "科目ID")
 	@ApiModelProperty("科目ID")
 	private Long subjectId;
+	/** 科目名称 */
+	@Excel(name = "科目名称")
+	@ApiModelProperty("科目名称")
+	private String subjectName;
 	/** 商品ID ,拼接 */
 	@Excel(name = "商品ID ,拼接")
 	@ApiModelProperty("商品ID ,拼接")

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

@@ -36,4 +36,8 @@ public class OrderBusinessConfigVo {
 	@Excel(name = "状态 1有效 0无效")
 	@ApiModelProperty("状态 1有效 0无效")
 	private Integer status;
+	/** 业务层次别名 */
+	@Excel(name = "业务层次别名")
+	@ApiModelProperty("业务层次别名")
+	private String aliasName;
 }

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

@@ -313,5 +313,8 @@ public class OrderGoodsVo {
 	@Excel(name = "考试列表")
 	@ApiModelProperty("考试列表")
 	private List<ExamApplyGoodsVo> examApplyGoodsList;
+	@Excel(name = "用户剩余学习次数")
+	@ApiModelProperty("用户剩余学习次数")
+	private Long userStudyCount;
 
 }

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

@@ -151,4 +151,8 @@ public class UserAddBo {
     /** 工作岗位 */
     @ApiModelProperty("工作岗位")
     private String job;
+
+    /** 分销邀请码 */
+    @ApiModelProperty("分销邀请码")
+    private String shareCode;
 }

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

@@ -21,5 +21,7 @@ public class UserAppRegisterBo {
     private String pwd;
     @ApiModelProperty("验证码")
     private String code;
+    @ApiModelProperty("分销码")
+    private String shareCode;
 
 }

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

@@ -191,4 +191,8 @@ public class UserEditBo {
     /** 工作岗位 */
     @ApiModelProperty("工作岗位")
     private String job;
+
+    /** 分销邀请码 */
+    @ApiModelProperty("分销邀请码")
+    private String shareCode;
 }

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

@@ -211,4 +211,6 @@ private static final long serialVersionUID=1L;
     private Long lastStudyTime;
     /** 工作岗位 */
     private String job;
+    /** 分销邀请码 */
+    private String shareCode;
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
@@ -133,6 +134,9 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long insertByAddBo(UserBankRecordAddBo bo) {
+        if(Validator.isEmpty(bo.getGradeId())){
+            throw new CustomException("参数缺失");
+        }
         UserBankRecord add = BeanUtil.toBean(bo, UserBankRecord.class);
         validEntityBeforeSave(add);
         add.setStatus(1);

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

@@ -275,6 +275,11 @@ public class UserVo {
 
 	private String keyValue;
 
+	/** 分销邀请码 */
+	@Excel(name = "分销邀请码")
+	@ApiModelProperty("分销邀请码")
+	private String inviteCode;
+
 	public void setNull(){
 		this.setOpenId(null);
 		this.setIdCardImg1(null);

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/bo/WxLoginBody.java

@@ -42,5 +42,7 @@ public class WxLoginBody {
 
     private String nextOpenid;
 
+    @ApiModelProperty("分销码")
+    private String shareCode;
 
 }

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

@@ -314,7 +314,7 @@
                 LEFT JOIN `order` o on o.order_sn = og.order_sn
         WHERE
             1 = 1
-          AND g.goods_type in (1,2)
+          AND g.goods_type in (2)
           AND o.user_id=#{userId}
           AND og.`status` =1
           and og.pay_status in (2,3,4)

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

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="configId" column="config_id"/>
         <result property="subjectId" column="subject_id"/>
+        <result property="subjectName" column="subject_name"/>
         <result property="goodsIds" column="goods_ids"/>
         <result property="status" column="status"/>
         <collection property="goodsList" column="goods_ids" select="findGoodsList"/>
@@ -54,10 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigGoodsQueryBo" resultMap="OrderBusinessConfigGoodsVoResult">
         SELECT
-            bcg.*
+            bcg.*,
+            cs.subject_name
         FROM
             order_business_config_goods bcg
-
+                LEFT JOIN course_subject cs on bcg.subject_id = cs.id
         WHERE
             bcg.config_id = #{configId}
 

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

@@ -13,5 +13,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.order.vo.OrderBusinessConfigVo" id="OrderBusinessConfigVoResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="configName" column="config_name"/>
+        <result property="aliasName" column="alias_name"/>
+    </resultMap>
 
+    <select id="getList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">
+        SELECT
+        obc.*,
+        cb.alias_name
+        FROM
+        order_business_config obc
+        LEFT JOIN course_business cb ON obc.business_id = cb.id
+        WHERE
+        obc.`status` = 1
+        <if test="businessId != null and businessId != ''">
+            and obc.business_id = #{businessId}
+        </if>
+    </select>
 </mapper>

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

@@ -99,6 +99,7 @@
         <result property="subApplySiteExamTime" column="sub_apply_site_exam_time"/>
         <result property="subscribeId" column="subscribe_id"/>
         <result property="gradeId" column="grade_id"/>
+        <result property="userStudyCount" column="user_study_count"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo"
@@ -470,7 +471,8 @@
         us.subscribe_id,
         us.apply_site_start_time as sub_apply_site_start_time,
         us.apply_site_end_time as sub_apply_site_end_time,
-        us.apply_site_exam_time as sub_apply_site_exam_time
+        us.apply_site_exam_time as sub_apply_site_exam_time,
+        og.study_count as user_study_count
         FROM
         order_goods og
         LEFT JOIN goods g on g.goods_id =og.goods_id

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

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studyFromPlat" column="study_from_plat"/>
         <result property="lastStudyTime" column="last_study_time"/>
         <result property="job" column="job"/>
+        <result property="shareCode" column="share_code"/>
     </resultMap>