From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 101 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 48 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 f1fa8fa..1e9020f 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
@@ -66,7 +66,7 @@
List<Details> list = new ArrayList<>();
QueryWrapper<TCoursePackageDiscount> tCoursePackageDiscountQueryWrapper = new QueryWrapper<>();
- tCoursePackageDiscountQueryWrapper.eq("auditStatus", 2).eq("status",1);
+ tCoursePackageDiscountQueryWrapper.eq("auditStatus", 2).eq("status", 1);
List<TCoursePackageDiscount> tCoursePackageDiscounts = new ArrayList<>();
int weekStr = LocalDateTimeUtils.getWeekStr();
if (null == discountType || discountType == 1) {
@@ -75,6 +75,9 @@
if (tCoursePackageDiscounts.size() > 0) {
for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
TCoursePackage coursePackage = tcpMapper.selectById(tCoursePackageDiscount.getCoursePackageId());
+ if (coursePackage.getState() == 2) {
+ continue;
+ }
// 判断预约人数是否已满
// Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
// Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
@@ -132,7 +135,7 @@
if (isWithinRange) {
// 判断当前日期是否在开始时间和结束时间范围内
- if (isDateWithinRange(localTime, parse1, parse2)){
+ if (isDateWithinRange(localTime, parse1, parse2)) {
Details resde = new Details();
resde.setCoursePackageDiscountId(tCoursePackageDiscount.getId());
@@ -146,7 +149,7 @@
resde.setDiscountPrice(cashPayment);
if (isWithinTimeRange) {
resde.setStatus(1);
- }else {
+ } else {
resde.setStatus(2);
}
GetDistanceVo distanceVo = new GetDistanceVo();
@@ -155,8 +158,6 @@
distanceVo.setStoreId(coursePackage.getStoreId());
String s = sreClient.calculateDistance(distanceVo);
resde.setStoreDistance(s);
-
-
list.add(resde);
@@ -203,18 +204,22 @@
}
}
}
- }else {
+ } else {
tCoursePackageDiscountQueryWrapper.eq("type", 4);
tCoursePackageDiscounts = this.baseMapper.selectList(tCoursePackageDiscountQueryWrapper);
if (tCoursePackageDiscounts.size() > 0) {
for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
TCoursePackage coursePackage = tcpMapper.selectById(tCoursePackageDiscount.getCoursePackageId());
+ if (coursePackage.getState() == 2) {
+ continue;
+ }
+
// 判断预约人数是否已满
Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
- .eq("appUserId",appUserId )
- .eq("status",1));
- if (integer >= maxSubscribeNumber){
+ .eq("appUserId", appUserId)
+ .eq("status", 1));
+ if (integer >= maxSubscribeNumber) {
continue;
}
try {
@@ -282,7 +287,7 @@
resde.setOriginalPrice(paymentConfig.getCashPayment());
if (isWithinTimeRange) {
resde.setStatus(1);
- }else {
+ } else {
resde.setStatus(2);
}
@@ -337,12 +342,12 @@
}
}
}
- System.out.println("list"+list);
+ System.out.println("list" + list);
return list;
}
@Override
- public ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId,String lat,String lon) {
+ public ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId, String lat, String lon) {
ExchangeCoursePackageResponse packageResponse = new ExchangeCoursePackageResponse();
TCoursePackageDiscount coursePackageDiscount = this.baseMapper.selectById(coursePackageDiscountId);
Integer coursePackageId = coursePackageDiscount.getCoursePackageId();
@@ -357,7 +362,7 @@
// packageResponse.setPayType(coursePackage.getPayType());
- if (coursePackage.getType()==2) {
+ if (coursePackage.getType() == 2) {
Date startTime = coursePackage.getStartTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
String formattedDate = sdf.format(startTime);
@@ -365,15 +370,15 @@
Date endTime = coursePackage.getEndTime();
String formattedDate1 = sdf.format(endTime);
- packageResponse.setHoliTime(formattedDate +"-"+ formattedDate1);
+ packageResponse.setHoliTime(formattedDate + "-" + formattedDate1);
}
Store store = sreClient.queryStoreById(coursePackage.getStoreId());
- packageResponse.setStoreNameAddr(store.getName() +"(" +store.getAddress()+")");
+ packageResponse.setStoreNameAddr(store.getName() + "(" + store.getAddress() + ")");
GetDistanceVo distanceVo = new GetDistanceVo();
- if(ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
+ if (ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)) {
Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
packageResponse.setDistance(wgs84);
@@ -386,38 +391,38 @@
//
//
// packageResponse.setDistance(Double.valueOf(s));
- if (coursePackageDiscount.getType() == 1 || coursePackageDiscount.getType() == 2){
+ 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());
- if (coursePackageDiscount.getType() == 3 ||coursePackageDiscount.getType() == 4){
+ if (coursePackageDiscount.getType() == 3 || coursePackageDiscount.getType() == 4) {
Double cashPayment = jsonObject.getDouble("cashPayment");
- if(ToolUtil.isNotEmpty(paymentConfig.getCashPayment()) && paymentConfig.getCashPayment()>0 && ToolUtil.isNotEmpty(paymentConfig.getPlayPaiCoin()) && paymentConfig.getPlayPaiCoin()>0 ){
+ if (ToolUtil.isNotEmpty(paymentConfig.getCashPayment()) && paymentConfig.getCashPayment() > 0 && ToolUtil.isNotEmpty(paymentConfig.getPlayPaiCoin()) && paymentConfig.getPlayPaiCoin() > 0) {
packageResponse.setPayType(3);
- }else if(ToolUtil.isNotEmpty(paymentConfig.getCashPayment()) && paymentConfig.getCashPayment()>0){
+ } else if (ToolUtil.isNotEmpty(paymentConfig.getCashPayment()) && paymentConfig.getCashPayment() > 0) {
packageResponse.setPayType(1);
- }else if( ToolUtil.isNotEmpty(paymentConfig.getPlayPaiCoin()) && paymentConfig.getPlayPaiCoin()>0 ){
+ } else if (ToolUtil.isNotEmpty(paymentConfig.getPlayPaiCoin()) && paymentConfig.getPlayPaiCoin() > 0) {
packageResponse.setPayType(2);
}
packageResponse.setClassHours(paymentConfig.getClassHours());
packageResponse.setCostPrice(paymentConfig.getCashPayment());
- if (paymentConfig.getPlayPaiCoin()!=null) {
+ if (paymentConfig.getPlayPaiCoin() != null) {
packageResponse.setWanpaiGold(paymentConfig.getPlayPaiCoin());
}
- if (cashPayment!=null) {
+ if (cashPayment != null) {
packageResponse.setDiscountPrice(cashPayment);
- }else {
+ } else {
packageResponse.setDiscountPrice(paymentConfig.getCashPayment());
// packageResponse.setCostPrice(null);
}
Integer cashPayment1 = jsonObject.getInteger("hour");
packageResponse.setFreeClassHours(cashPayment1);
- }else{
+ } else {
packageResponse.setClassHours(paymentConfig.getClassHours());
Integer cashPayment = jsonObject.getInteger("hour");
@@ -426,7 +431,7 @@
packageResponse.setCostPrice(paymentConfig.getCashPayment());
TCoursePackageDiscount coursePackageDiscount1 = this.baseMapper.selectOne(new QueryWrapper<TCoursePackageDiscount>()
.eq("type", 1)
- .eq("coursePackageId",coursePackage.getId()));
+ .eq("coursePackageId", coursePackage.getId()));
String content = coursePackageDiscount1.getContent();
JSONObject jsonObject1 = JSON.parseObject(content);
Double vipPrice = jsonObject1.getDouble("num1");
@@ -434,12 +439,12 @@
packageResponse.setWanpaiGold(paymentConfig.getPlayPaiCoin());
}
String[] split = coursePackage.getClassWeeks().split(";");
- if (split.length > 0){
+ if (split.length > 0) {
StringBuilder courWeeks = new StringBuilder("每");
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());
@@ -450,9 +455,9 @@
ArrayList<String> classTime = new ArrayList<>();
String[] split4 = classStartTime.split(",");
String[] split3 = classEndTime.split(",");
- if(ToolUtil.isNotEmpty(classStartTime)){
+ if (ToolUtil.isNotEmpty(classStartTime)) {
for (int i = 0; i < split4.length; i++) {
- String s = split4[i].substring(0,5) + "-" + split3[i].substring(0,5);
+ String s = split4[i].substring(0, 5) + "-" + split3[i].substring(0, 5);
classTime.add(s);
}
}
@@ -460,11 +465,11 @@
String classTimeAsString = String.join(" | ", classTime);
-
packageResponse.setTime(classTimeAsString);
return packageResponse;
}
+
@Override
public List<DiscountList> queryDiscountListAudit(QueryDiscountList queryDiscountList) {
Page<DiscountList> discountListPage = new Page<>(queryDiscountList.getOffset(), queryDiscountList.getLimit());
@@ -478,7 +483,7 @@
List<TCoursePackageDiscount> tCoursePackageDiscounts = this.baseMapper
.selectList(new LambdaQueryWrapper<TCoursePackageDiscount>()
.eq(TCoursePackageDiscount::getCoursePackageId, discountList.getCourseId())
- .ne(TCoursePackageDiscount::getAuditStatus,2)
+ .ne(TCoursePackageDiscount::getAuditStatus, 2)
.orderByAsc(TCoursePackageDiscount::getType));
// long count = tCoursePackageDiscounts.stream()
// .filter(e -> e.getAuditStatus().equals(2)).count();
@@ -487,30 +492,31 @@
// }else {
// discountList.setStatus(1);
// }
- String type="";
+ String type = "";
for (int i = 0; i < tCoursePackageDiscounts.size(); i++) {
- if(tCoursePackageDiscounts.get(i).getType()==1){
+ if (tCoursePackageDiscounts.get(i).getType() == 1) {
type += "会员折扣、";
- }else if(tCoursePackageDiscounts.get(i).getType()==2){
+ } else if (tCoursePackageDiscounts.get(i).getType() == 2) {
type += "续课优惠、";
- }else if(tCoursePackageDiscounts.get(i).getType()==3){
+ } else if (tCoursePackageDiscounts.get(i).getType() == 3) {
type += "限时折扣、";
- }else if(tCoursePackageDiscounts.get(i).getType()==4){
+ } else if (tCoursePackageDiscounts.get(i).getType() == 4) {
type += "赠送课时、";
}
}
- if(type.length()>0){
- type = type.substring(0,type.length()-1);
+ if (type.length() > 0) {
+ type = type.substring(0, type.length() - 1);
}
discountList.setType(type);
}
return discountLists;
}
+
@Override
public List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList) {
Page<DiscountList> discountListPage = new Page<>(queryDiscountList.getOffset(), queryDiscountList.getLimit());
List<Integer> ids = queryDiscountList.getIds();
- if(ids.size()==0){
+ if (ids.size() == 0) {
ids.add(-1);
queryDiscountList.setIds(ids);
}
@@ -524,21 +530,20 @@
discountList.getCourseId())
.orderByAsc(TCoursePackageDiscount::getType));
- String type="";
+ String type = "";
for (int i = 0; i < tCoursePackageDiscounts.size(); i++) {
- if(tCoursePackageDiscounts.get(i).getType()==1){
+ if (tCoursePackageDiscounts.get(i).getType() == 1) {
type += "会员折扣、";
- }else if(tCoursePackageDiscounts.get(i).getType()==2){
+ } else if (tCoursePackageDiscounts.get(i).getType() == 2) {
type += "续课优惠、";
- }
- else if(tCoursePackageDiscounts.get(i).getType()==3){
+ } else if (tCoursePackageDiscounts.get(i).getType() == 3) {
type += "限时折扣、";
- }else if(tCoursePackageDiscounts.get(i).getType()==4){
+ } else if (tCoursePackageDiscounts.get(i).getType() == 4) {
type += "赠送课时、";
}
}
- if(type.length()>0){
- type = type.substring(0,type.length()-1);
+ if (type.length() > 0) {
+ type = type.substring(0, type.length() - 1);
}
discountList.setType(type);
}
--
Gitblit v1.7.1