From 5a107c0386a1edb756f33e573133f01d29e4dbcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 14 十二月 2023 09:23:39 +0800
Subject: [PATCH] 门店距离排序bug
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 279 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 210 insertions(+), 69 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index e2aa6ee..fd2c939 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -4,7 +4,17 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradeOrderSettleModel;
+import com.alipay.api.domain.OpenApiRoyaltyDetailInfoPojo;
+import com.alipay.api.domain.RoyaltyDetailInfos;
+import com.alipay.api.request.AlipayTradeOrderSettleRequest;
+import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
+import com.alipay.api.response.AlipayTradeOrderSettleResponse;
import com.alipay.api.response.AlipayTradeQueryResponse;
+import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,6 +60,16 @@
*/
@Service
public class TCoursePackageServiceImpl extends ServiceImpl<TCoursePackageMapper, TCoursePackage> implements TCoursePackageService {
+
+ private String aliAppid = "2021004105665036";//支付宝appid
+
+ private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+
+ private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥
+
+ private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+
+
@Resource
private StoreClient storeClient;
@@ -941,6 +961,7 @@
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
@@ -1036,6 +1057,7 @@
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
@@ -1086,6 +1108,7 @@
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
+ moneyOut(tradeNo,tradeNo,finalCode);
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -1100,6 +1123,73 @@
}).start();
}
return alipay;
+ }
+
+
+ //分账
+ public void moneyOut(String outNum, String tradeNo,String code) throws AlipayApiException {
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+ AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+ AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
+ model.setOutRequestNo(outNum);
+ model.setTradeNo(tradeNo);
+ List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+
+
+// AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();
+//
+//
+// request1.setBizContent("{" +
+// " \"receiver_list\":[" +
+// " {" +
+// " \"type\":\"loginName\"," +
+// " \"account\":\"19522115070\"," +
+// " \"name\":\"罗易胜\"," +
+// " \"memo\":\"分账给测试商户\"," +
+// " }" +
+// " ]," +
+// " \"out_request_no\":\"" + tradeNo + "\"" +
+// "}");
+// AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
+// if (response.isSuccess()) {
+// System.out.println("绑定调用成功");
+// } else {
+// System.out.println("调用失败");
+// }
+
+
+
+//
+ CoursePackageOrder one = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>().eq("code", code));
+ TCoursePackage coursePackage = coursePackageService.getById(one.getCoursePackageId());
+ OperatorUser operatorUser = storeClient.queryByStoreId(coursePackage.getStoreId());
+ if (operatorUser!=null) {
+ if(one.getPayType()==2){
+
+ OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
+ op.setTransOutType("loginName");
+ op.setTransOut("happysports@weparklife.com");
+ op.setTransInType("userId");
+// op.setTransInType("loginName");
+// op.setTransIn("19522115070");
+ op.setTransIn(operatorUser.getAlipayNum());
+ op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
+
+ List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
+ ops.add(op);
+ model.setRoyaltyParameters(ops);
+
+ request.setBizModel(model);
+
+
+ AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
+ if (response1.isSuccess()) {
+ System.out.println("调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
+ }
+ }
}
@@ -1138,6 +1228,7 @@
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(2);
coursePackageOrder.setPayUserId(appUser.getId());
+ coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
@@ -1155,7 +1246,7 @@
* @return
*/
@Override
- public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) {
+ public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws AlipayApiException {
CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
.eq("code", code).eq("state", 1));
if (coursePackageOrder1.getPayStatus() == 2) {
@@ -1168,6 +1259,7 @@
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
+ moneyOut(trade_no,trade_no,code);
return ResultUtil.success();
}
@@ -1210,6 +1302,7 @@
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + validDays);
coursePackageOrderStudent.setUseTime(calendar.getTime());
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
+
//更新学员课时有效期
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
@@ -1222,6 +1315,9 @@
//开始排课
addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+
+
+
//课时记录
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
@@ -1315,6 +1411,31 @@
//上课星期
String classWeeks = tCoursePackage.getClassWeeks();
List<Integer> week = week(classWeeks);
+ CoursePackageScheduling one = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>()
+ .eq("studentId", sId)
+ .eq("coursePackageId", tCoursePackage.getId())
+ .eq("status", 1)
+ .orderByDesc("classDate")
+ .last(" limit 0, 1")
+ );
+ if(null != one){
+ //先检测是否需要继续进行排课
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.setTime(one.getClassDate());
+ int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
+ day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
+ int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
+
+ Calendar calendar2 = Calendar.getInstance();
+ calendar2.setTime(new Date());
+ int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
+
+ //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
+ if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
+ return;
+ }
+ }
+
//上课时段
String[] split = tCoursePackage.getClassStartTime().split(",");
String[] split1 = tCoursePackage.getClassEndTime().split(",");
@@ -1468,7 +1589,7 @@
/**
- * 课时有效期更新后-更新历史排课数据
+ * 课时有效期更新后-更新历史排课数据（因有效期限制的排课数据，还有剩余课时）
* @param student
*/
public void addOldPackageStudent(Student student){
@@ -1493,18 +1614,26 @@
);
Calendar calendar = Calendar.getInstance();
+ //上课星期
+ String classWeeks = coursePackage.getClassWeeks();
+ List<Integer> week = week(classWeeks);
+
+ Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
+ Integer codeTime = coursePackage.getCodeTime();
+ String classStartTime = coursePackage.getClassStartTime();
+ String classEndTime = coursePackage.getClassEndTime();
+ String[] split = classStartTime.split(",");
+ String[] split1 = classEndTime.split(",");
+
if(null == one){
calendar.setTime(new Date());
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
}else{
- Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
- Integer codeTime = coursePackage.getCodeTime();
- String classStartTime = coursePackage.getClassStartTime();
- String classEndTime = coursePackage.getClassEndTime();
String format = sdf1.format(one.getClassDate());
String time = format.substring(format.indexOf(" ") + 1);
- String[] split = classStartTime.split(",");
- String[] split1 = classEndTime.split(",");
int n = Arrays.asList(split).indexOf(time);
if(n != split.length - 1){
calendar.setTime(one.getClassDate());
@@ -1544,72 +1673,84 @@
}
}else{
- calendar.setTime(one.getClassDate());
- calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
- calendar.set(Calendar.HOUR_OF_DAY, 0);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.SECOND, 0);
- int day_week1 = calendar.get(Calendar.DAY_OF_WEEK);
+ //先检测是否需要继续进行排课
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.setTime(one.getClassDate());
+ int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
- int num = 8 - day_week1 + 7;
+ int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
- //上课星期
- String classWeeks = coursePackage.getClassWeeks();
- List<Integer> week = week(classWeeks);
+ Calendar calendar2 = Calendar.getInstance();
+ calendar2.setTime(new Date());
+ int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
- for (int i = 0; i < num; i++) {
- Date time1 = calendar.getTime();
-
- //判断当天是否在排课星期内
- int day = calendar.get(Calendar.DAY_OF_WEEK);
- day = day - 1 == 0 ? 7 : day - 1;
- if (!week.contains(day)) {
- calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
- continue;
- }
-
- //大于有效期不进行排课
- if (calendar.getTimeInMillis() >= validity.getTime()) {
- break;
- }
- for (int j = 0; j < split.length; j++) {
- //剩余数量不足以排课
- if (laveClassHours.compareTo(codeTime) < 0) {
- break;
- }
-
- laveClassHours -= codeTime;
-
- CoursePackageScheduling packageScheduling = new CoursePackageScheduling();
- packageScheduling.setType(coursePackage.getType());
- packageScheduling.setAppUserId(coursePackageOrderStudent.getAppUserId());
- packageScheduling.setStudentId(coursePackageOrderStudent.getStudentId());
- packageScheduling.setCoursePackageId(coursePackage.getId());
- try {
- Date parse = sdf.parse(sdf1.format(time1) + " " + split[j]);
- Date parse1 = sdf.parse(sdf1.format(time1) + " " + split1[j]);
- packageScheduling.setClassDate(parse);
- packageScheduling.setEndDate(parse1);
- }catch (Exception e){
- e.printStackTrace();
- }
- packageScheduling.setStatus(1);
- coursePackageSchedulingService.save(packageScheduling);
- CoursePackageStudent student1 = new CoursePackageStudent();
- student1.setAppUserId(coursePackageOrderStudent.getAppUserId());
- student1.setStudentId(coursePackageOrderStudent.getStudentId());
- student1.setCoursePackageId(coursePackage.getId());
- student1.setCoursePackagePaymentId(coursePackageOrderStudent.getId());
- student1.setCoursePackageSchedulingId(packageScheduling.getId());
- student1.setSignInOrNot(1);
- student1.setReservationStatus(1);
- student1.setInsertTime(new Date());
- coursePackageStudentMapper.insert(student1);
- }
- //增加日期，用于判断
- calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
+ if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
+ break;
}
}
+
+ calendar.setTime(one.getClassDate());
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ }
+
+ int day_week = calendar.get(Calendar.DAY_OF_WEEK);
+ day_week = day_week - 1 == 0 ? 7 : day_week - 1;
+ int num = 8 - day_week + 7;
+ for (int i = 0; i < num; i++) {
+ Date time1 = calendar.getTime();
+
+ //判断当天是否在排课星期内
+ int day = calendar.get(Calendar.DAY_OF_WEEK);
+ day = day - 1 == 0 ? 7 : day - 1;
+ if (!week.contains(day)) {
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ continue;
+ }
+
+ //大于有效期不进行排课
+ if (calendar.getTimeInMillis() >= validity.getTime()) {
+ break;
+ }
+ for (int j = 0; j < split.length; j++) {
+ //剩余数量不足以排课
+ if (laveClassHours.compareTo(codeTime) < 0) {
+ break;
+ }
+
+ laveClassHours -= codeTime;
+
+ CoursePackageScheduling packageScheduling = new CoursePackageScheduling();
+ packageScheduling.setType(coursePackage.getType());
+ packageScheduling.setAppUserId(coursePackageOrderStudent.getAppUserId());
+ packageScheduling.setStudentId(coursePackageOrderStudent.getStudentId());
+ packageScheduling.setCoursePackageId(coursePackage.getId());
+ try {
+ Date parse = sdf1.parse(sdf.format(time1) + " " + split[j]);
+ Date parse1 = sdf1.parse(sdf.format(time1) + " " + split1[j]);
+ packageScheduling.setClassDate(parse);
+ packageScheduling.setEndDate(parse1);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ packageScheduling.setStatus(1);
+ coursePackageSchedulingService.save(packageScheduling);
+ CoursePackageStudent student1 = new CoursePackageStudent();
+ student1.setAppUserId(coursePackageOrderStudent.getAppUserId());
+ student1.setStudentId(coursePackageOrderStudent.getStudentId());
+ student1.setCoursePackageId(coursePackage.getId());
+ student1.setCoursePackagePaymentId(coursePackageOrderStudent.getId());
+ student1.setCoursePackageSchedulingId(packageScheduling.getId());
+ student1.setSignInOrNot(1);
+ student1.setReservationStatus(1);
+ student1.setInsertTime(new Date());
+ coursePackageStudentMapper.insert(student1);
+ }
+ //增加日期，用于判断
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
}
}
}
--
Gitblit v1.7.1