MERGE

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysUser.java

@@ -83,6 +83,7 @@ public class SysUser implements Serializable
     }
 
     /** 盐加密 */
+    @TableField(exist = false)
     private String salt;
 
     /** 帐号状态（1正常 0停用） */

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

@@ -6,7 +6,6 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,8 +15,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.UserStatus;
@@ -33,20 +30,11 @@ import com.zhongzheng.modules.collect.domain.CollectNote;
 import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
 import com.zhongzheng.modules.collect.mapper.CollectCourseMapper;
 import com.zhongzheng.modules.collect.mapper.CollectNoteMapper;
-import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
-import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.CourseSubject;
-import com.zhongzheng.modules.course.domain.MajorCategory;
-import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.service.ICourseSubjectService;
-import com.zhongzheng.modules.exam.domain.ExamKnowledge;
-import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
-import com.zhongzheng.modules.inform.domain.InformSysUser;
-import com.zhongzheng.modules.order.domain.OrderBillGoods;
-import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.*;
@@ -54,9 +42,7 @@ import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.mapper.UserMapper;
 import com.zhongzheng.modules.user.service.*;
 import com.zhongzheng.modules.user.vo.*;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -64,7 +50,6 @@ import org.springframework.util.CollectionUtils;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -640,23 +625,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(bo.getTel().length()!=11){
             throw new CustomException("手机号格式错误");
         }
-        /*if(bo.getIdCard()==null){
+        if(bo.getIdcard()==null){
             throw new CustomException("身份证不能为空");
-        }*/
-        /*if(bo.getIdCard().length()!=18){
+        }
+        if(bo.getIdcard().length()!=18){
             throw new CustomException("身份证格式错误");
         }
-        if(bo.getRealname()==null){
-            throw new CustomException("真实姓名不能为空");
-        }*/
+//        if(bo.getRealname()==null){
+//            throw new CustomException("真实姓名不能为空");
+//        }
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTel())).last("limit 1"));
         if(Validator.isNotNull(user)){
             throw new CustomException("该手机号已注册");
         }
-        if(Validator.isNotEmpty(bo.getIdCard())){
+        if(Validator.isNotEmpty(bo.getIdcard())){
             User user2 = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,EncryptHandler.encrypt(bo.getIdCard())).last("limit 1"));
+                    .eq(User::getIdCard,EncryptHandler.encrypt(bo.getIdcard())).last("limit 1"));
             if(Validator.isNotNull(user2)){
                 throw new CustomException("该身份证已被使用");
             }
@@ -669,7 +654,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
         inertData.setUserAccount(String.valueOf(idWorker.nextId()));
         inertData.setSex(1);
-        inertData.setIdCard(bo.getIdCard());
+        inertData.setIdCard(bo.getIdcard());
         inertData.setRealname(bo.getRealname());
         inertData.setStatus(1);
         inertData.setRegisterPlat(bo.getRegisterPlat());
@@ -679,7 +664,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         inertData.setLastLoginTime(DateUtils.getNowTime());
         inertData.setCreateTime(DateUtils.getNowTime());
         inertData.setUpdateTime(DateUtils.getNowTime());
-        String pwd =  ToolsUtils.getSmsCode(); // 随机密码
+//        String pwd =  ToolsUtils.getSmsCode(); // 随机密码
+        String pwd =  bo.getIdcard().substring(bo.getIdcard().length() - 6);
         inertData.setPassword(SecurityUtils.encryptPassword(pwd));
         if(!save(inertData)){
             throw new CustomException("注册失败");
@@ -690,6 +676,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Boolean registerUser(UserAppRegisterBo bo) {
+        if(StringUtils.isBlank(bo.getIdcard())){
+            throw new CustomException("身份证不能为空");
+        }
         if(bo.getTel()==null){
             throw new CustomException("手机号不能为空");
         }
@@ -712,8 +701,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isNotNull(user)){
             throw new CustomException("该手机号已注册");
         }
+        User userIdCard = getOne(new LambdaQueryWrapper<User>()
+                .eq(User::getIdCard,EncryptHandler.encrypt(bo.getIdcard())).last("limit 1"));
+        if(Validator.isNotNull(userIdCard)){
+            throw new CustomException("该身份证已注册");
+        }
         User inertData = new User();
         inertData.setTelphone(bo.getTel());
+        inertData.setIdCard(bo.getIdcard());
         //隐藏手机号作为初始昵称
         inertData.setNickname(TelPhoneUtils.hideTelPhone(bo.getTel()));
         //雪花算法产生账号ID
@@ -756,11 +751,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 errorList.add(itemImport);
                 continue;
             }
