From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 3f33b30..9219575 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -124,11 +124,12 @@
@Override
public ResultUtil addStuOfAppUser(StuDetailsReq stu, Integer appUserId) throws Exception {
TStudent student = new TStudent();
- if (ToolUtil.isNotEmpty(stu.getName()) && ToolUtil.isNotEmpty(stu.getIdCard())) {
- Boolean aBoolean = JuHeUtil.idcardAuthentication(stu.getIdCard(), stu.getName());
- if (!aBoolean) {
- return ResultUtil.error("身份证和姓名不匹配");
- }
+ if(ToolUtil.isEmpty(stu.getIdCard())){
+ return ResultUtil.error("请填写身份证号");
+ }
+ Boolean aBoolean = JuHeUtil.idcardAuthentication(stu.getIdCard(), stu.getName());
+ if (!aBoolean) {
+ return ResultUtil.error("身份证和姓名不匹配");
}
student.setAppUserId(appUserId);
student.setName(stu.getName());
@@ -386,7 +387,7 @@
packagePayment.setStatus(1);
packagePayment.setState(1);
packagePayment.setInsertTime(new Date());
- couPayClient.savePaymentCoursePackage(packagePayment);
+// couPayClient.savePaymentCoursePackage(packagePayment);
Integer hour = couPayClient.getClassHour(request.getCourseConfigId());
@@ -450,7 +451,7 @@
Map<String, String> data1 = resultUtil.getData();
String s = data1.get("trade_state");
String transaction_id = data1.get("transaction_id");
- if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+ if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
coursePackagePayment.setState(3);
couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
break;
@@ -463,7 +464,7 @@
couPayClient.updatePaymentCoursePackage(coursePackagePayment);
break;
}
- if ("USERPAYING".equals(s)) {
+ if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
num++;
}
}
@@ -742,30 +743,16 @@
citycodeResp.setLatitude(longitude);
List<StoreDetailList> queryStoreList = storeClient.getQueryStoreList(citycodeResp);
if (queryStoreList.size() > 0) {
-
if (ToolUtil.isEmpty(space) || space ==1) {
queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
-
-
} else {
queryStoreList = queryStoreList.stream()
.sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed())
.collect(Collectors.toList());
}
-
-
-// if (ToolUtil.isEmpty(space) || space == 2) {
-// queryStoreList = queryStoreList.stream()
-// .sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed())
-// .collect(Collectors.toList());
-//
-// } else {
-// queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
-// }
if (ToolUtil.isNotEmpty(search)) {
queryStoreList = queryStoreList.stream().filter(o -> o.getStoreName().contains(search)).collect(Collectors.toList());
}
-
}
return queryStoreList;
}
--
Gitblit v1.7.1