merge

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

@@ -715,6 +715,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (Validator.isNotEmpty(bo.getShareCode())) {
             inertData.setShareCode(bo.getShareCode());
         }
+        if (Validator.isNotEmpty(bo.getShareActivityCode())) {
+            inertData.setShareActivityCode(bo.getShareActivityCode());
+        }
         if(!save(inertData)){
             throw new CustomException("注册失败");
         }
@@ -971,6 +974,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(user)){
             throw new CustomException("该手机号未注册");
         }
+        //如果活动分销码变动
+        if (StringUtils.isNotBlank(bo.getShareActivityCode())){
+            user.setShareActivityCode(bo.getShareActivityCode());
+            updateById(user);
+        }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
         Map<String,Object> map = new HashMap<>();
@@ -1049,6 +1057,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         {
             throw new BaseException("密码错误");
         }
+        //如果活动分销码变动
+        if (StringUtils.isNotBlank(bo.getShareActivityCode())){
+            user.setShareActivityCode(bo.getShareActivityCode());
+            updateById(user);
+        }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
         Map<String,Object> map = new HashMap<>();

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

@@ -242,6 +242,11 @@ public class WxLoginService implements IWxLoginService {
         if (user == null) {
             throw new CustomException("登录错误");
         }
+        //如果活动分销码变动
+        if (StringUtils.isNotBlank(loginBody.getShareActivityCode())){
+            user.setShareActivityCode(loginBody.getShareActivityCode());
+            iUserService.updateById(user);
+        }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
         Map<String, Object> map = new HashMap<>();
@@ -272,6 +277,11 @@ public class WxLoginService implements IWxLoginService {
         if (user == null) {
             throw new CustomException("登录错误");
         }
+        //如果活动分销码变动
+        if (StringUtils.isNotBlank(loginBody.getShareActivityCode())){
+            user.setShareActivityCode(loginBody.getShareActivityCode());
+            iUserService.updateById(user);
+        }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
         Map<String, String> map = new HashMap<>();

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -11,6 +12,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.bo.CourseAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
+import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.domain.CourseMenu;
 import com.zhongzheng.modules.course.domain.CourseMenuExam;
 import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
@@ -271,6 +273,12 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         List<CourseUserMenuVo> courseMenuVos = baseMapper.getGoodsMenuList(bo);
         if (bo.getUserId() != null) {
             for (CourseUserMenuVo courseMenuVo : courseMenuVos) {
+                if (ObjectUtils.isNotNull(courseMenuVo.getCourseId())){
+                    Course course = iCourseService.getById(courseMenuVo.getCourseId());
+                    courseMenuVo.setCourseName(course.getCourseName());
+                }else {
+                    courseMenuVo.setCourseName(courseMenuVo.getMenuName());
+                }
                 //为节的时候查询重修情况，和是否已学习
                 if (courseMenuVo.getType().equals(3)) {
                     Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());

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

@@ -52,6 +52,8 @@ public class CourseUserMenuVo {
 	private Integer status;
 	@ApiModelProperty("目录名称")
 	private String menuName;
+	@ApiModelProperty("课程名称")
+	private String courseName;
 	/** 节时长(分钟) */
 	@Excel(name = "节时长(分钟)")
 	@ApiModelProperty("节时长(分钟)")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecTemplateServiceImpl.java

@@ -92,13 +92,16 @@ public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateM
                             priceVo.setSpecAttrIds(x.getSpecAttributeIds());
                             priceVo.setSpecialGoods(0);
                             //商品业务类型
-                            CourseEducationType type = courseEducationTypeService.getById(goods.getEducationTypeId());
+//                            CourseEducationType type = courseEducationTypeService.getById(goods.getEducationTypeId());
                             CourseBusiness business = courseBusinessService.getById(goods.getBusinessId());
-                            if (ObjectUtils.isNotNull(type) && ObjectUtils.isNotNull(business)){
-                                String name = type.getEducationName() + business.getAliasName();
-                                if ("继续教育二级建造师".equals(name) || "继续教育二级造价师".equals(name)){
-                                    priceVo.setSpecialGoods(1);
-                                }
+//                            if (ObjectUtils.isNotNull(type) && ObjectUtils.isNotNull(business)){
+//                                String name = type.getEducationName() + business.getAliasName();
+//                                if ("继续教育二级建造师".equals(name) || "继续教育二级造价师".equals(name)){
+//                                    priceVo.setSpecialGoods(1);
+//                                }
+//                            }
+                            if (ObjectUtils.isNotNull(business) && ObjectUtils.isNotNull(business.getTemplateStatus())){
+                                priceVo.setSpecialGoods(business.getTemplateStatus() == 1? 1:0);
                             }
                             return priceVo;
                         }).collect(Collectors.toList());

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

@@ -341,4 +341,7 @@ public class GoodsVo {
 	@ApiModelProperty("显示排序字段")
 	private Long showSort;
 
+	@ApiModelProperty("是否二建商品：1是 0否")
+	private Integer specialGoods;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -21,7 +21,7 @@ import com.zhongzheng.common.annotation.Excel;
 @Accessors(chain = true)
 @TableName("class_grade")
 public class ClassGrade implements Serializable {
-    public static final Integer INIT_UPPER = 5;  //初始人数
+    public static final Integer INIT_UPPER = 300;  //初始人数
     public static final Integer INIT_UPPER2 = 1000000;  //初始人数
 
 private static final long serialVersionUID=1L;

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

@@ -775,10 +775,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 } catch (IOException e) {
                     throw new CustomException("同步请求错误"+e.getMessage());
                 }
-//                if((peopleNum+oldGradeNum)>=300){ //全系统平台二建班级人数不能超300
-//                    return false;
-//                }
-                if((peopleNum+oldGradeNum)>=5){ //测试使用
+                if((peopleNum+oldGradeNum)>=300){ //全系统平台二建班级人数不能超300
                     return false;
                 }
             }

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

@@ -16,6 +16,9 @@ public class OrderShareToOldVo {
     @ApiModelProperty("订单ID")
     private String sharecode;
 
+    @ApiModelProperty("活动分销码")
+    private String shareActivityCode;
+
     @ApiModelProperty("订单商品列表")
     private List<OrderShareGoodsVo> goodsList;
 

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

@@ -22,5 +22,6 @@ public class UserAppAccountLoginBo {
     @ApiModelProperty("密码")
     @NotNull(message = "密码不能为空")
     private String pwd;
-
+    @ApiModelProperty("活动分销码")
+    private String shareActivityCode;
 }

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

@@ -23,5 +23,7 @@ public class UserAppRegisterBo {
     private String code;
     @ApiModelProperty("分销码")
     private String shareCode;
+    @ApiModelProperty("活动分销码")
+    private String shareActivityCode;
 
 }

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

@@ -20,5 +20,6 @@ public class UserAppSmsLoginBo {
     private String code;
     @ApiModelProperty("用户ID")
     private Long userId;
-
+    @ApiModelProperty("活动分销码")
+    private String shareActivityCode;
 }

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

@@ -213,4 +213,6 @@ private static final long serialVersionUID=1L;
     private String job;
     /** 分销邀请码 */
     private String shareCode;
+    /** 分销活动邀请码 */
+    private String shareActivityCode;
 }

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

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

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

@@ -45,4 +45,7 @@ public class WxLoginBody {
     @ApiModelProperty("分销码")
     private String shareCode;
 
+    @ApiModelProperty("活动分销码")
+    private String shareActivityCode;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -81,6 +81,7 @@ import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.zhongzheng.modules.wx.service.IWxPayService;
 import com.zhongzheng.modules.wx.vo.WxPayVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -522,6 +523,9 @@ public class WxPayServiceImpl implements IWxPayService {
                 OrderShareToOldVo vo  = new OrderShareToOldVo();
                 vo.setOrderId(order.getOrderId());
                 vo.setSharecode(user.getShareCode());
+                if (StringUtils.isNotBlank(user.getShareActivityCode())){
+                    vo.setShareActivityCode(user.getShareActivityCode());
+                }
                 vo.setOrderprice(order.getPayPrice());
                 vo.setOrderno(order.getOrderSn());
                 vo.setRealname(user.getRealname());

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

@@ -240,7 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         FROM
             goods_course gc
-                LEFT JOIN  course_menu m ON gc.course_id = m.course_id
+                INNER JOIN course_menu m ON gc.course_id = m.course_id
                 LEFT JOIN course_module cm ON m.menu_id = cm.module_id
                 AND m.type = 1 and cm.status=1
                 LEFT JOIN course_chapter cc ON m.menu_id = cc.chapter_id

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

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="specTemplateId" column="spec_template_id"/>
         <result property="showStatus" column="show_status"/>
         <result property="showSort" column="show_sort"/>
+        <result property="specialGoods" column="special_goods"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>
@@ -467,6 +468,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cet.education_name,
             cpt.project_name,
             cb.business_name,
+            cb.template_status as special_goods,
             s.school_name,
             m.category_name,
             ot.type AS template_type,
@@ -543,6 +545,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cet.education_name,
             cpt.project_name,
             cb.business_name,
+            cb.template_status AS special_goods,
             s.school_name,
             m.category_name,
             ot.type AS template_type,

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -458,13 +458,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.realname like concat('%', #{realname}, '%')
         </if>
         <if test="telphone != null and telphone != ''">
-            AND u.telphone = #{telphone}
+            AND u.telphone like concat('%', #{telphone}, '%')
         </if>
         <if test="companyName != null and companyName != ''">
             AND u.company_name like concat('%', #{companyName}, '%')
         </if>
         <if test="idCard != null and idCard != ''">
-            AND u.id_card = #{idCard}
+            AND u.id_card like concat('%', #{idCard}, '%')
         </if>
         <if test="idCards != null and idCards.size() != 0">
             AND u.id_card IN