-           /* if(Validator.isEmpty(itemImport.getIdCard())){
+            if(Validator.isEmpty(itemImport.getIdCard())){
                 itemImport.setCause("身份证不能为空");
                 errorList.add(itemImport);
                 continue;
-            }*/
+            }
             if(Validator.isEmpty(itemImport.getRealname())){
                 itemImport.setCause("真实姓名不能为空");
                 errorList.add(itemImport);
@@ -833,7 +828,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             inertData.setLastLoginTime(DateUtils.getNowTime());
             inertData.setCreateTime(DateUtils.getNowTime());
             inertData.setUpdateTime(DateUtils.getNowTime());
-            String pwd =  ToolsUtils.getSmsCode(); // 随机密码
+//            String pwd =  ToolsUtils.getSmsCode(); // 随机密码
+//            inertData.setPassword(SecurityUtils.encryptPassword(pwd));
+            //初始密码（身份证后6位）
+            String idCard = itemImport.getIdCard();
+            String pwd =  idCard.substring(idCard.length() - 6); // 随机密码
             inertData.setPassword(SecurityUtils.encryptPassword(pwd));
             inertData.setImportNo(importNo); //设置导入编号 一个导入页面同时导入多次算一个编号
             if(!save(inertData)){
@@ -882,6 +881,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             if(Validator.isEmpty(bo.getTelphone())){
                 throw new CustomException("用户手机号码缺失");
             }
+            if(Validator.isEmpty(bo.getIdCard())){
+                throw new CustomException("用户身份证号码缺失");
+            }
             User user1 = getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getTelphone,EncryptHandler.encrypt(bo.getTelphone())).last("limit 1"));
             //手机号码存在

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

