机构类型

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -96,6 +96,9 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "支付结果备注，返回给设备展示")
     private String payRemark;
 
+    @Schema(description = "调用支付的 支付结果")
+    private Object payResult;
+
     //-----------------------退款 start--------------------------
     @Schema(description = "是否退款")
     private Boolean isRefund;

FullCardServer/src/main/java/com/zhongshu/card/server/core/httpRequest/ApiRequestService.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.server.core.httpRequest;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.StopWatch;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.core.util.net.apache.HttpClientUtil;
 import com.github.microservice.core.util.net.apache.HttpModel;
@@ -98,10 +99,11 @@ public class ApiRequestService extends SuperService {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         try {
+            JSONObject jsonObject = JSONUtil.parseObj(JSONUtil.toJsonStr(data));
             responseModel.setParam(apiConfParam);
             ResponseModel request = HttpClientUtil.request(HttpModel.builder()
                     .url(apiConfParam.getApiName()).method(apiConfParam.getMethodType())
-                    .charset("utf-8").body(data).build());
+                    .charset("utf-8").body(jsonObject).build());
             TransactionInquiryResult result = null;
             if (request.getCode() == 200) {
                 Object object = request.getBody();

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -286,7 +286,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         expenseFlow.setPaymentTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
 
         // 消费订单号
-        String orderNo = NextNoUtil.getNextPaymentNo("o");
+        String orderNo = NextNoUtil.getNextPaymentNo("W");
         expenseFlow.setOrderNo(orderNo);
         expenseFlow.setCardNo("");
         String paymentNo = NextNoUtil.getNextPaymentNo(null);
@@ -359,12 +359,14 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         // 调用微信支付
         QRCodeTransactionModel payParam = (QRCodeTransactionModel) entity.getParam();
         String url = "https://jupan.5xryd.com//wxapi/pay/createQrCodeOrder";
+
         APIResponseModel apiResponseModel = apiRequestService.sendWxRequest(url, payParam);
+        entity.setPayResult(apiResponseModel);
         log.info("支付结果：{}", apiResponseModel);
         if (apiResponseModel.isSuccess()) {
             // 关联参数
             TransactionInquiryResult result = JSONUtil.toBean(apiResponseModel.getContent(), TransactionInquiryResult.class);
-            entity.setOrderNo(result.getQrorder());
+//            entity.setOrderNo(result.getQrorder());
             entity.setPaymentStatus("支付成功");
             entity.setIsPaySuccess(Boolean.TRUE);
             entity.setPayRemark("支付成功");

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/HxzService.java

@@ -149,12 +149,13 @@ public class HxzService extends SuperService {
         // 扣款支付订单
         ResultContent<ExpenseFlow> resultContent = expenseFlowService.expendPayQrCode(expenseFlow);
         if (resultContent.isFailed()) {
-//            model.setFailed(resultContent.getMsg());
-//            requestInfoService.addRequestInfo(param, model);
-//            result.setModel(model);
-//            return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+            model.setFailed(resultContent.getMsg());
+            requestInfoService.addRequestInfo(param, model);
+            result.setModel(model);
+            return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
         }
         model.setQrorder(expenseFlow.getOrderNo());
+        result.setModel(model);
         // 记录日志
         requestInfoService.addRequestInfo(param, model);
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));