Просмотр исходного кода

fix(membership): trial 分支改调 createOrderWithPayType,返回 payType=none

iwt 2 месяцев назад
Родитель
Сommit
33d4fb7489

+ 4 - 3
cfc-backend/src/main/java/com/etotem/cfc/controller/MembershipController.java

@@ -234,10 +234,11 @@ public class MembershipController {
         Long couponId = ParamUtils.getLong(params.get("couponId"));
         String openid = params.get("openid") != null ? params.get("openid").toString() : null;
 
-        // trial 单:createOrder 内已直接开通(status=paid),无需支付,原样返回
+        // trial 单:createOrderWithPayType 内直接开通(status=paid),返回 payType=none
         if ("trial".equals(paymentType)) {
-            PaymentOrderDTO order = membershipService.createOrder(userId, familyId, levelCode, paymentType, period, couponId);
-            return Result.success(order);
+            Map<String, Object> result = membershipService.createOrderWithPayType(
+                    userId, familyId, levelCode, paymentType, period, couponId, null, null);
+            return Result.success(result);
         }
 
         // testMode:保持现有模拟逻辑(不触发真实虚拟/普通支付)