@@ -245,8 +245,11 @@ public class WxLoginService implements IWxLoginService {
     public Map<String, Object> login(WxLoginBody loginBody) {
         initData();
         User user = getWxUnionIdUser(loginBody);
-        if (user == null) {
-            throw new CustomException("登录错误");
+//        if (user == null) {
+//            throw new CustomException("登录错误");
+//        }
+        if (ObjectUtils.isNull(user)) {
+            throw new CustomException("新用户请先注册！",666);
         }
         //如果活动分销码变动
         if (StringUtils.isNotBlank(loginBody.getShareActivityCode())){
@@ -318,12 +321,13 @@ public class WxLoginService implements IWxLoginService {
      * @param tel
      * @return
      */
-    public Boolean register_small(String openId, String unionId, String tel, String inviteCode, String shareCode) {
+    public Boolean register_small(String openId, String unionId, String tel, String inviteCode, String shareCode,String idCard) {
         initData();
         User bo = new User();
         bo.setOpenId(openId);
         bo.setUnionId(unionId);
         bo.setTelphone(tel);
+        bo.setIdCard(idCard);
         //隐藏手机号作为初始昵称
         bo.setNickname(TelPhoneUtils.hideTelPhone(tel));
         //雪花算法产生账号ID
@@ -337,7 +341,8 @@ public class WxLoginService implements IWxLoginService {
         bo.setLastLoginTime(DateUtils.getNowTime());
         bo.setCreateTime(DateUtils.getNowTime());
         bo.setUpdateTime(DateUtils.getNowTime());
-        String pwd = ToolsUtils.getSmsCode(); // 随机密码
+//        String pwd = ToolsUtils.getSmsCode(); // 随机密码
+        String pwd = idCard.substring(idCard.length() - 6);
         bo.setPassword(SecurityUtils.encryptPassword(pwd));
         if (inviteCode != null) {
             User inviteUser = iUserService.queryByAccount(inviteCode);
@@ -412,13 +417,14 @@ public class WxLoginService implements IWxLoginService {
                 iUserService.updateById(user);
             }
         }
-        if (user == null) {
-            if (!register_small(openId, unionId, phoneNumber, loginBody.getInviteCode(),loginBody.getShareCode())) {
-                throw new CustomException("注册失败");
-            }
-            user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone, EncryptHandler.encrypt(phoneNumber)).last("limit 1"));
-        }
+        //微信授权登入关闭注册入口
+//        if (user == null) {
+//            if (!register_small(openId, unionId, phoneNumber, loginBody.getInviteCode(),loginBody.getShareCode(),loginBody.getIdCard())) {
+//                throw new CustomException("注册失败");
+//            }
+//            user = iUserService.getOne(new LambdaQueryWrapper<User>()
+//                    .eq(User::getTelphone, EncryptHandler.encrypt(phoneNumber)).last("limit 1"));
+//        }
         return user;
     }
 

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

@@ -76,4 +76,7 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private Long oId;
+
+    @TableField(exist = false)
+    private String templateName;
 }

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

@@ -1358,7 +1358,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         Goods goods = iGoodsService.getGoodsByIdTenant(goodsId,tenantId);
         CourseBusiness businessVo = iCourseBusinessService.getBusinessByIdTenant(goods.getBusinessId(),tenantId);
         boolean isConfigTp = false; //商品是否有配置选班模板
-        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateStatus()) && businessVo.getTemplateStatus() == 1) {
+        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateName()) && businessVo.getTemplateName().equals("班级")) {
             isConfigTp = true;
         }
         ClassGrade classGrade = new ClassGrade();

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

@@ -5,9 +5,15 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -16,11 +22,17 @@ import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.activity.domain.ActivityOrder;
 import com.zhongzheng.modules.activity.service.IActivityOrderService;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
+import com.zhongzheng.modules.inform.domain.InformRemind;
+import com.zhongzheng.modules.inform.domain.InformSysUser;
+import com.zhongzheng.modules.inform.service.IInformRemindService;
+import com.zhongzheng.modules.inform.service.IInformSysUserService;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
@@ -35,11 +47,10 @@ import com.zhongzheng.modules.order.vo.OrderGoodsRefundVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareToOldVo;
+import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
-import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserExamRecordService;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -49,10 +60,6 @@ import com.zhongzheng.modules.wx.service.IWxPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
@@ -91,6 +98,14 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
     private IOrderShareMoneyService iOrderShareMoneyService;
     @Autowired
     private IActivityOrderService iActivityOrderService;
+    @Autowired
+    private IInformSysUserService iInformSysUserService;
+    @Autowired
+    private IInformRemindService informRemindService;
+    @Autowired
+    private ICourseBusinessService iCourseBusinessService;
+    @Autowired
+    private ISysUserService iSysUserService;
     @Value("${oldStudySys.shareCanclePath}")
     private String SHARE_CANCLE_PATH;
 
@@ -144,6 +159,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean placeRefundSmallOrder(OrderGoodsRefundAddBo bo) {
         if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getOrderSn())){
             throw new CustomException("参数缺失");
@@ -224,6 +240,37 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         .set(OrderGoods::getRefundStatus,1)
         .eq(OrderGoods::getOrderGoodsId,orderGoods.getOrderGoodsId()));
 
+        //通知教务审核（后台站内信）
+        InformRemind informRemind = informRemindService.getOne(new LambdaQueryWrapper<InformRemind>()
+        .eq(InformRemind::getRemind,"订单退款申请通知提醒").last("limit 1"));
+        if (informRemind.getWayStatus() == 1 && informRemind.getUserType() == 2) {
+            //获取初审审核人账号
+            CourseBusiness business = iCourseBusinessService.getById(goods.getBusinessId());
+            if (ObjectUtils.isNotNull(business) && StringUtils.isNotBlank(business.getRefundUserIds())){
+                List<SysUser> sysUsers = iSysUserService.listByIds(Arrays.asList(business.getRefundUserIds().split(",")));
+                if (CollectionUtils.isNotEmpty(sysUsers)){
+                    sysUsers.forEach(user -> {
+                        InformSysUser addBo = new InformSysUser();
+                        addBo.setUserId(user.getUserId());
+                        addBo.setSendTime(DateUtils.getNowTime());
+                        addBo.setSendStatus(1);
+                        addBo.setCreateTime(DateUtils.getNowTime());
+                        addBo.setUpdateTime(DateUtils.getNowTime());
+                        addBo.setRemindId(informRemind.getId());
+                        addBo.setReceiptStatus(0);
+                        addBo.setSystemStatus(1);
+                        addBo.setRemind("订单退款申请通知提醒");
+                        addBo.setGoodsId(goods.getGoodsId());
+                        addBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
+                        GoodsVo goodsVo1 = iGoodsService.queryById(goods.getGoodsId());
+                        addBo.setText(String.format("【%s】课程申请退款，请尽快处理！",goodsVo1.getGoodsName()));
+                        iInformSysUserService.save(addBo);
+                    });
+                }
+            }
+
+        }
+
 //        OrderGoodsRefund add = getOne(new LambdaQueryWrapper<OrderGoodsRefund>().eq(OrderGoodsRefund::getGoodsId,bo.getGoodsId()).eq(OrderGoodsRefund::getOrderSn,bo.getOrderSn()));
 //        String out_trade_no = null;
 //        if(Validator.isNotEmpty(add)){
