From d41e0da5df20d559b0b9b8c180d1bf70ba7c1845 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期三, 07 十月 2026 17:49:26 +0800
Subject: [PATCH] 员工管理权限修改（新需求）
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 502 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 352 insertions(+), 150 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index d23a26e..a6fa3d7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -2,24 +2,21 @@
import cn.mb.cloud.common.data.controller.BaseController;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.*;
+import com.dsh.course.entity.dto.SelectDto;
import com.dsh.course.feignclient.model.ExerciseVideo;
import com.dsh.course.model.*;
import com.dsh.course.model.dto.CourseChangeStateDTO;
import com.dsh.course.model.dto.TQueryBenefitsVideosDTO;
import com.dsh.course.model.vo.TQueryBenefitsVideosVO;
-import com.dsh.course.service.TCoursePackagePaymentService;
-import com.dsh.course.service.TCoursePackageService;
-import com.dsh.course.service.TCoursePackageTypeService;
-import com.dsh.course.service.TCourseService;
import com.dsh.course.service.*;
-import com.dsh.course.util.PageFactory;
-import com.dsh.course.util.PayMoneyUtil;
-import com.dsh.course.util.ResultUtil;
-import com.dsh.course.util.TokenUtil;
+import com.dsh.course.util.*;
+import com.dsh.course.util.wx.WxV3PayConfig;
+import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -32,11 +29,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
@Api
@CrossOrigin
@@ -66,6 +65,15 @@
@Autowired
private TCoursePackageDiscountService discountService;
+
+ @Autowired
+ private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
+
+
+
/**
* 上/下架 1为上架 2为下架 3为删除
*
@@ -73,32 +81,29 @@
*/
@RequestMapping("/base/course/changeState")
@ResponseBody
- public Object changeState(@RequestBody CourseChangeStateDTO dto){
-
-
-
-
+ public Object changeState(@RequestBody CourseChangeStateDTO dto) {
return courseService.changeState(dto);
}
/**
* 通过课程ids获取课程
+ *
* @return
*/
@RequestMapping("/base/course/getCourseByCourseIds")
- public List<TQueryBenefitsVideosVO> getCourseByCourseIds(@RequestBody TQueryBenefitsVideosDTO query){
+ public List<TQueryBenefitsVideosVO> getCourseByCourseIds(@RequestBody TQueryBenefitsVideosDTO query) {
return courseService.getCourseByCourseIds(query);
}
@PostMapping("/base/course/queryList")
- public List<ExerciseVideo> queryStuCourseAfterVideos(@RequestBody List<Integer> courseIds){
+ public List<ExerciseVideo> queryStuCourseAfterVideos(@RequestBody List<Integer> courseIds) {
List<ExerciseVideo> videos = new ArrayList<>();
List<TCourse> list = courseService.list(new QueryWrapper<TCourse>()
.in("id", courseIds)
- .eq("state",1));
- if (list.size() > 0){
- list.forEach( vs ->{
+ .eq("state", 1));
+ if (list.size() > 0) {
+ list.forEach(vs -> {
ExerciseVideo video = new ExerciseVideo();
video.setVideoUrl(vs.getCourseVideo());
video.setVideoName(vs.getName());
@@ -115,7 +120,7 @@
@ApiOperation(value = "获取课程类型列表", tags = {"APP-课程列表"})
@ApiImplicitParams({
})
- public ResultUtil<List<BaseVo>> queryCoursePackageType(){
+ public ResultUtil<List<BaseVo>> queryCoursePackageType() {
try {
List<TCoursePackageType> coursePackageTypes = coursePackageTypeService.list(new QueryWrapper<TCoursePackageType>().eq("state", 1));
List<BaseVo> list = new ArrayList<>();
@@ -125,13 +130,34 @@
list.add(baseVo);
});
return ResultUtil.success(list);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
+
+ @ResponseBody
+ @PostMapping("/base/course/queryCoursePackageType")
+ @ApiOperation(value = "获取课程类型列表", tags = {"APP-课程列表"})
+ @ApiImplicitParams({
+ })
+ public ResultUtil<List<BaseVo>> queryCoursePackageType1() {
+ try {
+ List<TCoursePackageType> coursePackageTypes = coursePackageTypeService.list(new QueryWrapper<TCoursePackageType>().eq("state", 1));
+ List<BaseVo> list = new ArrayList<>();
+ coursePackageTypes.forEach(c -> {
+ BaseVo baseVo = new BaseVo();
+ BeanUtils.copyProperties(c, baseVo);
+ list.add(baseVo);
+ });
+ return ResultUtil.success(list);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
@ResponseBody
@@ -140,15 +166,15 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CoursePackageListVo>> queryCourseList(CoursePackageList coursePackageList){
+ public ResultUtil<List<CoursePackageListVo>> queryCourseList(CoursePackageList coursePackageList) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
List<CoursePackageListVo> coursePackageListVos = coursePackageService.queryCourseList(uid, coursePackageList);
return ResultUtil.success(coursePackageListVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -161,16 +187,15 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CoursePackageListVo>> queryCourseListOne(CoursePackageList coursePackageList){
+ public ResultUtil<List<CoursePackageListVo>> queryCourseListOne(CoursePackageList coursePackageList) {
try {
- List<CoursePackageListVo> coursePackageListVos = coursePackageService.queryCourseListOne( coursePackageList);
+ List<CoursePackageListVo> coursePackageListVos = coursePackageService.queryCourseListOne(coursePackageList);
return ResultUtil.success(coursePackageListVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -180,24 +205,22 @@
@ApiImplicitParam(value = "课包id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
+ @ApiImplicitParam(value = "学员id", name = "stuId", dataType = "int", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat){
+ public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat, Integer stuId) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
- CoursePackageInfo coursePackageInfo = coursePackageService.queryCourseInfo(uid, id, lon, lat);
+ CoursePackageInfo coursePackageInfo = coursePackageService.queryCourseInfo(uid, id, lon, lat, stuId);
return ResultUtil.success(coursePackageInfo);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
@ResponseBody
@@ -206,120 +229,154 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil paymentCourse(PaymentCourseVo paymentCourseVo){
+ public synchronized ResultUtil paymentCourse(PaymentCourseVo paymentCourseVo) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
+ Long couponId = paymentCourseVo.getCouponId();
+ if (couponId == null || couponId == 0) {
+ paymentCourseVo.setCouponId(null);
+ }
return coursePackageService.paymentCourse(uid, paymentCourseVo);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
- // 2.0
+
@ResponseBody
@PostMapping("/api/course/paymentCourseCouponList")
@ApiOperation(value = "支付课程--完成后优惠券列表", tags = {"APP-课程列表"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil paymentCourseCouponList(Integer coursePackagePaymentConfigId){
+ public ResultUtil paymentCourseCouponList(Integer coursePackagePaymentConfigId) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
return coursePackageService.paymentCourseCouponList(uid, coursePackagePaymentConfigId);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
/**
* 购买课程微信支付回调
+ *
* @param request
* @param response
*/
@ResponseBody
+ @PostMapping("/base/course/weChatPaymentCourseCallback1")
+ public void weChatPaymentCourseCallback1(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ System.err.println("微信回调");
+ System.err.println("请求" + request);
+ BufferedReader reader = request.getReader();
+ String string1 = reader.toString();
+ System.err.println("请求reader" + string1);
+ StringBuilder requestBody = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ requestBody.append(line);
+ }
+ System.err.println("全部请求体" + requestBody);
+ JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
+ JSONObject resource = jsonObject.getJSONObject("resource");
+
+ AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
+ String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
+ resource.getString("ciphertext"));
+ System.err.println("微信解密的字符串信息" + decryptedData);
+ JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
+ String code = jsonInfo.getString("out_trade_no");
+ String transaction_id = jsonInfo.getString("transaction_id");
+ String trade_state = jsonInfo.getString("trade_state");
+ String attach = jsonInfo.getString("attach");
+ if (trade_state.equals("SUCCESS")) {
+
+ ResultUtil resultUtil = coursePackageService.paymentCourseCallback(code, transaction_id, attach);
+ if (resultUtil.getCode() == 200) {
+ PrintWriter out = response.getWriter();
+ out.write("SUCCESS");
+ out.flush();
+ out.close();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ @ResponseBody
@PostMapping("/base/course/weChatPaymentCourseCallback")
- public void weChatPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
+ public void weChatPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
- if(null != map){
+ if (null != map) {
String code = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
+ String attach = map.get("attach");
String result = map.get("result");
- List<TCoursePackagePayment> list = coursePackagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("state", 1).eq("code", code).eq("payType", 1));
- TCoursePackagePayment one = list.get(0);
- if(one.getPayStatus() == 1){
- for (TCoursePackagePayment coursePackagePayment : list) {
- coursePackagePayment.setPayStatus(2);
- coursePackagePayment.setOrderNumber(transaction_id);
- }
- coursePackagePaymentService.updateBatchById(list);
+ ResultUtil resultUtil = coursePackageService.paymentCourseCallback(code, transaction_id, attach);
+ if (resultUtil.getCode() == 200) {
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
}
- PrintWriter out = response.getWriter();
- out.write(result);
- out.flush();
- out.close();
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
-
/**
* 购买课程支付宝回调
+ *
* @param request
* @param response
*/
@ResponseBody
@PostMapping("/base/course/aliPaymentCourseCallback")
- public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
+ public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
- if(null != map){
+ if (null != map) {
String code = map.get("out_trade_no");
String trade_no = map.get("trade_no");
-
- List<TCoursePackagePayment> list = coursePackagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("state", 1).eq("code", code).eq("payType", 2));
- TCoursePackagePayment one = list.get(0);
- if(one.getPayStatus() == 1){
- for (TCoursePackagePayment coursePackagePayment : list) {
- coursePackagePayment.setPayStatus(2);
- coursePackagePayment.setOrderNumber(trade_no);
- }
- coursePackagePaymentService.updateBatchById(list);
+ String passback_params = map.get("passback_params");
+ ResultUtil resultUtil = coursePackageService.paymentCourseCallback(code, trade_no, passback_params);
+ if (resultUtil.getCode() == 200) {
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
}
- PrintWriter out = response.getWriter();
- out.write("success");
- out.flush();
- out.close();
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
-
/**
* 根据id获取课程数据
+ *
* @param id
* @return
*/
@ResponseBody
@PostMapping("/course/queryCourseById")
- public TCourse queryCourseById(@RequestBody Integer id){
+ public TCourse queryCourseById(@RequestBody Integer id) {
try {
return courseService.getById(id);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -328,29 +385,45 @@
/**
* 根据名称获取数据
+ *
* @param name
* @return
*/
@ResponseBody
@PostMapping("/course/queryCourseByName")
- public List<TCourse> queryCourseByName(@RequestBody String name){
+ public List<TCourse> queryCourseByName(@RequestBody String name) {
try {
return courseService.list(new QueryWrapper<TCourse>().like("name", name).eq("state", 1));
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
}
+ @PostMapping("/course/getPageageType")
+ public List<Map<String, Object>> getPageageType() {
+ List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1));
+ ArrayList<Map<String, Object>> objects = new ArrayList<>();
+ for (TCoursePackageType tCoursePackageType : list) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("id", tCoursePackageType.getId());
+ map.put("name", tCoursePackageType.getName());
+ objects.add(map);
+ }
+ return objects;
+ }
+
+
/**
* 获取课程管理列表数据
+ *
* @param queryCourseList
* @return
*/
@ResponseBody
@PostMapping("/course/queryCourseLists")
- public Page<Map<String, Object>> queryCourseLists(@RequestBody QueryCourseList queryCourseList){
+ public Page<Map<String, Object>> queryCourseLists(@RequestBody QueryCourseList queryCourseList) {
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryCourseList.getLimit(), queryCourseList.getOffset(), queryCourseList.getSort(), queryCourseList.getOrder());
Page<Map<String, Object>> mapPage = page.setRecords(courseService.queryCourseList(page, queryCourseList));
return mapPage;
@@ -359,35 +432,40 @@
/**
* 添加课程
+ *
* @param course
*/
@ResponseBody
@PostMapping("/course/addCourse")
- public void addCourse(@RequestBody TCourse course){
+ public void addCourse(@RequestBody TCourse course) {
+ course.setState(1);
+ course.setInsertTime(new Date());
courseService.save(course);
}
/**
* 编辑数据
+ *
* @param course
*/
@ResponseBody
@PostMapping("/course/editCourse")
- public void editCourse(@RequestBody TCourse course){
+ public void editCourse(@RequestBody TCourse course) {
courseService.updateById(course);
}
/**
* 删除数据
+ *
* @param id
*/
@ResponseBody
@PostMapping("/course/delCourseById")
- public void delCourseById(@RequestBody Integer id){
+ public void delCourseById(@RequestBody Integer id) {
TCourse course = courseService.getById(id);
- if(null != course){
+ if (null != course) {
course.setState(3);
courseService.updateById(course);
}
@@ -396,13 +474,14 @@
/**
* 编辑数据状态
+ *
* @param editCourseState
*/
@ResponseBody
@PostMapping("/course/editCourseState")
- public void editCourseState(@RequestBody EditCourseState editCourseState){
+ public void editCourseState(@RequestBody EditCourseState editCourseState) {
TCourse course = courseService.getById(editCourseState.getId());
- if(null != course){
+ if (null != course) {
course.setState(editCourseState.getState());
courseService.updateById(course);
}
@@ -411,101 +490,224 @@
/**
* 根据类型获取数据
+ *
* @param type
* @return
*/
@ResponseBody
@PostMapping("/course/queryCourseByType")
- public List<TCourse> queryCourseByType(@RequestBody Integer type){
+ public List<TCourse> queryCourseByType(@RequestBody Integer type) {
return courseService.list(new QueryWrapper<TCourse>().eq("type", type).eq("state", 1));
}
- @PostMapping("/course/queryDiscountList")
- public List<DiscountList> queryDiscountList(@RequestBody QueryDiscountList queryDiscountList){
- return discountService.queryDiscountList(queryDiscountList);
- }
- @PostMapping("/course/queryDiscountListAudit")
- public List<DiscountList> queryDiscountListAudit(@RequestBody QueryDiscountList queryDiscountList){
- return discountService.queryDiscountListAudit(queryDiscountList);
- }
-
- @PostMapping("/course/updateState")
- public Boolean updateState( @RequestBody DiscountUpdateState discountUpdateState){
- TCoursePackageDiscount byId = discountService.getById(discountUpdateState.getId());
- List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
- list.forEach(e->e.setStatus(discountUpdateState.getStatus()));
- return discountService.updateBatchById(list);
- }
-
-
- @PostMapping("/course/auditDiscount")
- public Boolean auditDiscount( @RequestBody AuditDiscount auditDiscount){
- TCoursePackageDiscount byId = discountService.getById(auditDiscount.getId());
- List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
- for (TCoursePackageDiscount tCoursePackageDiscount : list) {
- tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
- tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
+ @PostMapping("/course/queryPackageById")
+ public List<String> queryPackageById(@RequestBody Integer coursePackageId) {
+ ArrayList<String> strings = new ArrayList<>();
+ TCoursePackage byId = coursePackageService.getById(coursePackageId);
+ if(null == byId){
+ return null;
}
+ Integer coursePackageTypeId = byId.getCoursePackageTypeId();
+ strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
+ strings.add(byId.getName());
+ return strings;
- return discountService.updateBatchById(list);
+ }
+
+ // 获取课包商品的价格配置
+ @PostMapping("/course/getHoursByPackageId")
+ @ResponseBody
+ public List<CoursePackagePaymentConfig> getHoursByPackageId(@RequestBody Integer coursePackageId1) {
+ List<CoursePackagePaymentConfig> coursePackageId = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId", coursePackageId1));
+ return coursePackageId;
+ }
+
+ @PostMapping("/course/getHours")
+ public List<Integer> getHours(@RequestBody Integer coursePackageId1) {
+ return coursePackageService.getHours(coursePackageId1);
}
@PostMapping("/course/queryByDiscountId")
- public TCoursePackage queryByDiscountId(@RequestBody Integer id){
+ public TCoursePackage queryByDiscountId(@RequestBody Integer id) {
TCoursePackageDiscount byId = discountService.getById(id);
TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
return byId1;
}
+ @ResponseBody
+ @PostMapping("/course/queryByDiscountId1")
+ public TCoursePackage queryByDiscountId1(@RequestBody Integer id) {
+ TCoursePackageDiscount byId = discountService.getById(id);
+ TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
+ return byId1;
+ }
+
+
@PostMapping("/course/queryDiscountById")
- public Integer queryDiscountById(@RequestBody Integer id){
+ public Integer queryDiscountById(@RequestBody Integer id) {
TCoursePackageDiscount byId = discountService.getById(id);
return byId.getAuditStatus();
}
+ @PostMapping("/course/queryDiscountList")
+ public List<DiscountList> queryDiscountList(@RequestBody QueryDiscountList queryDiscountList) {
+ return discountService.queryDiscountList(queryDiscountList);
+ }
+
+ @PostMapping("/course/queryDiscountListAudit")
+ public List<DiscountList> queryDiscountListAudit(@RequestBody QueryDiscountList queryDiscountList) {
+ return discountService.queryDiscountListAudit(queryDiscountList);
+ }
- @PostMapping("/course/getPageageType")
- public List<Map<String, Object>> getPageageType(){
- List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1));
- ArrayList<Map<String, Object>> objects = new ArrayList<>();
- for (TCoursePackageType tCoursePackageType : list) {
- HashMap<String, Object> map = new HashMap<>();
- map.put("id",tCoursePackageType.getId());
- map.put("name",tCoursePackageType.getName());
- objects.add(map);
+ @PostMapping("/course/updateState")
+ public Boolean updateState(@RequestBody DiscountUpdateState discountUpdateState) {
+ TCoursePackageDiscount byId = discountService.getById(discountUpdateState.getId());
+ List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
+ list.forEach(e -> e.setStatus(discountUpdateState.getStatus()));
+ return discountService.updateBatchById(list);
+ }
+
+
+ @PostMapping("/course/auditDiscount")
+ public Boolean auditDiscount(@RequestBody AuditDiscount auditDiscount) {
+ List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>()
+ .eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId()));
+ for (TCoursePackageDiscount tCoursePackageDiscount : list) {
+ tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
+ tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
}
- return objects;
+ return discountService.updateBatchById(list);
+ }
+
+ @Autowired
+ private ICoursePackagePaymentConfigService packagePaymentConfigService;
+
+ @PostMapping("/course/times")
+ public List<SelectDto> times(@RequestBody Integer oneId) {
+ List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId", oneId));
+ List<SelectDto> integerList = new ArrayList<>();
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : list) {
+// integerList.add(coursePackagePaymentConfig.getClassHours());
+ SelectDto selectDto = new SelectDto();
+ selectDto.setId(coursePackagePaymentConfig.getId());
+ selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
+ integerList.add(selectDto);
+ }
+ return integerList;
+ }
+
+ @PostMapping("/course/queryFee")
+ public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee) {
+ HashMap<String, Object> map = new HashMap<>();
+ String data = queryDataFee.getData();
+ List<Integer> storeIds = queryDataFee.getIds() == null
+ ? new ArrayList<>() : new ArrayList<>(queryDataFee.getIds());
+ if (storeIds.isEmpty()) {
+ storeIds.add(-1);
+ }
+
+ // 购课记录页使用分表 union 查询。统计也必须使用同一数据源，否则落在
+ // t_course_package_order1~5 的订单（例如测试的 0.01 元订单）不会被统计到。
+ CoursePackagePaymentQuery paymentQuery = new CoursePackagePaymentQuery();
+ paymentQuery.setStoreIds(storeIds);
+ paymentQuery.setPayStatus(2);
+ List<CoursePackagePaymentVO> list = coursePackagePaymentService.listAll(paymentQuery);
+ Date startTime = null;
+ Date endTime = null;
+ if (ToolUtil.isNotEmpty(data)) {
+ try {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ startTime = formatter.parse(data.split(" - ")[0] + " 00:00:00");
+ endTime = formatter.parse(data.split(" - ")[1] + " 23:59:59");
+ } catch (Exception ignored) {
+ // 与旧实现一致：页面时间格式异常时不额外限制时间范围。
+ }
+ }
+ final Date queryStartTime = startTime;
+ final Date queryEndTime = endTime;
+ list = list.stream()
+ .filter(payment -> payment.getCashPayment() != null)
+ .filter(payment -> queryStartTime == null || payment.getInsertTime() == null
+ || (!payment.getInsertTime().before(queryStartTime)
+ && !payment.getInsertTime().after(queryEndTime)))
+ .collect(Collectors.toList());
+ double v = list.stream().map(CoursePackagePaymentVO::getCashPayment)
+ .reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ // 课类型
+ List<TCoursePackageType> list1 = coursePackageTypeService.list(
+ new LambdaQueryWrapper<TCoursePackageType>().ne(TCoursePackageType::getState, 3));
+
+ ArrayList<HashMap<String, Object>> hashMaps = new ArrayList<>();
+
+ for (TCoursePackageType tCoursePackageType : list1) {
+ HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+ objectObjectHashMap.put("name", tCoursePackageType.getName());
+ double a = 0;
+ for (CoursePackagePaymentVO payment : list) {
+ if (tCoursePackageType.getId().equals(payment.getCoursePackageTypeId())) {
+ a += payment.getCashPayment().doubleValue();
+ }
+ }
+ objectObjectHashMap.put("value", a);
+ hashMaps.add(objectObjectHashMap);
+ }
+
+ HashMap<String, Object> map1 = new HashMap<>();
+ map1.put("fee", v);
+ map1.put("data", hashMaps);
+
+ return map1;
}
- @PostMapping("/course/queryByTypeId")
- public List<TCoursePackage> queryByTypeId(@RequestBody Integer oneId){
- return coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getCoursePackageTypeId,oneId).eq(TCoursePackage::getAuditStatus,2).eq(TCoursePackage::getState,1));
+ /**
+ * 课包支付成功后排课操作
+ * @param addCoursePackageOrderStudent
+ */
+ @PostMapping("/course/addCoursePackageOrderStudent")
+ public void addCoursePackageOrderStudent(@RequestBody AddCoursePackageOrderStudent addCoursePackageOrderStudent){
+ coursePackageService.addCoursePackageOrderStudent(addCoursePackageOrderStudent.getCoursePackageOrderId(), addCoursePackageOrderStudent.getCoursePackagePaymentConfig());
}
- @PostMapping("/course/queryByConfigId")
- public List<Map<String, Object>> queryByConfigId(@RequestBody Integer oneId){
- return coursePackageService.queryByConfigId(oneId);
+ /**
+ * 根据code获取待支付数据
+ * @param code
+ * @return
+ */
+ @PostMapping("/course/getCoursePackageOrderByCode")
+ public CoursePackageOrder getCoursePackageOrderByCode(@RequestBody String code){
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
+ .eq("code", code).eq("state", 1));
+ return coursePackageOrder;
}
- @PostMapping("/course/queryPackageById")
- public List<String> queryPackageById(@RequestBody Integer coursePackageId){
- ArrayList<String> strings = new ArrayList<>();
- TCoursePackage byId = coursePackageService.getById(coursePackageId);
- Integer coursePackageTypeId = byId.getCoursePackageTypeId();
- strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
- strings.add(byId.getName());
-
- return strings;
-
+ /**
+ * 修改数据
+ * @param coursePackageOrder
+ */
+ @PostMapping("/course/updateCoursePackageOrder")
+ public void updateCoursePackageOrder(@RequestBody CoursePackageOrder coursePackageOrder){
+ coursePackageOrder.setAppUserId(null);
+ coursePackageOrderService.updateById(coursePackageOrder);
}
- @PostMapping("/course/getHours")
- public String getHours(@RequestBody Integer coursePackageId1){
- return coursePackageService.getHours(coursePackageId1);
+
+ /**
+ * 获取课包配置
+ * @param getCoursePackagePaymentConfig
+ * @return
+ */
+ @PostMapping("/course/getCoursePackagePaymentConfig")
+ public CoursePackagePaymentConfig getCoursePackagePaymentConfig(@RequestBody GetCoursePackagePaymentConfig getCoursePackagePaymentConfig){
+ CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId", getCoursePackagePaymentConfig.getCoursePackageId())
+ .eq("classHours", getCoursePackagePaymentConfig.getClassHours())
+ );
+ return coursePackagePaymentConfig;
}
}
--
Gitblit v1.7.1