商品

rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/command/pay/web/PayWebApplicationCommodityV2QueryExe.java

@@ -76,6 +76,20 @@ public class PayWebApplicationCommodityV2QueryExe {
           .setApplication(application);
     }
 
+    // LIKEI/Yumi 的 H5 支付方式由本地 JSON 控制，商品接口只负责按后台商品配置返回商品。
+    // 如果这里继续依赖支付国家渠道详情，JSON 已配置但后端渠道未上架时会把商品误过滤为空。
+    List<PayApplicationCommodityCO> commodity = toCommodityCO(payCountry,
+        payApplicationCommodities);
+    if (CollectionUtils.isEmpty(commodity)) {
+      return new ApplicationCommodityCardV2CO()
+          .setApplication(application);
+    }
+    if (isJsonControlledPayment(cmd)) {
+      return new ApplicationCommodityCardV2CO()
+          .setApplication(application)
+          .setCommodity(commodity);
+    }
+
     // 所有支持的渠道
     List<PayCountryChannelDetails> countryChannelDetails = payCountryChannelDetailsService
         .listChannelCode(cmd.getPayCountryId());
@@ -85,15 +99,6 @@ public class PayWebApplicationCommodityV2QueryExe {
           .setApplication(application);
     }
 
-    // 商品
-    List<PayApplicationCommodityCO> commodity = toCommodityCO(payCountry,
-        payApplicationCommodities);
-
-    if (CollectionUtils.isEmpty(commodity)) {
-      return new ApplicationCommodityCardV2CO()
-          .setApplication(application);
-    }
-
     // 过滤渠道限额范围
     countryChannelDetails = filterCountryChannelLimit(countryChannelDetails, commodity);
 
@@ -138,6 +143,10 @@ public class PayWebApplicationCommodityV2QueryExe {
             cmd.getType(), null);
   }
 
+  private boolean isJsonControlledPayment(PayWebApplicationCommodityCmd cmd) {
+    return Objects.equals(cmd.requireReqSysOriginChildEnum(), SysOriginPlatformEnum.LIKEI);
+  }
+
   private List<PayCountryChannelDetails> filterCountryChannelLimit(
       List<PayCountryChannelDetails> countryChannelDetails,
       List<PayApplicationCommodityCO> commodity) {