代码提交

无关风月

2024-11-11 377cb14fb06a5cbeda3e2c715f58ae352768e096

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java

@@ -118,6 +118,13 @@
        if (byId==null){
            return R.fail("订单失效");
        }
        if (byId.getGiveUserId()!=null){
            AppUser data1 = remoteAppUserService.getAppUserById(byId.getGiveUserId() + "").getData();
            payOrderVO.setPhone(data1.getCellPhone());
        }

        AppUser data1 = remoteAppUserService.getAppUserById(byId.getAppUserId() + "").getData();
        payOrderVO.setBalance(data1.getBalance());
        payOrderVO.setOrderId(id);
        if (byId.getOrderFrom()==1){
            Meditation data = remoteMeditationService.getMeditationById(byId.getBusinessId()).getData();
@@ -551,6 +558,8 @@
                        .ne(OrderPaymentRecord::getPaymentType, 4).one();
                if (one2!=null){
                    one2.setPaymentStatus(2);
                    // 扣除用户余额
                    Object data = remoteAppUserService.deleteBalance(one.getAppUserId() + "", one2.getPayAmount() + "").getData();
                    orderPaymentRecordService.updateById(one2);
                }
                // 实际支付金额
@@ -744,6 +753,7 @@
                }
                one.setPaymentStatus(2);
                one.setPaymentTime(LocalDateTime.now());
                orderService.updateById(one);
                OrderPaymentRecord one2 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
                        .ne(OrderPaymentRecord::getPaymentType, 4).one();
                if (one2!=null){