From 6dd3ce5d438e90e453bf3e44e287aa835ffda339 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 01 八月 2023 14:05:30 +0800
Subject: [PATCH] app端接口优化
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
index 0838569..1017f20 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
@@ -291,8 +291,8 @@
public ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId,String lat,String lon) {
ExchangeCoursePackageResponse packageResponse = new ExchangeCoursePackageResponse();
TCoursePackageDiscount coursePackageDiscount = this.baseMapper.selectById(coursePackageDiscountId);
- packageResponse.setCoursePackageDiscountId(coursePackageDiscount.getCoursePackageId());
Integer coursePackageId = coursePackageDiscount.getCoursePackageId();
+ packageResponse.setCoursePackageDiscountId(coursePackageId);
TCoursePackage coursePackage = tcpMapper.selectById(coursePackageId);
@@ -309,7 +309,9 @@
distanceVo.setStoreId(coursePackage.getStoreId());
String s = sreClient.calculateDistance(distanceVo);
packageResponse.setDistance(Double.valueOf(s));
-
+ if (coursePackageDiscount.getType() == 1 || coursePackageDiscount.getType() == 2){
+ return packageResponse;
+ }
JSONArray jsonArray = JSON.parseArray(coursePackageDiscount.getContent());
JSONObject jsonObject = jsonArray.getJSONObject(0);
CoursePackagePaymentConfig paymentConfig = cppcMapper.selectById(coursePackageDiscount.getCoursePackagePaymentConfigId());
@@ -334,37 +336,13 @@
packageResponse.setDiscountPrice(vipPrice);
packageResponse.setWanpaiGold(paymentConfig.getPlayPaiCoin());
}
- List<Integer> weeks = StrUtils.dealStrToList(coursePackage.getClassWeeks());
- if (weeks.size() > 0){
+ String[] split = coursePackage.getClassWeeks().split(";");
+ if (split.length > 0){
StringBuilder courWeeks = new StringBuilder("每");
- for (Integer integer : weeks) {
- switch (integer){
- case 1:
- courWeeks.append("周一、");
- break;
- case 2:
- courWeeks.append("周二、");
- break;
- case 3:
- courWeeks.append("周三、");
- break;
- case 4:
- courWeeks.append("周四、");
- break;
- case 5:
- courWeeks.append("周五、");
- break;
- case 6:
- courWeeks.append("周六、");
- break;
- case 7:
- courWeeks.append("周末、");
- break;
- default:
- break;
- }
+ for (String integer : split) {
+ courWeeks.append(integer).append("、");
}
- if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == ','){
+ if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == '、'){
courWeeks.deleteCharAt(courWeeks.length() - 1);
}
packageResponse.setWeekTime(courWeeks.toString());
--
Gitblit v1.7.1