From 91a605ebff78f2df892a7dbdb89788eb2602d0eb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 17:33:01 +0800
Subject: [PATCH] 玩湃门店数据权限修改 收入管理增加世界杯记录
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 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 1d0b910..c4e2001 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
@@ -143,12 +143,6 @@
@Override
public List<CoursePackageListVo> queryCourseList(Integer uid, CoursePackageList coursePackageList) throws Exception {
AppUser appUser = appUserClient.queryAppUser(uid);
-// Map<String, String> geocode = gdMapGeocodingUtil.geocode(coursePackageList.getLon(), coursePackageList.getLat());
-// String provinceCode = geocode.get("provinceCode");
-// String cityCode = geocode.get("cityCode");
-// QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
-// .eq("auditStatus", 2).eq("state", 1).eq("provinceCode", provinceCode).eq("cityCode", cityCode);
-
QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
.eq("auditStatus", 2).eq("state", 1);
if (null != coursePackageList.getCoursePackageTypeId()) {
@@ -171,7 +165,6 @@
List<TCoursePackage> list1 = this.list(wrapper.last(" order by sort desc, insertTime desc"));
Date currentTime = new Date();
-// Filter the list based on the conditions
List<TCoursePackage> list = list1.stream()
.filter(coursePackage -> coursePackage.getType() != 2 || currentTime.before(coursePackage.getEndTime()))
.collect(Collectors.toList());
@@ -188,7 +181,6 @@
coursePackageListVo.setStoreName(null != store ? store.getName() : "");
coursePackageListVo.setCoverDrawing(coursePackage.getCoverDrawing());
- // 2.0修改
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
ArrayList<String> classTime = new ArrayList<>();
@@ -311,35 +303,8 @@
}
coursePackageListVo.setPaymentPrice(paymentPrice);
- double vipPrice1 = coursePackageListVo.getVipPrice();
- double originalPrice1 = coursePackageListVo.getOriginalPrice();
- double paymentPrice1 = coursePackageListVo.getPaymentPrice();
-
-// double minPrice = Math.min(vipPrice1, Math.min(originalPrice1, paymentPrice1));
-// double maxPrice = Math.max(vipPrice1, Math.max(originalPrice1, paymentPrice1));
-// coursePackageListVo.setPaymentPrice(minPrice);
-// coursePackageListVo.setOriginalPrice(maxPrice);
-// System.out.println("Minimum price: " + minPrice);
-
-
-// }
-// else{
-// List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
-// .eq("type", 1).eq("auditStatus", 2).eq("status",1));
-// Double vipPrice = coursePackagePaymentConfig.getCashPayment();
-// for (TCoursePackageDiscount coursePackageDiscount : list2) {
-// Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
-// if(vipPrice.compareTo(num1) > 0){
-// vipPrice = num1;
-// }
-// }
-// coursePackageListVo.setPaymentPrice(vipPrice);
-// coursePackageListVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
-// }
-
if (coursePackageListVo.getPaymentPrice() < coursePackageListVo.getVipPrice()) {
coursePackageListVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
-// coursePackageListVo.setVipPrice(null);
}
if (appUser.getIsVip() == 1) {
@@ -445,7 +410,6 @@
coursePackageListVo.setPayType(2);
}
- // 2.0修改
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
ArrayList<String> classTime = new ArrayList<>();
@@ -966,6 +930,7 @@
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrderService.save(coursePackageOrder);
orderId = coursePackageOrder.getId();
}else{
@@ -978,7 +943,8 @@
coursePackageOrderService.updateById(coursePackageOrder);
}
- ResultUtil weixinpay = payMoneyUtil.weixinpay("购买课程", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("报名运动营", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(),
+ "/base/course/weChatPaymentCourseCallback", "APP", "");
if (weixinpay.getCode() == 200) {
String finalCode = code;
new Thread(new Runnable() {
@@ -1010,7 +976,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) {
//有待支付的订单，这里不处理
// coursePackageOrder1.setState(3);
// coursePackageOrderService.updateById(coursePackageOrder1);
@@ -1022,12 +988,10 @@
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
//修改课时有效期
-
-
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
break;
}
- if ("USERPAYING".equals(s)) {
+ if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
num++;
}
}
@@ -1074,6 +1038,7 @@
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrderService.save(coursePackageOrder);
}else {
CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(paymentCourseVo.getOrderId());
@@ -1088,12 +1053,16 @@
Integer coursePackageId = paymentCourseVo.getId();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
Store store = storeClient.queryStoreById(byId.getStoreId());
- if (store.getOperatorId() == null ){
+ if (store.getOperatorId() == null){
smid1 = smid;
}else{
- smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ if (store.getOperatorId()==0){
+ smid1 = smid;
+ }else{
+ smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ }
}
- ResultUtil alipay = payMoneyUtil.alipay(smid1,"购买课程", "购买课程",
+ ResultUtil alipay = payMoneyUtil.alipay(smid1,"报名运动营", "报名运动营",
coursePackagePaymentConfig.getId().toString(),
code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
if (alipay.getCode() == 200) {
@@ -1148,6 +1117,11 @@
String smid ="2088330203191220";
// 说明是平台的
payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
+ break;
+ }else if (operatorId==0){
+ String smid ="2088330203191220";
+ // 说明是平台的
+ payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
break;
}else{
// 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
@@ -1278,6 +1252,7 @@
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrderService.save(coursePackageOrder);
orderId = coursePackageOrder.getId();
}else{
@@ -1326,6 +1301,7 @@
*
* @param coursePackagePaymentConfig
*/
+ @Override
public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
// 发放优惠券
@@ -1361,19 +1337,22 @@
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
//更新学员课时有效期
+ boolean b = true;
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}
studentClient.frozen(student);
//开始排课
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
-
-
+ if(b){
+ addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+ }
//课时记录
CourseCounsum courseCounsum = new CourseCounsum();
@@ -1381,7 +1360,7 @@
courseCounsum.setChangeType(1);
courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
courseCounsum.setInsertTime(new Date());
- courseCounsum.setReason("购买课包");
+ courseCounsum.setReason("报名运动营");
courseCounsumService.save(courseCounsum);
//账单记录
if(coursePackageOrder.getPayType() != 3){
@@ -1393,8 +1372,6 @@
courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
courseCounsumService.save(courseCounsum1);
}
-
-
} else {
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
@@ -1408,17 +1385,20 @@
coursePackageOrderStudent.setUseTime(calendar.getTime());
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
//更新学员课时有效期
+ boolean b = true;
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}
studentClient.frozen(student);
//中间断课，没有连续续费的情况需要重新排课
- if (useTime.compareTo(new Date()) < 0) {
+ if (useTime.compareTo(new Date()) < 0 && b) {
addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
}
@@ -1440,12 +1420,7 @@
courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
courseCounsumService.save(courseCounsum1);
}
-
-
}
-
-
-
}
if(coursePackage.getType() == 2){
addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), null, null);
--
Gitblit v1.7.1