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

jiangping

2024-05-08 be0301e67768fb183df7e29f411a7e54dbf15c40

 server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java

@@ -593,6 +593,10 @@
        if(CollectionUtils.isNotEmpty(uploadMultifileDTO.getMultifileList())){
            List<Multifile> multifileList = uploadMultifileDTO.getMultifileList();
            for (Multifile multifile:multifileList) {
                if(StringUtils.isBlank(multifile.getName())
                || StringUtils.isBlank(multifile.getFileurl()) ){
                    continue;
                }
                if(Objects.isNull(multifile.getObjId())
                    ||Objects.isNull(multifile.getName())
                    ||Objects.isNull(multifile.getFileurl())){
@@ -662,14 +666,14 @@
    public  String getSignLink(SmsCheckDTO smsCheckDTO) {
        if(Objects.isNull(smsCheckDTO)
                || Objects.isNull(smsCheckDTO.getBusinessId())
                || StringUtils.isBlank(smsCheckDTO.getCode())
//                || StringUtils.isBlank(smsCheckDTO.getCode())
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //验证 验证码
        if(!debugModel){
            smsEmailService.validateCode(smsCheckDTO.getCode());
        }
//        if(!debugModel){
//            smsEmailService.validateCode(smsCheckDTO.getCode());
//        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
@@ -797,7 +801,7 @@
            if(unionApplyBXDDDetailTO.isPresent()){
                UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
                serverCost = unionApplyBXDDetailDTO.getServerMoney();
                BigDecimal dayServerMoney = unionApplyBXDDetailDTO.getServerMoney().divide(new BigDecimal(maxDays),2, RoundingMode.HALF_UP);
                BigDecimal dayServerMoney = unionApplyBXDDetailDTO.getServerMoney().divide(new BigDecimal(maxDays),6, RoundingMode.HALF_UP);

                price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(dayServerMoney));
                //上传保单信息