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

zhongzheng-system/src/main/java/com/zhongzheng/modules/alisms/service/impl/AliSmsServiceImpl.java

@@ -92,7 +92,7 @@ public class AliSmsServiceImpl implements IAliSmsService {
         try{
             SendSmsResponse response = SmsUtils.sendSms(tel,SIGNNAME,code,param,ACCESSKEYID,ACCESSKEYSECRET);
             LOGGER.error("发送短信结果："+JSON.toJSONString(response));
-            if(response.getBody().getMessage().equals("OK")){
+            if(response.getBody().getCode().equals("OK")){
                 SmsAddBo smsAddBo = new SmsAddBo();
                 smsAddBo.setCode(param);
                 smsAddBo.setTel(tel);

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

@@ -273,7 +273,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
         if(Validator.isNotEmpty(keyStatus)&&keyStatus==100L){
             throw new CustomException("禁止频繁提交",667);
         }
-        redisCache.setCacheObject(key, 100L,20, TimeUnit.SECONDS);
+        redisCache.setCacheObject(key, 100L,60, TimeUnit.SECONDS);
 
         String handleOrderSn = insertByAddBo(bo);
         String importNo = ServletUtils.getEncoded("IMPORT");
@@ -284,20 +284,23 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                 if(!telMap.containsKey(itemAddBo.getUser().getTelphone())){
                     telMap.put(itemAddBo.getUser().getTelphone(),itemAddBo.getUser().getIdCard());
                 }else{
+                    redisCache.deleteObject(key);
                     throw new CustomException("本次名单存在手机号码"+itemAddBo.getUser().getTelphone()+"重复用户");
                 }
             }
             if(Validator.isNotEmpty(itemAddBo.getUser().getIdCard())){
-                if(!telMap.containsKey(itemAddBo.getUser().getIdCard())){
-                    telMap.put(itemAddBo.getUser().getIdCard(),itemAddBo.getUser().getTelphone());
+                if(!idMap.containsKey(itemAddBo.getUser().getIdCard())){
+                    idMap.put(itemAddBo.getUser().getIdCard(),itemAddBo.getUser().getTelphone());
                 }else{
-                    throw new CustomException("本次名单存在身份证号码"+itemAddBo.getUser().getIdCard()+"重复用户");
+                    redisCache.deleteObject(key);
+                    throw new CustomException("本次名单存在身份证号码"+itemAddBo.getUser().getIdCard ()+"重复用户");
                 }
             }
         }
         for (OrderHandleItemAddBo itemAddBo : bo.getUserGoodsList()) {
             if (Validator.isEmpty(itemAddBo.getUser().getUserId())) {
                 if (Validator.isEmpty(itemAddBo.getUser().getEduLevel()) || Validator.isEmpty(itemAddBo.getUser().getCompanyName()) || Validator.isEmpty(itemAddBo.getUser().getSex())) {
+                    redisCache.deleteObject(key);
                     throw new CustomException("用户参数缺失");
                 }
                 Long userId = iUserService.importUser(itemAddBo.getUser(), importNo);

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

@@ -2890,6 +2890,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Goods goods = iGoodsService.getById(goodsId);
         String businessName = iGoodsService.getGoodsBusinessName(goodsId);
         Major major = iMajorService.getById(goods.getMajorId());
+        if(Validator.isEmpty(major)){
+            throw new CustomException("二建二造专业不能为空");
+        }
         tenantList.forEach(tenant -> {
             //是否存在对应课程商品
             List<Goods> relGoods = iGoodsService.getRelGoodsNoTenant(businessName,major.getCategoryName(),tenant.getTenantId());