Merge remote-tracking branch 'origin/test' into test

2024-10-30 14:38:15 +08:00
parent e9885f76cb 07f7d905fe
commit a5d1b4342f
1 changed files with 1 additions and 0 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -499,6 +499,7 @@ public class PayService {
        String userId = String.valueOf(TokenUtil.getUserId());
        TbOrderPayment payment = createOrderPayment(orderInfo, payDTO.getPayType());

+        orderInfo.setPayType(payDTO.getPayType());
        if ("ysk".equals(thirdPayType)) {
            return Result.successWithData(yskPay(thirdApply, orderInfo, payment, openId, userId, ip));
        } else {