Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -256,6 +256,7 @@ public class CourseController extends BaseController {
                 vo.setUserId(user.getUserId());
                 vo.setGoodsId(queryBo.getGoodsId());
                 vo.setTelphone(queryBo.getTelphone());
+                vo.setIdCard(queryBo.getIdCard());
                 if (StringUtils.isNotBlank(user.getPasswordAes())){
                     vo.setPasswordAes(EncryptHandler.decrypt(user.getPasswordAes()));
                 }

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

@@ -816,17 +816,31 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                         && classGradeVo.getPeriodStatus() == 1
                         && (DateUtils.getNowTime() >= goodsUserVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsUserVo.getServiceEndTime())){
                     UserSubscribe userSubscribe = baseMapper.getUserSub(bo.getUserId(),goodsUserVo.getGoodsId());
-                    if (ObjectUtils.isNull(userSubscribe)){
-                        goodsUserVo.setSubscribeSign(1);
-                    }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
-                            && userSubscribe.getExamStatus() == 1
-                            && ObjectUtils.isNull(userSubscribe.getResult())){
-                        goodsUserVo.setSubscribeSign(2);
-                    }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
-                            && userSubscribe.getExamStatus() == 0){
-                        goodsUserVo.setSubscribeSign(4);
-                    }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
-                        goodsUserVo.setSubscribeSign(3);
+                    if(Validator.isNotEmpty(userSubscribe)){
+                        Long examTime = 0L;
+                        if (ObjectUtils.isNotNull(userSubscribe.getApplySiteEndTime())){
+                            Long examTime1 = userSubscribe.getApplySiteExamTime();
+                            String applySiteEndTime = userSubscribe.getApplySiteEndTime();
+                            String s = DateUtils.timestampToDateFormat(examTime1, "yyyy-MM-dd");
+                            String format = String.format("%s %s", s, applySiteEndTime);
+                            examTime = DateUtils.dateTimeSec("yyyy-MM-dd HH:mm", format);
+                        }
+                        if (examTime > 0 && DateUtils.getNowTime() > examTime && ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
+                            goodsUserVo.setSubscribeSign(1);
+                        }else {
+                            if (ObjectUtils.isNull(userSubscribe)){
+                                goodsUserVo.setSubscribeSign(1);
+                            }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
+                                    && userSubscribe.getExamStatus() == 1
+                                    && ObjectUtils.isNull(userSubscribe.getResult())){
+                                goodsUserVo.setSubscribeSign(2);
+                            }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
+                                    && userSubscribe.getExamStatus() == 0){
+                                goodsUserVo.setSubscribeSign(4);
+                            }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
+                                goodsUserVo.setSubscribeSign(3);
+                            }
+                        }
                     }
                 }
 

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

@@ -15,6 +15,8 @@ public class GoodsBatchListVo implements Serializable {
 
     private String telphone;
 
+    private String idCard;
+
     private Long goodsId;
 
     private Long userId;

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

@@ -4521,7 +4521,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (CollectionUtils.isEmpty(orderGoods)) {
             throw new CustomException("订单学员课程信息获取有误");
         }
-        if (orderGoods.stream().allMatch(x -> x.getRefundStatus() != 0 && x.getRefundStatus() != 3)) {
+        if (orderGoods.stream().allMatch(x -> x.getRefundStatus() != 0 && x.getRefundStatus() != 3 && x.getRefundStatus() != 4)) {
             throw new CustomException("订单申请退款学员有误，请检查");
         }
 
@@ -4651,6 +4651,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         vo.setOrderSn(orderVo.getOrderSn());
         vo.setOrderUncollected(orderVo.getOrderUncollected());
         vo.setOrderReceived(orderVo.getOrderReceived());
+        vo.setPayType(orderVo.getPayType());
         BigDecimal decimal = orderVo.getPretaxBrokerage();
         if (ObjectUtils.isNotNull(decimal) && count > 0){
             decimal = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamRecordMapper.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.vo.CourseVo;
@@ -20,6 +21,7 @@ import java.util.List;
 public interface UserExamRecordMapper extends BaseMapper<UserExamRecord> {
     List<UserExamRecordVo> selectListAll(UserExamRecordQueryBo bo);
 
+    @InterceptorIgnore(tenantLine = "true")
     Long selectDoNum(UserExamRecordQueryBo bo);
 
     Long selectRightNum(UserExamRecordQueryBo bo);

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

@@ -1148,6 +1148,11 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
                 goodsId = item;
             }
+            if (ObjectUtils.isNull(goodsId)){
+                userSubscribeImport.setCause("该学员剩余考试次数不足或已存在相同考试场次");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
 
             userSubscribeAddBo.setGoodsId(goodsId);
             //获得当前所在班级