Przeglądaj źródła

Merge branch 'feature/0721-tenant'

liujc 1 rok temu
rodzic
commit
6536a94315

+ 1 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -623,6 +623,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             .price(orderReq.getPaymentCashAmount().setScale(2, RoundingMode.HALF_UP))
             .expirationTime(DateTime.now().plusMinutes(120).toDate())
             .wxAppId(paymentServiceContext.getPaymentService(orderReq.getPaymentVendor()).getPaymentConfig().getWxAppId())
+            .alipayAppId(paymentServiceContext.getPaymentService(orderReq.getPaymentVendor()).getPaymentConfig().getAlipayAppId())
             .userId(String.valueOf(orderReq.getUserId()))
             .build();
 

+ 3 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/UserPaymentOrderWrapper.java

@@ -569,6 +569,9 @@ public class UserPaymentOrderWrapper {
         @ApiModelProperty("微信支付公众号")
         private String wxAppId;
 
+        @ApiModelProperty("支付宝应用ID")
+        private String alipayAppId;
+
         @ApiModelProperty("支付用户Id")
         private String userId;