富文本框输入版本变化

KKSU

2023-12-27 c19dc78c41273727339aeea025b3c75c09454c5a

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAppServiceImpl.java

@@ -169,32 +169,31 @@
                    totalCarriage = total;
                }
                //减少用户积分和余额

                BigDecimal avaAmount = totalCarriage;//剩余需要折扣的金额
                if(avaAmount.compareTo(memberAmount) >= 0){
                    //清零用户的积分和余额
                    mallMemberWallet.setBalance(BigDecimal.ZERO);
                    mallMemberWallet.setScore(BigDecimal.ZERO);
                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
                }else{
                    /**
                     * 先扣积分，再扣余额
                     */
                    if(avaAmount.compareTo(score) >= 0){
                        mallMemberWallet.setScore(BigDecimal.ZERO);
                        avaAmount = avaAmount.subtract(score);
                    }else{
                        mallMemberWallet.setScore(score.subtract(avaAmount));
                        avaAmount = BigDecimal.ZERO;
                    }
                    //积分不够
                    if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
                        mallMemberWallet.setBalance(balance.subtract(avaAmount));
                    }else{
                        mallMemberWallet.setBalance(balance);
                    }
                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
                }
//                BigDecimal avaAmount = totalCarriage;//剩余需要折扣的金额
//                if(avaAmount.compareTo(memberAmount) >= 0){
//                    //清零用户的积分和余额
//                    mallMemberWallet.setBalance(BigDecimal.ZERO);
//                    mallMemberWallet.setScore(BigDecimal.ZERO);
//                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
//                }else{
//                    /**
//                     * 先扣积分，再扣余额
//                     */
//                    if(avaAmount.compareTo(score) >= 0){
//                        mallMemberWallet.setScore(BigDecimal.ZERO);
//                        avaAmount = avaAmount.subtract(score);
//                    }else{
//                        mallMemberWallet.setScore(score.subtract(avaAmount));
//                        avaAmount = BigDecimal.ZERO;
//                    }
//                    //积分不够
//                    if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
//                        mallMemberWallet.setBalance(balance.subtract(avaAmount));
//                    }else{
//                        mallMemberWallet.setBalance(balance);
//                    }
//                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
//                }
            }
            orderInfo.setCarriage(totalCarriage);
        }
@@ -337,21 +336,50 @@
    }

    @Override
    @Transactional
    public FebsResponse wxCodePay(ApiWxCodePayDto wxCodePayDto) {
        Long orderId = wxCodePayDto.getOrderId();
        String wxPayCode = wxCodePayDto.getWxPayCode();
        /**
         * auth_code 扫码支付付款码 微信付款码规则：18位纯数字，前缀以10、11、12、13、14、15开头
         */
        String regex = "^(10|11|12|13|14|15)\\d{16}$";
        boolean flag = wxPayCode.matches(regex);
        if(!flag){
            throw new FebsException("请打开微信付款码！");
        }
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        if(OrderStatusEnum.FINISH.getValue() == (mallOrderInfo.getStatus())){
            throw new FebsException("已支付");
        }
        BigDecimal amount = mallOrderInfo.getAmount();
        BigDecimal carriage = mallOrderInfo.getCarriage();
        //减少用户积分和余额
        if(ObjectUtil.isNotEmpty(mallOrderInfo.getMemberId())){
            BigDecimal avaAmount = carriage;//剩余需要折扣的金额
            if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallOrderInfo.getMemberId());
                BigDecimal score = mallMemberWallet.getScore();
                BigDecimal balance = mallMemberWallet.getBalance();
                BigDecimal memberAmount = score.add(balance);
                if(avaAmount.compareTo(memberAmount) >= 0){
                    //清零用户的积分和余额
                    mallMemberWallet.setBalance(BigDecimal.ZERO);
                    mallMemberWallet.setScore(BigDecimal.ZERO);
                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
                }else{
                    /**
                     * 先扣积分，再扣余额
                     */
                    if(avaAmount.compareTo(score) >= 0){
                        mallMemberWallet.setScore(BigDecimal.ZERO);
                        avaAmount = avaAmount.subtract(score);
                    }else{
                        mallMemberWallet.setScore(score.subtract(avaAmount));
                        avaAmount = BigDecimal.ZERO;
                    }
                    //积分不够
                    if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
                        mallMemberWallet.setBalance(balance.subtract(avaAmount));
                    }else{
                        mallMemberWallet.setBalance(balance);
                    }
                    mallMemberWalletMapper.updateBalanceScoreWithId(mallMemberWallet);
                }
            }
        }
        String wxPayCode = wxCodePayDto.getWxPayCode();
        mallOrderInfo.setTakeCode(wxPayCode);
        List<ApiGetOrderOrderItemVo> appOrderItemByOrderId = mallOrderItemMapper.getAppOrderItemByOrderId(orderId);
        if(CollUtil.isEmpty(appOrderItemByOrderId)){
@@ -359,10 +387,20 @@
        }else{
            mallOrderInfo.setName(appOrderItemByOrderId.get(0).getGoodsName());
        }
//        mallOrderInfo.setPayResult(2);
        mallOrderInfoMapper.updateById(mallOrderInfo);
        // 发起付款码支付请求
        String payResult = xcxCodePayService.pay(mallOrderInfo);
        String payResult = "支付成功";
        if(amount.subtract(carriage).compareTo(BigDecimal.ZERO) > 0){
            /**
             * auth_code 扫码支付付款码 微信付款码规则：18位纯数字，前缀以10、11、12、13、14、15开头
             */
            String regex = "^(10|11|12|13|14|15)\\d{16}$";
            boolean flag = wxPayCode.matches(regex);
            if(!flag){
                throw new FebsException("请打开微信付款码！");
            }
            payResult = xcxCodePayService.pay(mallOrderInfo);
        }
        return new FebsResponse().success().message(payResult);
    }