TRX 1 vuosi sitten
vanhempi
commit
41ce7bc07a

+ 1 - 1
PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/test/TestController.java

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.server.core.controller.test;
 
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 1
PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/wxPaymentV3/WechatPayV3Controller.java

@@ -3,7 +3,7 @@ package com.zhongshu.payment.server.core.controller.wxPaymentV3;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dataConfig.WxV3PayConfig;
 import com.zhongshu.payment.server.core.service.wxPaymentV3.WxPaymentService;
 import io.swagger.v3.oas.annotations.Hidden;

+ 2 - 2
PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/RechargeService.java

@@ -11,8 +11,8 @@ import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.model.wechat.MiniAppUserInfoVo;
-import com.zhongshu.card.client.service.OrganizationFeignService;
-import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.feign.OrganizationFeignService;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.client.model.PrePayModel;
 import com.zhongshu.payment.client.model.RechargeRecordModel;
 import com.zhongshu.payment.client.model.param.OrderParam;

+ 2 - 2
PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/TransferService.java

@@ -6,8 +6,8 @@ import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
-import com.zhongshu.card.client.service.OrganizationFeignService;
-import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.feign.OrganizationFeignService;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.client.model.RechargeRecordModel;
 import com.zhongshu.payment.client.model.TransferModel;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;

+ 26 - 7
PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/unionFrictionlessPay/UnionUserOpenRequestService.java → PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/unionFrictionlessPay/UnionRequestService.java

@@ -6,9 +6,13 @@ import com.github.microservice.core.util.net.apache.HttpModel;
 import com.github.microservice.core.util.net.apache.MethodType;
 import com.github.microservice.core.util.net.apache.ResponseModel;
 import com.github.microservice.models.requestModel.SuperResponseModel;
+import com.zhongshu.card.client.model.payment.RequestInfoSaveParam;
+import com.zhongshu.card.client.service.feign.RequestInfoFeignService;
+import com.zhongshu.card.client.utils.type.payment.RequestType;
 import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.ApiConfParam;
 import com.zhongshu.payment.server.core.service.base.SuperService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StopWatch;
 
@@ -20,28 +24,39 @@ import org.springframework.util.StopWatch;
  */
 @Slf4j
 @Service
-public class UnionUserOpenRequestService extends SuperService {
+public class UnionRequestService extends SuperService {
 
+    @Autowired
+    RequestInfoFeignService requestInfoFeignService;
 
     public SuperResponseModel requestAPI(String url,
             Object data,
-            Class<? extends SuperResponseModel> cls) {
-        SuperResponseModel responseModel = new SuperResponseModel();
+            Class<? extends SuperResponseModel> tClass) {
+        RequestInfoSaveParam param = new RequestInfoSaveParam();
+        param.setParam(data);
+        param.setApiParam(url);
+        param.setUserId(getCurrentUserId());
+
+        SuperResponseModel responseModel = null;
         try {
+            responseModel = tClass.newInstance();
             ApiConfParam apiConfParam = new ApiConfParam();
             apiConfParam.setApiName(url);
             apiConfParam.setMethodType(MethodType.Json);
+
+            // 请求时间记时
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();
+            // 发送请求
             ResponseModel request = HttpClientUtil.request(HttpModel.builder()
                     .url(url).method(apiConfParam.getMethodType()).charset("utf-8").body(data).build());
             int code = request.getCode();
             if (code == 200) {
-                responseModel = BeanUtil.copyProperties(request.getBody(), cls.getClass().newInstance());
+                BeanUtil.copyProperties(request.getBody(), responseModel);
             } else if (code == 404) {
                 responseModel.setFailed("404 not found");
             } else {
-                responseModel = BeanUtil.copyProperties(request.getBody(), cls.getClass().newInstance());
+                BeanUtil.copyProperties(request.getBody(), responseModel);
             }
             stopWatch.stop();
             responseModel.setMillis(stopWatch.getTotalTimeMillis());
@@ -50,8 +65,12 @@ public class UnionUserOpenRequestService extends SuperService {
             responseModel.setFailed(String.format("请求出错:%s", e.getMessage()));
             return responseModel;
         }
-        // 记录请求日志
-//        requestInfoService.addRequestInfo(data, responseModel);
+        param.setMillis(responseModel.getMillis());
+        param.setIsSuccess(responseModel.isSuccess);
+        param.setMsg(responseModel.getMsg());
+        param.setResponse(responseModel);
+        param.setRequestType(RequestType.UnionFrictionlessPay);
+        requestInfoFeignService.saveRequestInfo(param);
         return responseModel;
     }
 

+ 2 - 2
PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/wallet/WalletService.java

@@ -5,8 +5,8 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
-import com.zhongshu.card.client.service.OrganizationFeignService;
-import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.feign.OrganizationFeignService;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.WalletOrderModel;
 import com.zhongshu.payment.client.model.param.GetWalletParam;

+ 2 - 2
PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/wxPaymentV3/WxPayNotifyService.java

@@ -9,8 +9,8 @@ import com.wechat.pay.java.service.payments.model.Transaction;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
-import com.zhongshu.card.client.service.MqttFeignService;
-import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.feign.MqttFeignService;
+import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.types.RechargeState;