From c5cb162b5cbdb589e97290fba3ac3e9241ec48d4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 15:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 2
cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java | 3 +
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js | 33 +++++++----
cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml | 3
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 1
cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseOfVideoResponse.java | 3 +
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java | 6 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 47 ++++++++++++---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 9 +++
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/ExerciseVideo.java | 7 ++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 9 +-
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 2
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 13 ++++
13 files changed, 107 insertions(+), 31 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java
index 4949042..56bb556 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java
@@ -4,6 +4,8 @@
import com.dsh.account.service.ICityManagerService;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+
/**
* @author zhibing.pu
* @Date 2023/8/1 17:06
@@ -12,6 +14,7 @@
@RequestMapping("")
public class CityManagerController {
+ @Resource
private ICityManagerService cityManagerService;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 54d0be4..fea3f03 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -507,7 +507,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
@ApiImplicitParam(value = "预约状态 0=全部 1=待上课 2=已完成 3=已取消", name = "appointStatus", required = false, dataType = "int"),
- @ApiImplicitParam(value = "时间类型 0=全部 1=近一周 2=近一个月 3=近一年", name = "appointStatus", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "时间类型 0=全部 1=近一周 2=近一个月 3=近一年", name = "timeType", required = false, dataType = "int"),
@ApiImplicitParam(value = "课程名称", name = "appointStatus", required = false, dataType = "string"),
})
public ResultUtil<AppointmentRecordVo> cgeClassAppointmentRecordList(Integer stuId,Integer appointStatus,Integer timeType,String search){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java
index a2e9ee6..da8ffa3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ExerciseVideo.java
@@ -14,4 +14,10 @@
@ApiModelProperty(value = "课后视频标题")
private String videoName;
+
+ @ApiModelProperty(value = "课后视频id")
+ private Integer videoId;
+
+ @ApiModelProperty(value = "课包id")
+ private Integer coursePackageId;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 4159cca..fa86654 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -600,6 +600,15 @@
return ResultUtil.success();
}
+ /**
+ *
+ * @param stuId 学员id
+ * @param appUserId 用户id
+ * @param appointStatus 预约状态 0=全部 1=待上课 2=已完成 3=已取消
+ * @param timeType 时间类型 0=全部 1=近一周 2=近一个月 3=近一年
+ * @param search 课程名称
+ * @return
+ */
@Override
public AppointmentRecordVo getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) {
AppointmentRecordVo recordVo = new AppointmentRecordVo();
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/ExerciseVideo.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/ExerciseVideo.java
index e753874..750f023 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/ExerciseVideo.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/ExerciseVideo.java
@@ -14,4 +14,11 @@
@ApiModelProperty(value = "课后视频标题")
private String videoName;
+
+
+ @ApiModelProperty(value = "课后视频id")
+ private Integer videoId;
+
+ @ApiModelProperty(value = "课包id")
+ private Integer coursePackageId;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseOfVideoResponse.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseOfVideoResponse.java
index cc156f2..f7a1252 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseOfVideoResponse.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseOfVideoResponse.java
@@ -34,4 +34,7 @@
@ApiModelProperty(value = "课程介绍图片")
private String detailedDiagram;
+ @ApiModelProperty("封面图")
+ private String cover;
+
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 337a5c9..6e19834 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -172,6 +172,7 @@
response.setPackageName(coursePackage.getName());
response.setSynopsis(videosWithIds.getIntroduction());
response.setDetailedDiagram(coursePackage.getIntroduceDrawing());
+ response.setCover(videosWithIds.getCover());
}
return response;
@@ -583,12 +584,10 @@
recordVo.setCourseStuRecordId(coursePackageStudent.getId());
String classWeeks = coursePackage.getClassWeeks();
String[] split = classWeeks.split(";");
- List<Integer> integerList = Arrays.stream(split)
- .map(Integer::parseInt)
- .collect(Collectors.toList());
- int dayOfWeek = DateTimeHelper.getDayOfWeek(new Date());
+ List<String> integerList = Arrays.asList(split);
+ String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
- if (integerList.contains(dayOfWeek)){
+ if (integerList.contains(weekOfDate)){
String dat = simpleDateFormat.format(date) +" "+ classStartTime;
Date start = null;
diff --git a/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml b/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml
index fefaf6b..fc0e8cb 100644
--- a/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="com.dsh.course.mapper.PostCourseVideoMapper">
<select id="queryCourseOfVideos" resultType="com.dsh.course.feignclient.model.ExerciseVideo">
- SELECT tc.introduce as videoName, tc.coverDrawing as videoCoverImgUrl, tc.courseVideo as videoUrl
+ SELECT tc.introduce as videoName, tc.coverDrawing as videoCoverImgUrl, tc.courseVideo as videoUrl,
+ courseId as videoId,coursePackageId
FROM t_post_course_video tpcv
LEFT JOIN t_course tc on tc.id = tpcv.courseId
where tc.state = 1
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index 2d2a0a6..fa94e82 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -7,9 +7,7 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import java.util.List;
import java.util.Map;
/**
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 37a4b49..d26a70f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.feignClient.account.CityManagerClient;
+import com.dsh.course.feignClient.account.model.CityManager;
import com.dsh.course.feignClient.activity.CouponClient;
import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
import com.dsh.guns.config.UserExt;
@@ -45,10 +47,15 @@
private IRegionService regiService;
@Resource
+ private IStoreService storeService;
+
+ @Resource
private CouponClient client;
@Resource
- private IStoreService storeService;
+ private CityManagerClient cmgrClient;
+
+
/**
* 跳转到优惠券管理首页
@@ -79,16 +86,38 @@
return PREFIX + "TStoreList.html";
}
- @RequestMapping("/storeList")
+ @RequestMapping("/storeDetailsOfSearch")
@ResponseBody
- public Object listOfStore(Integer province,Integer cityCode,Integer cityManagerId,String storeName){
- Region provinceRegion = regiService.getById(province);
- Region cityRegion = regiService.getById(cityCode);
+ public Object listOfStore(Integer provinceId,Integer cityId,Integer cityManagerId,String storeName){
+ System.out.println("provinceId"+provinceId);
+ System.out.println("cityId"+cityId);
+ System.out.println("cityManagerId"+cityManagerId);
+ System.out.println("storeName"+storeName);
+ String provinceCode = null;
+ String cityCode = null;
+ if (ToolUtil.isNotEmpty(provinceId)){
+ Region provinceRegion = regiService.getById(provinceId);
+ provinceCode = provinceRegion.getCode();
+ }
+ if (ToolUtil.isNotEmpty(cityId)){
+ Region cityRegion = regiService.getById(cityId);
+ provinceCode = cityRegion.getCode();
+ }
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceRegion.getCode(),cityRegion.getCode(),cityManagerId,storeName,page);
-
-
- return null;
+ List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceCode,cityCode,cityManagerId,storeName,page);
+ if (storeList.size() > 0 ){
+ for (Map<String, Object> stringObjectMap : storeList) {
+ String provinceName = (String) stringObjectMap.get("province");
+ String cityName = (String) stringObjectMap.get("city");
+ stringObjectMap.put("provinceCity",provinceName+cityName);
+ Integer managerId = (Integer) stringObjectMap.get("cityManagerId");
+ CityManager cityManager = cmgrClient.queryCityManagerById(managerId);
+ if (ToolUtil.isNotEmpty(cityManager)){
+ stringObjectMap.put("accountName",cityManager.getName()+"+"+cityManager.getPhone());
+ }
+ }
+ }
+ return storeList;
}
/**
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 3b8bfc2..0dd0a94 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -44,5 +44,18 @@
<select id="queryListOfpage" resultType="java.util.Map">
SELECT id, cityManagerId, province, city, `name`
from t_store
+ where 1=1
+ <if test="provinceCode != null">
+ and provinceCode = #{provinceCode}
+ </if>
+ <if test="cityCode != null">
+ and cityCode = #{cityCode}
+ </if>
+ <if test="cityManagerId != null">
+ and cityManagerId = #{cityManagerId}
+ </if>
+ <if test="storeName != null and storeName != ' '">
+ and `name` like CONCAT('%',#{storeName},'%')
+ </if>
</select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
index d3005f7..1757922 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TStoreInfo.js
@@ -52,12 +52,17 @@
*/
TStoreProvince.search = function () {
var queryData = {};
- queryData['name'] = $("#name").val();
- queryData['type'] = $("#type").val();
- queryData['distributionMethod'] = $("#distributionMethod").val();
- queryData['userPopulation'] = $("#userPopulation").val();
- queryData['status'] = $("#status").val();
- queryData['state'] = $("#state").val();
+
+ var provinceElement = document.getElementById("province");
+ var provinceId = provinceElement.value;
+
+ var cityElement = document.getElementById("city");
+ var cityElementId = cityElement.value;
+
+ queryData['provinceId'] = provinceId;
+ queryData['cityId'] = cityElementId;
+ queryData['cityManagerId'] = $("#userPopulation").val();
+ queryData['storeName'] = $("#storeName").val();
TStoreProvince.table.refresh({query: queryData});
};
@@ -66,12 +71,16 @@
* 重置搜索
*/
TStoreProvince.resetSearch = function () {
- $("#name").val('');
- $("#type").val('');
- $("#distributionMethod").val('');
+ var provinceSelect = document.getElementById("province");
+ provinceSelect.innerHTML = '<option value="">全部</option>';
+
+ var citySelect = document.getElementById("city");
+ citySelect.innerHTML = '<option value="">全部</option>';
+
+ queryProvince();
+
$("#userPopulation").val('');
- $("#status").val('');
- $("#state").val('');
+ $("#storeName").val('');
TStoreProvince.search();
};
@@ -120,7 +129,7 @@
$(function () {
var defaultColunms = TStoreProvince.initColumn();
- var table = new BSTable(TStoreProvince.id, "/tCouponManage/storeList", defaultColunms);
+ var table = new BSTable(TStoreProvince.id, "/tCouponManage/storeDetailsOfSearch", defaultColunms);
table.setPaginationType("client");
TStoreProvince.table = table.init();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 5290264..2b687cd 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -223,7 +223,6 @@
* @return
*/
@ResponseBody
- @PostMapping("/store/queryStoreById")
public Store queryStoreById(@RequestBody Integer id){
try {
return storeService.getById(id);
--
Gitblit v1.7.1