From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +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/controller/CourseController.java | 190 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 169 insertions(+), 21 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 337f37d..74fc79f 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
@@ -5,23 +5,15 @@
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.TCourse;
-import com.dsh.course.entity.TCoursePackage;
-import com.dsh.course.entity.TCoursePackagePayment;
-import com.dsh.course.entity.TCoursePackageType;
+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.util.PageFactory;
-import com.dsh.course.util.PayMoneyUtil;
-import com.dsh.course.util.ResultUtil;
-import com.dsh.course.util.TokenUtil;
+import com.dsh.course.service.*;
+import com.dsh.course.util.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -35,10 +27,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.util.*;
+import java.util.stream.Collectors;
@Api
@CrossOrigin
@@ -66,6 +57,11 @@
@Autowired
private TCoursePackagePaymentService coursePackagePaymentService;
+ @Autowired
+ private TCoursePackageDiscountService discountService;
+ @Autowired
+ private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+
/**
* 上/下架 1为上架 2为下架 3为删除
*
@@ -74,7 +70,6 @@
@RequestMapping("/base/course/changeState")
@ResponseBody
public Object changeState(@RequestBody CourseChangeStateDTO dto){
-
return courseService.changeState(dto);
}
@@ -180,7 +175,7 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", 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,Long payId){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -203,7 +198,7 @@
@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){
@@ -284,6 +279,7 @@
@PostMapping("/base/course/aliPaymentCourseCallback")
public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
try {
+ System.err.println("=====支付宝回调=======");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String code = map.get("out_trade_no");
@@ -295,6 +291,7 @@
for (TCoursePackagePayment coursePackagePayment : list) {
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setOrderNumber(trade_no);
+ coursePackagePayment.setAppUserId(null);
}
coursePackagePaymentService.updateBatchById(list);
}
@@ -306,6 +303,14 @@
}catch (Exception e){
e.printStackTrace();
}
+ }
+
+
+ //分账
+ public void moneyOut(){
+
+
+
}
@@ -378,6 +383,8 @@
@ResponseBody
@PostMapping("/course/addCourse")
public void addCourse(@RequestBody TCourse course){
+ course.setState(1);
+ course.setInsertTime(new Date());
courseService.save(course);
}
@@ -446,9 +453,150 @@
return strings;
}
-
+ // 获取课包商品的价格配置
+ @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 String getHours(@RequestBody Integer coursePackageId1){
+ public List<Integer> getHours(@RequestBody Integer coursePackageId1){
return coursePackageService.getHours(coursePackageId1);
}
+
+ @PostMapping("/course/queryByDiscountId")
+ 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){
+ 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/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 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> ids = queryDataFee.getIds();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+
+ LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(data)){
+ String stime = data.split(" - ")[0]+" 00:00:00";
+ String etime = data.split(" - ")[1]+" 23:59:59";
+ wrapper.between(TCoursePackagePayment::getInsertTime,stime,etime);
+ }
+ wrapper.in(TCoursePackagePayment::getAppUserId,ids);
+ wrapper.eq(TCoursePackagePayment::getPayStatus,2);
+ ArrayList<Integer> objects = new ArrayList<>();
+ objects.add(1);
+ objects.add(2);
+ objects.add(5);
+ objects.add(6);
+ wrapper.in(TCoursePackagePayment::getPayType,objects);
+ List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper);
+ double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ //
+ List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
+ // 课类型
+ List<TCoursePackageType> list1 = coursePackageTypeService.list();
+
+ for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (TCoursePackage tCoursePackage : list2) {
+ if(tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())){
+ tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
+ }
+ }
+ }
+
+ 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 (TCoursePackagePayment tCoursePackagePayment : list) {
+ if(tCoursePackagePayment.getType().equals(tCoursePackageType.getId())){
+ a += tCoursePackagePayment.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;
+ }
}
--
Gitblit v1.7.1