bug修改

无关风月

2025-04-03 b01f752252eaadd1fa31eda6a9ad43146660b721

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java

@@ -21,6 +21,7 @@
import com.xinquan.order.service.OrderPaymentRecordService;
import com.xinquan.order.service.OrderService;
import com.xinquan.common.core.utils.JuHeFuUtil;
import com.xinquan.order.utils.MD5Generator;
import com.xinquan.order.utils.OrderUtil;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.AppUserWalletRecord;
@@ -99,7 +100,7 @@
            Meditation meditation = remoteMeditationService.getMeditationById(targetId,
                    SecurityConstants.INNER).getData();
            String meditationTitle = meditation.getMeditationTitle();
            String detailDescription = meditation.getDetailDescription();
            String detailDescription = "购买疗愈音频";
            String wxOpenId = appUser.getWxOpenId();
            // 创建订单
            String orderNo = OrderUtil.getOrderNoForPrefix("MX");
@@ -149,12 +150,12 @@
                order.setBuyContent("购买疗愈【"+meditationTitle+"】");
                this.updateById(order);
                // 创建支付订单
                createPayment(payType, orderNo, needPayAmount, meditationTitle, detailDescription,
                createPayment(payType, orderNo, needPayAmount, meditationTitle, "购买疗愈",
                        wxOpenId, orderId9, clientPlaceOrderVO);
            } else {
                // 创建支付订单
                createPayment(payType, orderNo, type==null?order.getRealPayAmount():order.getRealPayAmount(), meditationTitle,
                        detailDescription, wxOpenId, orderId9, clientPlaceOrderVO);
                        "购买疗愈", wxOpenId, orderId9, clientPlaceOrderVO);
            }
        }
        else if (orderFrom == 2){
@@ -162,7 +163,7 @@
            Course course = remoteCourseService.getCourseById(targetId).getData();
            String courseTitle = course.getCourseTitle();
            String wxOpenId = appUser.getWxOpenId();
            String description = course.getDescription();
            String description = "购买课程";

            // 创建订单
            String orderNo = OrderUtil.getOrderNoForPrefix("KC");
@@ -213,12 +214,12 @@

                this.updateById(order);
                // 创建支付订单
                createPayment(payType, orderNo, needPayAmount, courseTitle, description,
                createPayment(payType, orderNo, needPayAmount, courseTitle, "购买课程",
                        wxOpenId, orderId8, clientPlaceOrderVO);
            } else {
                // 创建支付订单
                createPayment(payType, orderNo, order.getRealPayAmount(), courseTitle,
                        description, wxOpenId, orderId8, clientPlaceOrderVO);
                        "购买课程", wxOpenId, orderId8, clientPlaceOrderVO);
            }
        }
        else if (orderFrom == 3){
@@ -448,7 +449,10 @@
    @Override
    public String placeOrderApple(Long targetId, Integer orderFrom,
                                  Long receiverId, Integer balanceFlag,
                                  BigDecimal amount, Integer vipType, String transactionIdentifier) {
                                  BigDecimal amount, Integer vipType, String transactionIdentifier
    ,String originTransactionIdentifier,String receipt) {
//        String s = MD5Generator.generateMD5(receipt);

        // 获取当前登录用户id
        Long userId = tokenService.getLoginUser().getUserid();
        // 获取用户信息
@@ -494,6 +498,7 @@
                    paymentRecord.setOrderId(orderId);
                    paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
                    paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
//                    paymentRecord.setReceipt(s);
                    orderPaymentRecordService.save(paymentRecord);
                }

@@ -507,6 +512,8 @@
                paymentRecord.setOrderId(orderId);
                paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
                paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
//                paymentRecord.setReceipt(s);

                orderPaymentRecordService.save(paymentRecord);
            }
        }
@@ -548,6 +555,8 @@
                    paymentRecord.setOrderId(orderId);
                    paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
                    paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
//                    paymentRecord.setReceipt(s);

                    orderPaymentRecordService.save(paymentRecord);
                }
            } else {
@@ -560,6 +569,8 @@
                paymentRecord.setOrderId(orderId);
                paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
                paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
//                paymentRecord.setReceipt(s);

                orderPaymentRecordService.save(paymentRecord);
            }
        }
@@ -586,7 +597,6 @@
            order.setBuyContent(vipType1);
            this.save(order);
            Long orderId = order.getId();

            order.setPayType(3);
            this.updateById(order);
            // 创建支付订单
@@ -596,6 +606,8 @@
            paymentRecord.setOrderId(orderId);
            paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
            paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
//            paymentRecord.setReceipt(s);

            orderPaymentRecordService.save(paymentRecord);
        }else {
            // 充值
@@ -607,7 +619,6 @@
            order.setAppUserId(userId);
            order.setTotalAmount(amount);
            order.setRealPayAmount(amount);

            order.setBuyContent("充值");
            this.save(order);
            Long orderId = order.getId();
@@ -620,6 +631,7 @@
            paymentRecord.setOrderId(orderId);
            paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
            paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
//            paymentRecord.setReceipt(s);
            orderPaymentRecordService.save(paymentRecord);
        }
        return order.getId()+"";
@@ -649,7 +661,9 @@
            byId.setRefundRemark("后台退款");
            byId.setRefundTime(LocalDateTime.now());
            byId.setPaymentStatus(3);
            byId.setCancelTime(LocalDateTime.now());
            two.setPaymentStatus(3);

            this.updateById(byId);
            orderPaymentRecordService.updateById(two);
            switch (byId.getOrderFrom()){
@@ -695,6 +709,7 @@
            byId.setRefundRemark("后台退款");
            byId.setRefundTime(LocalDateTime.now());
            byId.setPaymentStatus(3);
            byId.setCancelTime(LocalDateTime.now());
            two.setPaymentStatus(3);
            this.updateById(byId);
            orderPaymentRecordService.updateById(two);
@@ -730,6 +745,7 @@
            return refund.getString("error_msg");
        }
        one.setPaymentStatus(3);

        orderPaymentRecordService.updateById(one);
        String string = refund.getString("payment_id");
        if (string!=null){