@@ -647,6 +694,39 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
                 orderGoodsUpdate.setUpdateTime(DateUtils.getNowTime());
                 iOrderGoodsService.updateById(orderGoodsUpdate);
             }
+
+            OrderGoodsRefund refundGoods = getById(bo.getRefundId());
+            if(refundGoods.getPeriodStatus() == 1){
+                //教务初审通过通知财务（后台站内信）
+                InformRemind informRemind = informRemindService.getOne(new LambdaQueryWrapper<InformRemind>()
+                        .eq(InformRemind::getRemind,"订单退款初审通过提醒").last("limit 1"));
+                if (informRemind.getWayStatus() == 1 && informRemind.getUserType() == 2) {
+                    Goods goods = iGoodsService.getById(refundGoods.getGoodsId());
+                    //获取初审审核人账号
+                    CourseBusiness business = iCourseBusinessService.getById(goods.getBusinessId());
+                    if (ObjectUtils.isNotNull(business) && StringUtils.isNotBlank(business.getRefundConfirmUserIds())){
+                        List<SysUser> sysUsers = iSysUserService.listByIds(Arrays.asList(business.getRefundConfirmUserIds().split(",")));
+                        if (CollectionUtils.isNotEmpty(sysUsers)){
+                            sysUsers.forEach(user -> {
+                                InformSysUser addBo = new InformSysUser();
+                                addBo.setUserId(user.getUserId());
+                                addBo.setSendTime(DateUtils.getNowTime());
+                                addBo.setSendStatus(1);
+                                addBo.setCreateTime(DateUtils.getNowTime());
+                                addBo.setUpdateTime(DateUtils.getNowTime());
+                                addBo.setRemindId(informRemind.getId());
+                                addBo.setReceiptStatus(0);
+                                addBo.setSystemStatus(1);
+                                addBo.setRemind("订单退款初审通过提醒");
+                                addBo.setGoodsId(goods.getGoodsId());
+                                addBo.setOrderGoodsId(refundGoods.getOrderGoodsId());
+                                addBo.setText(String.format("【%s】课程申请退款初审已通过，请尽快处理！",goods.getGoodsName()));
+                                iInformSysUserService.save(addBo);
+                            });
+                        }
+                    }
+                }
+            }
         }
 
         return true;

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

@@ -1740,7 +1740,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //创建新班级
         CourseBusinessVo businessVo = iCourseBusinessService.queryById(businessId);
         boolean isConfigTp = false; //商品是否有配置选班模板
-        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateStatus()) && businessVo.getTemplateStatus() == 1) {
+        if (Validator.isNotEmpty(businessVo) && Validator.isNotEmpty(businessVo.getTemplateName()) && businessVo.getTemplateName().equals("班级")) {
             isConfigTp = true;
         }
         ClassGrade classGrade = new ClassGrade();

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

@@ -25,5 +25,7 @@ public class UserAppRegisterBo {
     private String shareCode;
     @ApiModelProperty("活动分销码")
     private String shareActivityCode;
+    @ApiModelProperty("身份证")
+    private String idcard;
 
 }

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

@@ -18,7 +18,7 @@ public class UserSystemRegisterBo {
     private String tel;
     /** 身份证号 */
     @ApiModelProperty("身份证号")
-    private String idCard;
+    private String idcard;
     /** 真实姓名 */
     @ApiModelProperty("真实姓名")
     private String realname;

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

@@ -48,4 +48,7 @@ public class WxLoginBody {
     @ApiModelProperty("活动分销码")
     private String shareActivityCode;
 
+    @ApiModelProperty("身份证号码")
+    private String idcard;
+
 }

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

@@ -104,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getBusinessByIdTenant" parameterType="map"  resultType="com.zhongzheng.modules.course.domain.CourseBusiness">
-        SELECT * FROM course_business WHERE id = #{businessId} and tenant_id = #{tenantId}
+        SELECT b.*,t.name as templateName FROM course_business b
+        LEFT JOIN order_input_template t ON b.template_status = t.id
+        WHERE b.id = #{businessId} and b.tenant_id = #{tenantId}
     </select>
 </mapper>