From ce8e087fedd5e6949ab98b0859b824236f042841 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:07 +0800
Subject: [PATCH] 优化代码

---
 service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java
index ec3d5e9..e9a2863 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java
@@ -14,6 +14,8 @@
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -22,6 +24,7 @@
  */
 @Java110Cmd(serviceCode = "payment.qrCodePayment")
 public class QrCodePaymentCmd extends AbstractServiceCmdListener {
+    private static Logger logger = LoggerFactory.getLogger(QrCodePaymentCmd.class);
 
 
     private IQrCodePaymentSMO qrCodePaymentSMOImpl;
@@ -43,7 +46,7 @@
         int pre = Integer.parseInt(authCode.substring(0, 2));
         if (pre > 24 && pre < 31) { // 鏀粯瀹�
             qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeAliPaymentAdapt", IQrCodePaymentSMO.class);
-        }else{
+        } else {
             qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
         }
 
@@ -51,17 +54,20 @@
         try {
             resultVo = qrCodePaymentSMOImpl.pay(reqJson.getString("communityId"), orderId, receivedAmount, authCode, "");
         } catch (Exception e) {
+            logger.error("寮傚父浜�", e);
             cmdDataFlowContext.setResponseEntity(ResultVo.error(e.getLocalizedMessage()));
             return;
         }
+        logger.debug("閫傞厤鍣ㄨ繑鍥炵粨鏋�:" + resultVo.toString());
         if (ResultVo.CODE_OK != resultVo.getCode()) {
-            cmdDataFlowContext.setResponseEntity(ResultVo.error(resultVo.getMsg(),reqJson));
+            reqJson.put("orderId", orderId);
+            cmdDataFlowContext.setResponseEntity(ResultVo.error(resultVo.getMsg(), reqJson));
             return;
         }
         String appId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.APP_ID);
         String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
-        String paramOut = CallApiServiceFactory.postForApi(appId, reqJson.toJSONString(), "fee.payFee", String.class, userId);
-        cmdDataFlowContext.setResponseEntity(new ResponseEntity(paramOut, HttpStatus.OK));
+        JSONObject paramOut = CallApiServiceFactory.postForApi(appId, reqJson, "fee.payFee", JSONObject.class, userId);
+        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(paramOut));
     }
 
 }

--
Gitblit v1.8.0