From 70fab9b9607f18df92fc2c7c0efced0dcd55d5fc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 三月 2026 09:46:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java | 3 +
ruoyi-applet/src/main/resources/application.yml | 2
generator/src/test/java/com/laboratory/CodeGeneratorTests.java | 10 ++--
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java | 39 +++++++++++--------
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java | 8 ++++
5 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/generator/src/test/java/com/laboratory/CodeGeneratorTests.java b/generator/src/test/java/com/laboratory/CodeGeneratorTests.java
index 4191df7..ea7cac5 100644
--- a/generator/src/test/java/com/laboratory/CodeGeneratorTests.java
+++ b/generator/src/test/java/com/laboratory/CodeGeneratorTests.java
@@ -20,7 +20,7 @@
private static final String DRIVER_NAME = "com.mysql.cj.jdbc.Driver";
- private static final String JDBC_URL = "jdbc:mysql://127.0.0.1:3306/mobile_community?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";
+ private static final String JDBC_URL = "jdbc:mysql://192.168.110.34:3306/xprt_operation?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";
private static final String USER_NAME = "root";
private static final String PASSWORD = "123456";
@@ -35,9 +35,9 @@
// 全局配置
GlobalConfig gc = new GlobalConfig();
- String projectPath = "F:\\workSpace\\mobile_community\\generator";
+ String projectPath = "F:\\daimashengcheng";
gc.setOutputDir(projectPath + "/src/main/java")
- .setAuthor("xiaochen")
+ .setAuthor("liu")
.setMapperName("%sMapper")
.setXmlName("%sMapper")
.setServiceName("%sService")
@@ -124,7 +124,7 @@
strategy.setEntityLombokModel(true);//是否启动lombok
strategy.setRestControllerStyle(true);//是否生成resetController
- strategy.setLogicDeleteFieldName("disabled");
+ strategy.setLogicDeleteFieldName("isDeleted");
// 字段自动操作策略
/* List<TableFill> tableFillList = new ArrayList<>();
@@ -144,7 +144,7 @@
// strategy.setTablePrefix(pc.getModuleName() + "");
// strategy.setLikeTable(new LikeTable("room"));
//strategy.setLikeTable(new LikeTable("member"));
- strategy.setLikeTable(new LikeTable("t_"));// 生成表名
+ strategy.setLikeTable(new LikeTable("xp_"));// 生成表名
// strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
// strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名
// strategy.setNotLikeTable(new LikeTable("hotel_info"));// 不生成表名
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
index 1c29729..46784de 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -97,15 +98,15 @@
@PostMapping("/getMicroWishList")
public R<Page<TMicroWish>> getMicroWishList(@RequestBody MicroWishListQuery query) {
Page<TMicroWish> page = new Page<>(query.getPageNum(), query.getPageSize());
- Page<TMicroWish> tMicroWishPage = tMicroWishService.page(page, new LambdaQueryWrapper<TMicroWish>().eq(TMicroWish::getWishType, 1).eq(TMicroWish::getState,1).eq(TMicroWish::getStatus, 2).like(Objects.nonNull(query.getWishDescription()), TMicroWish::getWishDescription, query.getWishDescription()).orderByDesc(BaseModel::getCreateTime));
+ Page<TMicroWish> tMicroWishPage = tMicroWishService.page(page, new LambdaQueryWrapper<TMicroWish>().eq(TMicroWish::getWishType, 1).eq(TMicroWish::getState, 1).eq(TMicroWish::getStatus, 2).like(Objects.nonNull(query.getWishDescription()), TMicroWish::getWishDescription, query.getWishDescription()).orderByDesc(BaseModel::getCreateTime));
List<TMicroWish> records = tMicroWishPage.getRecords();
List<String> appUserIds = records.stream().map(TMicroWish::getAppUserId).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(appUserIds)){
+ if (!CollectionUtils.isEmpty(appUserIds)) {
List<TAppUser> appUsers = appUserService.list(Wrappers.lambdaQuery(TAppUser.class)
.in(TAppUser::getId, appUserIds));
for (TMicroWish microWish : records) {
List<TAppUser> appUserList = appUsers.stream().filter(appUser -> microWish.getAppUserId().equals(appUser.getId())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(appUserList)){
+ if (!CollectionUtils.isEmpty(appUserList)) {
microWish.setUserName(appUserList.get(0).getNickName());
}
}
@@ -120,9 +121,9 @@
public R<?> addMicroWish(@RequestBody TMicroWish dto) {
String userId = tokenService.getLoginUserApplet().getUserId();
dto.setAppUserId(userId);
- if(dto.getWishType() == 1){
+ if (dto.getWishType() == 1) {
dto.setStatus(1);
- }else {
+ } else {
dto.setStatus(4);
}
tMicroWishService.save(dto);
@@ -142,17 +143,17 @@
Page<TCommunityActivity> tCommunityActivityPage = tCommunityActivityService.page(page, new LambdaQueryWrapper<TCommunityActivity>().eq(TCommunityActivity::getStatus, 2).like(Objects.nonNull(query.getName()), TCommunityActivity::getActivityTitle, query.getName()).orderByDesc(BaseModel::getCreateTime));
List<TCommunityActivity> activityList = tCommunityActivityPage.getRecords();
// 判断是否已经报名
- if (!activityList.isEmpty() && userId != null) {
+ if (!activityList.isEmpty()) {
List<String> activityIds = activityList.stream().map(TCommunityActivity::getId).collect(Collectors.toList());
- List<TCommunityActivityRegistration> activityRegistrationList = tCommunityActivityRegistrationService.list(new LambdaQueryWrapper<TCommunityActivityRegistration>().in(TCommunityActivityRegistration::getActivityId, activityIds).eq(TCommunityActivityRegistration::getAppUserId, userId));
+ List<TCommunityActivityRegistration> activityRegistrationList = tCommunityActivityRegistrationService.list(new LambdaQueryWrapper<TCommunityActivityRegistration>().in(TCommunityActivityRegistration::getActivityId, activityIds));
for (TCommunityActivity tCommunityActivity : activityList) {
List<TCommunityActivityRegistration> tCommunityActivityRegistrations = activityRegistrationList.stream().filter(e -> e.getActivityId().equals(tCommunityActivity.getId())).collect(Collectors.toList());
tCommunityActivity.setUserNum(tCommunityActivityRegistrations.size());
String finalUserId = userId;
- TCommunityActivityRegistration tCommunityActivityRegistration = tCommunityActivityRegistrations.stream().filter(e -> e.getAppUserId().equals(finalUserId)).findFirst().orElse(null);
- if (tCommunityActivityRegistration != null) {
- tCommunityActivity.setState(2);
+ if (finalUserId != null) {
+
}
+
}
}
@@ -173,11 +174,12 @@
userId = tokenService.getLoginUserApplet().getUserId();
} catch (Exception e) {
}
- if (userId != null) {
- long count = tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id).eq(TCommunityActivityRegistration::getAppUserId, userId));
- if (count > 0) {
- tCommunityActivity.setState(2);
- }
+ long count = tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id));
+ if (count > 0) {
+ tCommunityActivity.setUserNum((int) count);
+ }
+ if(userId!=null){
+ tCommunityActivity.setState(tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id).eq(TCommunityActivityRegistration::getAppUserId, userId)) > 0 ? 1 : 2);
}
return R.ok(tCommunityActivity);
}
@@ -252,6 +254,11 @@
return R.ok(tDeliberationVotePage);
}
+ public static void main(String[] args) {
+ String s = SecureUtil.md5("123456");
+ System.out.println(s);
+ }
+
@ApiOperation(value = "议事投票--详情", response = TDeliberationVote.class)
@GetMapping("/getDeliberationVoteDetail/{id}")
public R<TDeliberationVote> getDeliberationVoteDetail(@PathVariable String id) {
@@ -300,7 +307,7 @@
List<TDeliberationVoteOption> list = tDeliberationVoteOptionService.list(new LambdaQueryWrapper<TDeliberationVoteOption>().eq(TDeliberationVoteOption::getVoteId, dto.getVoteId()));
for (TDeliberationVoteOption tDeliberationVoteOption : list) {
String voteCount = tDeliberationVoteOption.getVoteCount();
- if(voteCount != null){
+ if (voteCount != null) {
String[] split = voteCount.split(",");
if (Arrays.asList(split).contains(userId)) {
return R.fail("你已经投票");
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
index 3bf6f59..a343407 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
@@ -296,6 +296,9 @@
}else {
String outRefundNo = OrderNos.getDid();
courseOrder1.setRefundNumber(outRefundNo);
+ courseOrder1.setBankCardNumber(courseOrder.getBankCardNumber());
+ courseOrder1.setCardholderName(courseOrder.getCardholderName());
+ courseOrder1.setBankName(courseOrder.getBankName());
courseOrderService.updateById(courseOrder1);
// WxPaymentRefundModel refundModel = new WxPaymentRefundModel();
//// refundModel.setSub_mchid(weixinPayProperties.getMchId());
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java
index b3ca4a9..b13116e 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java
@@ -203,6 +203,7 @@
JSONObject params = JSONObject.parseObject(decryptedData);
+ System.out.println("退款返回参数"+params);
// 商户订单号
String out_trade_no = params.get("out_trade_no").toString();
// 商户退款单号
@@ -220,6 +221,13 @@
courseOrderService.updateById(order);
wxV3Pay.ack();
+ }else {
+ TCourseOrder order = courseOrderService.getOne(Wrappers.lambdaQuery(TCourseOrder.class)
+ .eq(TCourseOrder::getRefundNumber, out_refund_no).last("LIMIT 1"));
+ order.setRefundStatus(1);
+
+ courseOrderService.updateById(order);
+ wxV3Pay.ack();
}
}catch (Exception e){
wxV3Pay.ack(false, "不是成功的退款状态");
diff --git a/ruoyi-applet/src/main/resources/application.yml b/ruoyi-applet/src/main/resources/application.yml
index e673e36..dcc106d 100644
--- a/ruoyi-applet/src/main/resources/application.yml
+++ b/ruoyi-applet/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# 项目相关配置
spring:
profiles:
- active: prod
+ active: test
--
Gitblit v1.7.1