修改bug

rentaiming

2024-07-16 31267d9b3a33c8b3fbb1b9f810ab08e01c49b846

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java

@@ -89,6 +89,9 @@
    @Resource
    private GoodsSkuClient goodsSkuClient;

    @Resource
    private PaylogMapper paylogMapper;

    @Override
    public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
        Double price = 0.0;
@@ -96,8 +99,6 @@
        String body;
        try {
            if(judgeContainsStr(orderNO)){


                if (orderNO.contains("BO")) {
                    LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
                    wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
@@ -106,6 +107,14 @@
                    one1.setBoundStatus(BondStatusEnum.PAID);
                    one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
                    orderAuctionBondMapper.updateById(one1);

                    if (one1.getBond().compareTo(new BigDecimal(0))==0){
                        one1.setBoundStatus(BondStatusEnum.PAID);
                        Map<String, Object> returnMap = new HashMap<>();
                        returnMap.put("Type",1);
                        return R.ok(returnMap);
                    }


                }else{
                    LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
@@ -356,6 +365,26 @@
                                goodsSku.setSoldQuantity(page1.getGoodsQuantity());
                                goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
                            }

                            if(page1.getOrderNo().contains("TG")){
                                GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                                GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                                    goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
                                    page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
                                }else{
                                    UUID uuid = UUID.randomUUID();
                                    GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
                                    goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
                                    goodsGroupPurchaseInfo.setCurrentNumber(1);
                                    goodsGroupPurchaseInfo.setMubre(uuid.toString());
                                    goodsGroupPurchaseInfo.setGroupPurchaseId(page1.getGoodsSkuId());
                                    goodsGroupPurchaseInfo.setGroupStatus(0);
                                    goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
                                    page1.setGroupNo(uuid.toString());
                                }
                            }

                            page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
                            page1.setPayTime(LocalDateTime.now());
                            OrderMapper.updateById(page1);
@@ -878,6 +907,46 @@
        return map;
    }

    @Override
    public void refund1(RefundDTO refundDTOS) {

        LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
        paylogEntityWrapper.eq(Paylog::getOutTradeNo, refundDTOS.getOrderNo());
        Paylog paylog = paylogMapper.selectOne(paylogEntityWrapper);


        if (paylog.getPayType()  ==1) {//支付宝
            //获取支付信息

            if (paylog != null) {
                boolean bo = this.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
                if (!bo) {
                    System.out.println("支付宝退款失败");
                }
            }

        } else if (paylog.getPayType()  ==2) {//微信
            //获取支付信息
            if (paylog != null) {
                String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
                String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
                refundFee = Integer.parseInt(money.substring(0, money.length() - 3));

                String regEx = "[^0-9]";
                Pattern p = Pattern.compile(regEx);
                Matcher m = p.matcher(refundDTOS.getOrderNo());
                String ma = m.replaceAll("").trim();
                boolean bo = this.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
                if (!bo) {
                    System.out.println("微信退款失败");
                }

            }
        }
    }

    private Boolean handleRefund(Paylog paylog, BigDecimal amount,
            String orderNo) {
        boolean res = false;