From 781ed4e83aebae4048c3f0c02ce7fa80e8b00251 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 07 八月 2023 15:16:28 +0800
Subject: [PATCH] 优化停车
---
service-api/src/main/java/com/java110/api/controller/app/PaymentController.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java b/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java
index cac290e..7a67e46 100644
--- a/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java
+++ b/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java
@@ -20,11 +20,14 @@
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
@@ -44,6 +47,7 @@
@RestController
@RequestMapping(path = "/app/payment")
public class PaymentController extends BaseController {
+
private final static Logger logger = LoggerFactory.getLogger(PaymentController.class);
@Autowired
@@ -68,14 +72,22 @@
private IOweFeeToNotifySMO oweFeeToNotifySMOImpl;
@Autowired
+ private ITempCarFeeToNotifySMO tempCarFeeToNotifySMOImpl;
+
+ @Autowired
private IToQrPayOweFeeSMO toQrPayOweFeeSMOImpl;
+
@Autowired
private IToPayInGoOutSMO toPayInGoOutSMOImpl;
+
@Autowired
private IToPayBackCitySMO toPayBackCitySMOImpl;
@Autowired
private IToPayTempCarFeeSMO toPayTempCarFeeSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
/**
* <p>缁熶竴涓嬪崟鍏ュ彛</p>
@@ -92,8 +104,15 @@
appId = request.getHeader("APP-ID");
}
- IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
- "", "", "", pd.getSessionId(), appId, pd.getPayerObjId(), pd.getPayerObjType(), pd.getEndTime());
+ JSONObject param = JSONObject.parseObject(postInfo);
+ UserDto userDto = new UserDto();
+ userDto.setUserId(pd.getUserId());
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(users, "鏌ヨ鐢ㄦ埛淇℃伅閿欒锛�");
+
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(), users.get(0).getName(), pd.getToken(), postInfo,
+ "", "", "", pd.getSessionId(), appId, param.getString("payerObjId"), param.getString("payerObjType"),
+ param.getString("endTime"));
return toPaySMOImpl.toPay(newPd);
}
@@ -114,7 +133,7 @@
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
"", "", "", pd.getSessionId(),
- appId,pd.getHeaders());
+ appId, pd.getHeaders());
return toPayOweFeeSMOImpl.toPay(newPd);
}
@@ -135,7 +154,7 @@
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
"", "", "", pd.getSessionId(),
- appId,pd.getHeaders());
+ appId, pd.getHeaders());
return toPayTempCarFeeSMOImpl.toPay(newPd);
}
@@ -239,8 +258,8 @@
String preStr = buildSignString(params);
- paramIn.put("preSign",preStr);
- paramIn.put("sign",sign);
+ paramIn.put("preSign", preStr);
+ paramIn.put("sign", sign);
//鍒ゆ柇绛惧悕鏄惁鐩哥瓑
// 鏀跺埌閫氱煡鍚庤寰楄繑鍥濻UCCESS
@@ -291,8 +310,8 @@
String preStr = buildSignString(params);
- paramIn.put("preSign",preStr);
- paramIn.put("sign",sign);
+ paramIn.put("preSign", preStr);
+ paramIn.put("sign", sign);
return oweFeeToNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
}
@@ -320,7 +339,7 @@
public ResponseEntity<String> tempCarFeeNotifyUrl(@RequestBody String postInfo, HttpServletRequest request) {
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
- return oweFeeToNotifySMOImpl.toNotify(postInfo, request);
+ return tempCarFeeToNotifySMOImpl.toNotify(postInfo, request);
}
/**
--
Gitblit v1.8.0