From a50c7d1497d7f707b79597553d9db978ba7e9dd5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 08:59:12 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java | 5 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java | 9 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java | 55 ++++++++----------
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java | 5 +
ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml | 33 +++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java | 16 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CallBackController.java | 23 ++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java | 2
12 files changed, 112 insertions(+), 46 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CallBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CallBackController.java
index 38b533c..0bda315 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CallBackController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CallBackController.java
@@ -62,16 +62,16 @@
if (check) {
one.setPaymentStatus(2);
orderService.updateById(one);
- if (one.getGoodType()==1){
- try {
- TCourse byId = courseService.getById(one.getGoodId());
- byId.setBuyNum(byId.getBuyNum()+1);
- courseService.updateById(byId);
- }catch (Exception e){
- e.printStackTrace();
- }
-
- }
+// if (one.getGoodType()==1){
+// try {
+// TCourse byId = courseService.getById(one.getGoodId());
+// byId.setBuyNum(byId.getBuyNum()+1);
+// courseService.updateById(byId);
+// }catch (Exception e){
+// e.printStackTrace();
+// }
+//
+// }
return R.ok();
}else {
return R.fail("请支付");
@@ -124,12 +124,13 @@
amountReq.setTotal(byId.getPaymentAmount().multiply(BigDecimal.valueOf(100)).longValue());
amountReq.setCurrency("CNY");
createRequest.setAmount(amountReq);
- createRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
+ createRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy");
createRequest.setOutTradeNo(byId.getCode());
createRequest.setOutRefundNo("TK" + WeChatUtil.generateTradeNumber());
Refund refund = refundService.create(createRequest);
byId.setPaymentStatus(3);
+ byId.setCancelTime(LocalDateTime.now());
orderService.updateById(byId);
}catch (Exception e){
e.printStackTrace();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
index cb3c74d..2c6aad6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
@@ -153,6 +153,12 @@
record.setStudyNum(cacheSet1.size());
}
+ Long count = orderService.lambdaQuery()
+ .eq(TOrder::getGoodId, record.getId())
+ .eq(TOrder::getGoodType, 1)
+ .eq(TOrder::getPaymentStatus, 2).count();
+ record.setBuyNum(Integer.parseInt(String.valueOf(count)));
+
}
return R.ok(page);
}
@@ -313,7 +319,7 @@
prepayRequest.setMchid(weChatConfig.merchantId);
prepayRequest.setOutTradeNo(byId.getCode());
prepayRequest.setDescription("购买课程");
- prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
+ prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy");
com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
amount.setTotal(byId.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
prepayRequest.setAmount(amount);
@@ -391,6 +397,14 @@
if (!cacheSet.isEmpty()) {
Page<TCourse> page = courseService.lambdaQuery().in(TCourse::getId, cacheSet).page(Page.of(basePage.getPageNum(), basePage.getPageSize()));
+ for (TCourse record : page.getRecords()) {
+ Set<Object> cacheSet1 = redisCache.getCacheSet("STUDY:" + record.getId());
+ if (cacheSet1==null){
+ record.setStudyNum(0);
+ }else {
+ record.setStudyNum(cacheSet1.size());
+ }
+ }
return R.ok(page);
}else {
return R.ok(new Page<>());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
index 761f523..1f27cd9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
@@ -164,7 +164,7 @@
prepayRequest.setMchid(weChatConfig.merchantId);
prepayRequest.setOutTradeNo(byId1.getCode());
prepayRequest.setDescription("生成工作总结");
- prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
+ prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy");
com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
amount.setTotal(payMoney.multiply(BigDecimal.valueOf(100)).intValue());
prepayRequest.setAmount(amount);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
index 129ab75..71782a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIndexMenuController.java
@@ -215,7 +215,6 @@
Long userId = tokenService.getLoginUser().getUserId();
TAppUser byId = appUserService.getById(userId);
Long cacheObject = redisCache.getCacheObject("ALLERT:"+userId);
-
if (cacheObject!=null && byId.getIsSetPreference() == 1){
return R.ok(cacheObject == 1);
}else {
@@ -223,6 +222,14 @@
}
}
+ @ApiOperation(value = "取消顶部提示",tags = {"web-取消顶部提示"})
+ @PostMapping(value = "/cancelAllert")
+ public R cancelAllert() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ redisCache.deleteObject("ALLERT:"+userId);
+ return R.ok();
+ }
+
@ApiOperation(value = "数据统计",tags = {"后台-统计"})
@PostMapping(value = "/count")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
index 407aa32..da277cf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
@@ -274,7 +274,7 @@
prepayRequest.setMchid(weChatConfig.merchantId);
prepayRequest.setOutTradeNo(byId1.getCode());
prepayRequest.setDescription("购买资料");
- prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
+ prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy");
com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
amount.setTotal(i);
prepayRequest.setAmount(amount);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
index 871a7be..67e9f35 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -130,6 +130,11 @@
byId3.setAvatar(byId4.getAvatar());
course.setOrder(byId3);
+ Long count = orderService.lambdaQuery()
+ .eq(TOrder::getGoodId, course.getId())
+ .eq(TOrder::getGoodType, 1)
+ .eq(TOrder::getPaymentStatus, 2).count();
+ course.setBuyNum(Integer.parseInt(String.valueOf(count)));
return R.ok(course);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
index b410701..c7283a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
@@ -82,6 +82,9 @@
@PostMapping(value = "/edit")
public R edit(@RequestBody TTechnicalTitle tTechnicalTitle){
tTechnicalTitleService.updateById(tTechnicalTitle);
+
+ // 修改专业的地区
+ majorService.lambdaUpdate().eq(TTitleMajor::getTechnicalId, tTechnicalTitle.getId()).set(TTitleMajor::getRegionIds, tTechnicalTitle.getRegionIds()).update();
return R.ok();
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java
index 53a8f8c..4c9651a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java
@@ -129,8 +129,6 @@
public R export (@RequestParam("file") MultipartFile file) {
List<TTitleMajor> tTechnicalTitles = new ArrayList<>();
-
-
int errorLines = 0;
int successLines = 0;
ImportParams params = new ImportParams();
@@ -146,47 +144,44 @@
List<MahorImportExcel> techImportExcels = ExcelImportUtil.importExcel(inputStream, MahorImportExcel.class, params);
for (MahorImportExcel techImportExcel : techImportExcels) {
- List<Integer> regionIds;
- if (techImportExcel.getAddress() == null || StringUtils.isEmpty(techImportExcel.getAddress())) {
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不能为空";
- failMsg.add(msg);
- continue;
- } else {
- String[] split = techImportExcel.getAddress().split(";");
- regionIds = new ArrayList<>();
- for (String s : split) {
- TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
- if (region == null) {
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在";
- failMsg.add(msg);
- } else {
- regionIds.add(region.getId());
- }
- }
- if (regionIds.size() != split.length) {
- continue;
- }
-
- }
+// List<Integer> regionIds;
+// if (techImportExcel.getAddress() == null || StringUtils.isEmpty(techImportExcel.getAddress())) {
+// msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,地区不能为空";
+// failMsg.add(msg);
+// continue;
+// } else {
+// String[] split = techImportExcel.getAddress().split(";");
+// regionIds = new ArrayList<>();
+// for (String s : split) {
+// TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
+// if (region == null) {
+// msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,地区不存在";
+// failMsg.add(msg);
+// } else {
+// regionIds.add(region.getId());
+// }
+// }
+// if (regionIds.size() != split.length) {
+// continue;
+// }
+//
+// }
TTitleMajor tTechnicalTitle = new TTitleMajor();
if (techImportExcel.getTitileName()==null||StringUtils.isEmpty(techImportExcel.getTitileName())){
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,职称名称不能为空";
+ msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,职称名称不能为空";
failMsg.add(msg);
continue;
}else {
TTechnicalTitle one = tTechnicalTitleService.lambdaQuery().eq(TTechnicalTitle::getTitileName, techImportExcel.getTitileName()).last("limit 1").one();
if (one!=null){
tTechnicalTitle.setTechnicalId(one.getId());
+ tTechnicalTitle.setRegionIds(one.getRegionIds());
}else {
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,职称名称不存在";
+ msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,职称名称不存在";
failMsg.add(msg);
continue;
}
}
-
-
-
- tTechnicalTitle.setRegionIds(StringUtils.join(regionIds, ","));
tTechnicalTitle.setMajorName(techImportExcel.getMajorName());
tTechnicalTitles.add(tTechnicalTitle);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
index f0594ed..2838e9b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
@@ -20,4 +20,7 @@
List<Long> getNewIds(@Param("appUserQuery") AppUserQuery appUserQuery);
List<Long> getLateIds(@Param("appUserQuery") AppUserQuery appUserQuery);
+
+ List<Long> getNewIds1(@Param("appUserQuery")AppUserQuery appUserQuery);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
index 76e7b7f..63d6399 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
@@ -23,4 +23,6 @@
List<Long> getLateIds(AppUserQuery appUserQuery);
+ List<Long> getNewIds1(AppUserQuery appUserQuery);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
index 3a212f9..e23e64d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -35,5 +35,8 @@
return this.baseMapper.getLateIds(appUserQuery);
}
-
+ @Override
+ public List<Long> getNewIds1(AppUserQuery appUserQuery) {
+ return this.baseMapper.getNewIds1(appUserQuery);
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
index 79bee98..443674d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
@@ -63,6 +63,39 @@
</where>
GROUP BY au.id
</select>
+ <select id="getNewIds1" resultType="java.lang.Long">
+ SELECT
+ au.id AS user_id
+ FROM
+ t_app_user au
+ LEFT JOIN (
+ SELECT
+ id,
+ user_id,
+ MAX(create_time) AS newest_create_time
+ FROM
+ t_user_change
+ WHERE
+ is_delete = 0
+ GROUP BY user_id
+ ) uc_newest ON au.id = uc_newest.user_id
+ LEFT JOIN t_user_change_detail td on td.change_id = uc_newest.id
+ <where>
+ <if test="appUserQuery.majorId1 != null">
+ AND td.major_id = #{appUserQuery.majorId1}
+ </if>
+ <if test="appUserQuery.titleId1 != null">
+ AND td.title_id = #{appUserQuery.titleId1}
+ </if>
+ <if test="appUserQuery.regionId1 != null">
+ AND td.region_id = #{appUserQuery.regionId1}
+ </if>
+ <if test="appUserQuery.levelId1 != null">
+ AND td.level_id = #{appUserQuery.levelId1}
+ </if>
+ </where>
+ GROUP BY au.id
+ </select>
<select id="getLateIds" resultType="java.lang.Long">
SELECT
au.id AS user_id
--
Gitblit v1.7.1