代码提交

无关风月

2024-11-11 79857a556aa0a983eee05730b0566a62e0be73c0

 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();
@@ -299,6 +306,7 @@
    @ApiOperation(value = "创建支付订单", notes = "微信|支付宝")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "targetId", value = "目标id 订单类型为会员和充值时不传", dataType = "Long", required = false),
            @ApiImplicitParam(name = "orderId", value = "订单id 待支付时传", dataType = "Long", required = false),
            @ApiImplicitParam(name = "orderFrom", value = "订单来源 1=冥想音频 2=课程 3=购买会员 4充值", dataType = "Integer", required = true),
            @ApiImplicitParam(name = "receiverId", value = "被赠送课程APP用户id", dataType = "Long", required = false),
            @ApiImplicitParam(name = "balanceFlag", value = "是否使用余额抵扣 1=是 2=否", dataType = "Integer", required = false),
@@ -308,6 +316,7 @@
    })
    public R<ClientPlaceOrderVO> placeOrder(
            @RequestParam(value = "targetId", required = false) Long targetId,
            @RequestParam(value = "orderId", required = false) Long orderId,
            @RequestParam(value = "orderFrom") Integer orderFrom,
            @RequestParam(value = "receiverId", required = false) Long receiverId,
            @RequestParam(value = "balanceFlag", required = false) Integer balanceFlag,
@@ -318,7 +327,7 @@
        try {

            return R.ok(
                    orderService.placeOrder(targetId, orderFrom, receiverId,
                    orderService.placeOrder(targetId, orderFrom, receiverId,orderId,
                            balanceFlag, payType,amount,vipType));
        } catch (Exception e) {
            throw new RuntimeException(e);
@@ -551,6 +560,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 +755,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){
@@ -861,12 +873,13 @@
                            }
                            break;
                        case 4:
                            remoteAppUserService.addBalance(one.getAppUserId(),one.getRealPayAmount());
                            System.err.println("进入充值");
                            remoteAppUserService.addBalance(one.getAppUserId(),one.getTotalAmount());
                            AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
                            appUserWalletRecord.setAppUserId(one.getAppUserId());
                            appUserWalletRecord.setChangeType(1);
                            appUserWalletRecord.setReason("充值");
                            appUserWalletRecord.setAmount(one.getRealPayAmount());
                            appUserWalletRecord.setAmount(one.getTotalAmount());
                            appUserWalletRecord.setChildAppUserId(one.getAppUserId());
                            appUserWalletRecord.setOrderId(one.getId());
                            remoteAppUserService.addBalanceRecord(appUserWalletRecord);