From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/controller/app/PaymentController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 f3aa410..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,7 +20,10 @@
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;
@@ -44,6 +47,7 @@
@RestController
@RequestMapping(path = "/app/payment")
public class PaymentController extends BaseController {
+
private final static Logger logger = LoggerFactory.getLogger(PaymentController.class);
@Autowired
@@ -72,13 +76,18 @@
@Autowired
private IToQrPayOweFeeSMO toQrPayOweFeeSMOImpl;
+
@Autowired
private IToPayInGoOutSMO toPayInGoOutSMOImpl;
+
@Autowired
private IToPayBackCitySMO toPayBackCitySMOImpl;
@Autowired
private IToPayTempCarFeeSMO toPayTempCarFeeSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
/**
* <p>缁熶竴涓嬪崟鍏ュ彛</p>
@@ -95,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);
}
--
Gitblit v1.8.0