From 498a47977ee44ecbea3a0b78633aff82ed58a9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 10 Apr 2026 02:16:59 +0800 Subject: [PATCH 01/60] =?UTF-8?q?feat(notification):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=80=81=E6=B0=B4=E8=AE=A2=E5=8D=95=E6=96=B0=E5=8D=95=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E9=85=8D=E9=80=81=E5=91=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在订单创建成功后异步通知所有在线配送员有新订单信息 - 查询在线且启用状态的配送员列表，并发送微信订阅消息提醒 - 新增 GltSubscribeMessageService 接口及实现，封装微信小程序订阅消息发送逻辑 - 实现新订单和订单状态变更的微信订阅消息发送方法 - 配置Redis缓存access_token，提升微信接口调用效率 - 日志记录订阅消息发送状态及异常，确保通知稳定性 - ShopDealerUser实体新增分销商等级字段 - ShopGoods实体支持活动方式和配送方式字段增加相关查询条件 - 更新相关Mapper XML文件增加对dealerLevel、activityType及deliveryMode字段的支持 - 修改application-glt2.yml更新Redis host配置 --- .../controller/GltTicketOrderController.java | 80 +++++- .../service/GltSubscribeMessageService.java | 28 ++ .../impl/GltSubscribeMessageServiceImpl.java | 240 ++++++++++++++++++ .../gxwebsoft/shop/entity/ShopDealerUser.java | 3 + .../com/gxwebsoft/shop/entity/ShopGoods.java | 6 + .../shop/mapper/xml/ShopDealerUserMapper.xml | 3 + .../shop/mapper/xml/ShopGoodsMapper.xml | 6 + .../gxwebsoft/shop/param/ShopGoodsParam.java | 8 + src/main/resources/application-glt2.yml | 2 +- 9 files changed, 373 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java create mode 100644 src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java index 7fa519e..09ab3e8 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java @@ -1,15 +1,18 @@ package com.gxwebsoft.glt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.mapper.UserMapper; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.param.GltTicketOrderDeliveredParam; import com.gxwebsoft.glt.param.GltTicketOrderParam; +import com.gxwebsoft.glt.service.GltSubscribeMessageService; import com.gxwebsoft.glt.service.GltTicketOrderService; import com.gxwebsoft.shop.entity.ShopStoreRider; import com.gxwebsoft.shop.entity.ShopUserAddress; @@ -19,12 +22,13 @@ import com.gxwebsoft.shop.service.ShopUserAddressService; import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * 送水订单控制器 @@ -32,6 +36,7 @@ import java.util.List; * @author 科技小王子 * @since 2026-02-05 18:50:21 */ +@Slf4j @Tag(name = "送水订单管理") @RestController @RequestMapping("/api/glt/glt-ticket-order") @@ -44,6 +49,10 @@ public class GltTicketOrderController extends BaseController { private ShopStoreFenceService shopStoreFenceService; @Resource private ShopStoreRiderService shopStoreRiderService; + @Resource + private GltSubscribeMessageService gltSubscribeMessageService; + @Resource + private UserMapper userMapper; @Operation(summary = "分页查询送水订单") @GetMapping("/page") @@ -167,9 +176,76 @@ public class GltTicketOrderController extends BaseController { } gltTicketOrderService.createWithWriteOff(gltTicketOrder, loginUser.getUserId(), loginUser.getTenantId()); + + // 订单创建成功后，异步通知所有在线配送员有新订单 + try { + notifyRidersOfNewOrder(gltTicketOrder, loginUser.getTenantId()); + } catch (Exception e) { + log.warn("通知配送员失败（不影响下单）: {}", e.getMessage()); + } + return success("下单成功"); } + /** + * 通知所有在线配送员有新订单 + */ + private void notifyRidersOfNewOrder(GltTicketOrder order, Integer tenantId) { + if (order == null || tenantId == null) { + return; + } + + // 查询所有启用且在线的配送员 + List onlineRiders = shopStoreRiderService.list( + new LambdaQueryWrapper() + .eq(ShopStoreRider::getTenantId, tenantId) + .eq(ShopStoreRider::getIsDelete, 0) + .eq(ShopStoreRider::getStatus, 1) + .eq(ShopStoreRider::getWorkStatus, 1) // 在线状态 + .or() + .eq(ShopStoreRider::getTenantId, tenantId) + .eq(ShopStoreRider::getIsDelete, 0) + .eq(ShopStoreRider::getStatus, 1) + .isNull(ShopStoreRider::getWorkStatus) // 兼容未设置状态的配送员 + ); + + if (onlineRiders == null || onlineRiders.isEmpty()) { + log.info("当前无在线配送员，无需发送订阅消息"); + return; + } + + // 获取配送员的 userId 列表 + List riderUserIds = onlineRiders.stream() + .map(ShopStoreRider::getUserId) + .filter(id -> id != null && id > 0) + .collect(Collectors.toList()); + + if (riderUserIds.isEmpty()) { + return; + } + + // 批量查询配送员的 openId + List riders = userMapper.selectList( + new LambdaQueryWrapper() + .select(User::getUserId, User::getOpenid) + .in(User::getUserId, riderUserIds) + .isNotNull(User::getOpenid) + ); + + // 发送订阅消息 + for (User rider : riders) { + if (StrUtil.isNotBlank(rider.getOpenid())) { + try { + gltSubscribeMessageService.sendNewOrderNotice(order, rider.getOpenid(), tenantId); + } catch (Exception e) { + log.warn("发送订阅消息给配送员失败 - userId={}, error={}", rider.getUserId(), e.getMessage()); + } + } + } + + log.info("已向 {} 位配送员发送新订单通知", riders.size()); + } + @PreAuthorize("isAuthenticated()") @Operation(summary = "配送员接单") @PostMapping("/{id}/accept") diff --git a/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java b/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java new file mode 100644 index 0000000..1183754 --- /dev/null +++ b/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java @@ -0,0 +1,28 @@ +package com.gxwebsoft.glt.service; + +import com.gxwebsoft.glt.entity.GltTicketOrder; + +/** + * 微信订阅消息服务接口 + */ +public interface GltSubscribeMessageService { + + /** + * 发送新订单通知给配送员 + * @param order 订单信息 + * @param riderOpenId 配送员微信openId + * @param tenantId 租户ID + * @return 是否发送成功 + */ + boolean sendNewOrderNotice(GltTicketOrder order, String riderOpenId, Integer tenantId); + + /** + * 发送订单状态变更通知 + * @param order 订单信息 + * @param riderOpenId 配送员微信openId + * @param statusText 状态描述 + * @param tenantId 租户ID + * @return 是否发送成功 + */ + boolean sendOrderStatusNotice(GltTicketOrder order, String riderOpenId, String statusText, Integer tenantId); +} diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java new file mode 100644 index 0000000..76e8314 --- /dev/null +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java @@ -0,0 +1,240 @@ +package com.gxwebsoft.glt.service.impl; + +import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; +import cn.binarywang.wx.miniapp.config.WxMaConfig; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.RedisUtil; +import com.gxwebsoft.glt.entity.GltTicketOrder; +import com.gxwebsoft.glt.service.GltSubscribeMessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +import static com.gxwebsoft.common.core.constants.RedisConstants.*; + +/** + * 微信订阅消息服务实现 + * + *

功能： + *

    + *
  • 新订单通知配送员
    • + *
  • 订单状态变更通知
    • + *
+ *

+ */ +@Slf4j +@Service +public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageService { + + @Resource + private StringRedisTemplate stringRedisTemplate; + + /** + * 订阅消息模板ID（需在微信公众平台配置） + * 模板名称：订单配送通知 + * 关键词：订单编号、订单内容、配送地址、订单金额 + */ + private static final String SUBSCRIBE_TEMPLATE_ID = "YOUR_TEMPLATE_ID"; // TODO: 替换为实际模板ID + + /** + * 发送新订单通知给配送员 + */ + @Override + public boolean sendNewOrderNotice(GltTicketOrder order, String riderOpenId, Integer tenantId) { + if (order == null || StrUtil.isBlank(riderOpenId) || tenantId == null) { + log.warn("发送订阅消息参数不完整"); + return false; + } + + try { + String accessToken = getAccessToken(tenantId); + if (StrUtil.isBlank(accessToken)) { + log.warn("获取access_token失败"); + return false; + } + + // 构建消息内容 + Map data = new HashMap<>(); + data.put("phrase1", Map.of("value", "待配送")); // 订单状态 + data.put("character_string2", Map.of("value", String.valueOf(order.getId()))); // 订单编号 + data.put("thing3", Map.of("value", truncateStr(order.getAddress(), 20))); // 配送地址 + data.put("number4", Map.of("value", String.valueOf(order.getTotalNum()))); // 商品数量 + data.put("time5", Map.of("value", formatTime(order.getSendTime()))); // 期望送达时间 + + // 发送订阅消息 + return sendSubscribeMessage(accessToken, riderOpenId, data); + } catch (Exception e) { + log.error("发送新订单订阅消息失败 - orderId={}, riderOpenId={}, error={}", + order.getId(), riderOpenId, e.getMessage(), e); + return false; + } + } + + /** + * 发送订单状态变更通知 + */ + @Override + public boolean sendOrderStatusNotice(GltTicketOrder order, String riderOpenId, String statusText, Integer tenantId) { + if (order == null || StrUtil.isBlank(riderOpenId) || tenantId == null) { + log.warn("发送订阅消息参数不完整"); + return false; + } + + try { + String accessToken = getAccessToken(tenantId); + if (StrUtil.isBlank(accessToken)) { + log.warn("获取access_token失败"); + return false; + } + + // 构建消息内容 + Map data = new HashMap<>(); + data.put("phrase1", Map.of("value", truncateStr(statusText, 5))); // 状态描述 + data.put("character_string2", Map.of("value", String.valueOf(order.getId()))); // 订单编号 + data.put("time3", Map.of("value", formatTime(null))); // 通知时间 + + // 发送订阅消息 + return sendSubscribeMessage(accessToken, riderOpenId, data); + } catch (Exception e) { + log.error("发送订单状态变更订阅消息失败 - orderId={}, riderOpenId={}, error={}", + order.getId(), riderOpenId, e.getMessage(), e); + return false; + } + } + + /** + * 获取小程序的 access_token + */ + private String getAccessToken(Integer tenantId) { + if (tenantId == null) { + throw new BusinessException("tenantId 不能为空"); + } + + final String tokenCacheKey = ACCESS_TOKEN_KEY + ":" + tenantId; + + // 1) 优先从缓存取 + String cachedValue = stringRedisTemplate.opsForValue().get(tokenCacheKey); + if (StrUtil.isNotBlank(cachedValue)) { + try { + JSONObject cachedJson = JSON.parseObject(cachedValue); + String accessToken = cachedJson.getString("access_token"); + if (StrUtil.isNotBlank(accessToken)) { + return accessToken; + } + } catch (Exception ignore) { + // 旧格式：直接存 token + return cachedValue; + } + } + + // 2) 缓存没有则从租户配置获取 appId/appSecret + final String wxConfigKey = MP_WX_KEY + tenantId; + final String wxConfigValue = stringRedisTemplate.opsForValue().get(wxConfigKey); + if (StrUtil.isBlank(wxConfigValue)) { + log.warn("未找到微信小程序配置，请检查缓存key: {}", wxConfigKey); + return null; + } + + JSONObject wxConfig; + try { + wxConfig = JSON.parseObject(wxConfigValue); + } catch (Exception e) { + log.error("微信小程序配置格式错误: {}", e.getMessage()); + return null; + } + + final String appId = wxConfig.getString("appId"); + final String appSecret = wxConfig.getString("appSecret"); + if (StrUtil.isBlank(appId) || StrUtil.isBlank(appSecret)) { + log.error("微信小程序配置不完整(appId/appSecret)"); + return null; + } + + // 3) 调用微信接口获取 token + final String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" + + "&appid=" + appId + "&secret=" + appSecret; + String result = HttpUtil.get(apiUrl); + + JSONObject json = JSON.parseObject(result); + if (json.containsKey("errcode") && json.getIntValue("errcode") != 0) { + log.error("获取小程序access_token失败: {}", json.getString("errmsg")); + return null; + } + + String accessToken = json.getString("access_token"); + Integer expiresIn = json.getInteger("expires_in"); + if (StrUtil.isBlank(accessToken)) { + log.error("获取小程序access_token失败: access_token为空"); + return null; + } + + // 4) 缓存，提前5分钟过期 + long ttlSeconds = 7000L; + if (expiresIn != null && expiresIn > 300) { + ttlSeconds = expiresIn - 300L; + } + stringRedisTemplate.opsForValue().set(tokenCacheKey, result, ttlSeconds, java.util.concurrent.TimeUnit.SECONDS); + + log.info("获取小程序access_token成功 - tenantId={}, ttlSeconds={}", tenantId, ttlSeconds); + return accessToken; + } + + /** + * 发送订阅消息 + */ + private boolean sendSubscribeMessage(String accessToken, String openId, Map data) { + String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + accessToken; + + Map params = new HashMap<>(); + params.put("touser", openId); // 用户 openid + params.put("template_id", SUBSCRIBE_TEMPLATE_ID); // 模板ID + params.put("page", "pages/rider/orders/index"); // 点击后跳转的页面 + params.put("data", data); + + String response = HttpUtil.createPost(url) + .contentType("application/json") + .body(JSON.toJSONString(params)) + .timeout(10000) + .execute() + .body(); + + JSONObject result = JSON.parseObject(response); + int errcode = result.getIntValue("errcode"); + + if (errcode == 0) { + log.info("订阅消息发送成功 - openId={}", openId); + return true; + } else { + log.warn("订阅消息发送失败 - openId={}, errcode={}, errmsg={}", + openId, errcode, result.getString("errmsg")); + return false; + } + } + + /** + * 截断字符串 + */ + private String truncateStr(String str, int maxLen) { + if (str == null) return ""; + return str.length() > maxLen ? str.substring(0, maxLen) : str; + } + + /** + * 格式化时间 + */ + private String formatTime(String timeStr) { + if (StrUtil.isBlank(timeStr)) { + return cn.hutool.core.date.DateUtil.now(); + } + return timeStr; + } +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java index a3530cc..b067c3f 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java @@ -116,4 +116,7 @@ public class ShopDealerUser implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @Schema(description = "分销商等级：0-普通用户 1-超级管理员 2-合伙人(总店) 3-合伙人(分店)") + private Integer dealerLevel; + } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index 7d31385..75bc1a3 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -153,6 +153,12 @@ public class ShopGoods implements Serializable { @Schema(description = "状态, 0上架 1待上架 2待审核 3审核不通过") private Integer status; + @Schema(description = "活动方式: 0全平台 1新用户专享") + private Integer activityType; + + @Schema(description = "配送方式: 0送上门 1限自提") + private Integer deliveryMode; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml index f103c11..d6e3c30 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml @@ -63,6 +63,9 @@ AND a.sort_number = #{param.sortNumber} + + AND a.dealer_level = #{param.dealerLevel} + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') OR a.user_id = #{param.keywords} OR a.dealer_name LIKE CONCAT('%', #{param.keywords}, '%') OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') OR a.mobile LIKE CONCAT('%', #{param.keywords}, '%') diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml index a14c354..0f57c75 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml @@ -135,6 +135,12 @@ OR a.comments LIKE CONCAT('%', #{param.keywords}, '%') ) + + AND a.activity_type = #{param.activityType} + + + AND a.delivery_mode = #{param.deliveryMode} + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java index 0138743..a1f1880 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java @@ -150,4 +150,12 @@ public class ShopGoodsParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer deleted; + @Schema(description = "活动方式: 0全平台 1新用户专享") + @QueryField(type = QueryType.EQ) + private Integer activityType; + + @Schema(description = "配送方式: 0送上门 1限自提") + @QueryField(type = QueryType.EQ) + private Integer deliveryMode; + } diff --git a/src/main/resources/application-glt2.yml b/src/main/resources/application-glt2.yml index fdcd6ba..4a44e6b 100644 --- a/src/main/resources/application-glt2.yml +++ b/src/main/resources/application-glt2.yml @@ -16,7 +16,7 @@ spring: # redis redis: database: 0 - host: 8.134.55.105 + host: 47.107.249.41 port: 16379 password: redis_t74P8C From 800b4f6f93483dbfe2f0945eb8d0d25bbd43764f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 11 Apr 2026 14:42:07 +0800 Subject: [PATCH 02/60] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=92=8CRedis=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将数据库连接地址更改为1Panel-mysql-XsWW，并调整端口号为3306 - 更新Redis主机地址为1Panel-redis-GmNr，端口改为6379 - 保持其他连接参数和认证信息不变 --- src/main/resources/application-glt2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-glt2.yml b/src/main/resources/application-glt2.yml index 4a44e6b..b583eb8 100644 --- a/src/main/resources/application-glt2.yml +++ b/src/main/resources/application-glt2.yml @@ -7,7 +7,7 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://47.107.249.41:13306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai username: gltdb password: EeD4FtzyA5ksj7Bk driver-class-name: com.mysql.cj.jdbc.Driver @@ -16,8 +16,8 @@ spring: # redis redis: database: 0 - host: 47.107.249.41 - port: 16379 + host: 1Panel-redis-GmNr + port: 6379 password: redis_t74P8C # 日志配置 From 8b83e4862fd2930baa243e0c9eff311a30f5b7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 12 Apr 2026 21:30:49 +0800 Subject: [PATCH 03/60] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=92=8CRedis=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将application.yml中的active profile由glt2改为dev - 更新application-dev.yml中的MySQL连接信息，包括url、用户名和密码 - 修改Redis服务器地址以匹配新的环境设置 - 添加新文件expert-history.json和MEMORY.md用于记录扩展历史和内存使用情况 --- src/main/resources/application-dev.yml | 8 ++++---- src/main/resources/application.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c7ec827..8a221d2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,16 +7,16 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://47.107.249.41:13306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: gltdb - password: EeD4FtzyA5ksj7Bk + url: jdbc:mysql://8.134.55.105:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: modules + password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource # redis redis: database: 0 - host: 47.107.249.41 + host: 8.134.55.105 port: 16379 password: redis_t74P8C diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5be3164..ada4ffe 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: # 多环境配置 spring: profiles: - active: glt2 + active: dev application: name: server From 506505bb46f3dd8bb0ce00022f51ae026e3def8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 12 Apr 2026 21:31:55 +0800 Subject: [PATCH 04/60] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=92=8CRedis=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将application.yml中的active profile由glt2改为dev - 更新application-dev.yml中的MySQL连接信息，包括url、用户名和密码 - 修改Redis服务器地址以匹配新的环境设置 - 添加新文件expert-history.json和MEMORY.md用于记录扩展历史和内存使用情况 --- .workbuddy/expert-history.json | 17 +++++++++++++++++ .workbuddy/memory/MEMORY.md | 0 .../shop/param/ShopDealerUserParam.java | 4 ++++ 3 files changed, 21 insertions(+) create mode 100644 .workbuddy/expert-history.json create mode 100644 .workbuddy/memory/MEMORY.md diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json new file mode 100644 index 0000000..58cfef1 --- /dev/null +++ b/.workbuddy/expert-history.json @@ -0,0 +1,17 @@ +{ + "version": 2, + "sessions": { + "7759a9e57f984a0bb5af2ffd05be2f63": [ + { + "expertId": "SeniorDeveloper", + "name": "Will", + "profession": "高级开发工程师", + "avatarUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/avatars/02-Engineering/SeniorDeveloper/SeniorDeveloper.png", + "promptUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/experts/02-Engineering/SeniorDeveloper/SeniorDeveloper_zh.md", + "usedAt": 1775972794982, + "industryId": "all" + } + ] + }, + "lastUpdated": 1776000634627 +} \ No newline at end of file diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java index 9953b1f..6003335 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java @@ -86,4 +86,8 @@ public class ShopDealerUserParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer isDelete; + @Schema(description = "分销商等级：0-普通用户 1-超级管理员 2-合伙人(总店) 3-合伙人(分店)") + @QueryField(type = QueryType.EQ) + private Integer dealerLevel; + } From 721ce5a595fa0748728cb640d1b408b1a4b9a983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 12 Apr 2026 21:55:16 +0800 Subject: [PATCH 05/60] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=85=8D=E9=80=81=E6=96=B9=E5=BC=8F=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增deliveryMethod字段支持配送方式选择（电梯/步梯/一楼商铺） - 新增deliveryFloor字段记录步梯送上楼时的楼层 - 新增deliveryFee字段计算并保存配送费用 - 在数据库表glt_ticket_order中增加对应字段及注释说明 - 丰富订单实体GltTicketOrder类以支持新配送信息存储和传输 --- .workbuddy/expert-history.json | 13 ++++++++++++- sql/glt_ticket_order_delivery_fields.sql | 7 +++++++ .../com/gxwebsoft/glt/entity/GltTicketOrder.java | 9 +++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 sql/glt_ticket_order_delivery_fields.sql diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index 58cfef1..998ac4a 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -11,7 +11,18 @@ "usedAt": 1775972794982, "industryId": "all" } + ], + "e7c3c15a2556446884e56ce4d588e133": [ + { + "expertId": "SeniorDeveloper", + "name": "Will", + "profession": "高级开发工程师", + "avatarUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/avatars/02-Engineering/SeniorDeveloper/SeniorDeveloper.png", + "promptUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/experts/02-Engineering/SeniorDeveloper/SeniorDeveloper_zh.md", + "usedAt": 1776000797914, + "industryId": "all" + } ] }, - "lastUpdated": 1776000634627 + "lastUpdated": 1776000910040 } \ No newline at end of file diff --git a/sql/glt_ticket_order_delivery_fields.sql b/sql/glt_ticket_order_delivery_fields.sql new file mode 100644 index 0000000..bbbac31 --- /dev/null +++ b/sql/glt_ticket_order_delivery_fields.sql @@ -0,0 +1,7 @@ +-- 配送方式、楼层、配送费字段 +-- 对应需求：送水订单下单时选择配送方式（电梯/步梯/一楼商铺），步梯送上楼需选楼层，配送费 = 数量 × (楼层-1) + +ALTER TABLE glt_ticket_order + ADD COLUMN delivery_method VARCHAR(32) DEFAULT NULL COMMENT '配送方式：elevator(电梯) / stairs(步梯) / groundFloor(一楼商铺/其他)' AFTER buyer_remarks, + ADD COLUMN delivery_floor INT DEFAULT NULL COMMENT '楼层（步梯+送上楼时有值，从2开始）' AFTER delivery_method, + ADD COLUMN delivery_fee DECIMAL(10,2) DEFAULT NULL COMMENT '配送费（数量 × (楼层-1)）' AFTER delivery_floor; diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index 17bb743..f1bdc94 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -191,6 +191,15 @@ public class GltTicketOrder implements Serializable { @TableField(exist = false) private String warehouseLngAndLat; + @Schema(description = "配送方式：elevator(电梯) / stairs(步梯) / groundFloor(一楼商铺/其他)") + private String deliveryMethod; + + @Schema(description = "楼层（步梯+送上楼时有值，从2开始）") + private Integer deliveryFloor; + + @Schema(description = "配送费（步梯+送上楼时计算：数量 × (楼层-1)）") + private BigDecimal deliveryFee; + @Schema(description = "排序(数字越小越靠前)") private Integer sortNumber; From 7c90f5e8af8a70c480ddb5c7d1c2efa6f41148da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 12 Apr 2026 22:09:24 +0800 Subject: [PATCH 06/60] =?UTF-8?q?fix(system):=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=92=8C=E6=9B=B4=E6=96=B0=E4=B8=93=E5=AE=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为LoginRecord实体的createTime和updateTime字段添加时区配置GMT+8 - 更新.expert-history.json文件，新增高级开发工程师Will的专家信息 - 同步更新lastUpdated时间戳以反映最新变更 --- .workbuddy/expert-history.json | 13 ++++++++++++- .../gxwebsoft/common/system/entity/LoginRecord.java | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index 998ac4a..dc1d944 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -22,7 +22,18 @@ "usedAt": 1776000797914, "industryId": "all" } + ], + "44c34a14b6dc4139b39ff61239e259ea": [ + { + "expertId": "SeniorDeveloper", + "name": "Will", + "profession": "高级开发工程师", + "avatarUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/avatars/02-Engineering/SeniorDeveloper/SeniorDeveloper.png", + "promptUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/experts/02-Engineering/SeniorDeveloper/SeniorDeveloper_zh.md", + "usedAt": 1776000797914, + "industryId": "all" + } ] }, - "lastUpdated": 1776000910040 + "lastUpdated": 1776002597201 } \ No newline at end of file diff --git a/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java index b516166..a03573a 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java @@ -58,11 +58,11 @@ public class LoginRecord implements Serializable { private Integer tenantId; @Schema(description = "操作时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createTime; @Schema(description = "修改时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime updateTime; @Schema(description = "用户id") From 6781374c1e99d1205798cbd3cf836d270d4fbff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 12 Apr 2026 22:09:27 +0800 Subject: [PATCH 07/60] =?UTF-8?q?fix(system):=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=92=8C=E6=9B=B4=E6=96=B0=E4=B8=93=E5=AE=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为LoginRecord实体的createTime和updateTime字段添加时区配置GMT+8 - 更新.expert-history.json文件，新增高级开发工程师Will的专家信息 - 同步更新lastUpdated时间戳以反映最新变更 --- .workbuddy/memory/2026-04-12.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .workbuddy/memory/2026-04-12.md diff --git a/.workbuddy/memory/2026-04-12.md b/.workbuddy/memory/2026-04-12.md new file mode 100644 index 0000000..8db737d --- /dev/null +++ b/.workbuddy/memory/2026-04-12.md @@ -0,0 +1,13 @@ +# 2026-04-12 工作日志 + +## 修复登录日志时间显示问题 + +**问题描述**：小程序后台登录日志中的登录时间显示不正确，实际登录时间 9:20:20，显示为 17:16:31，相差约 8 小时。 + +**问题原因**：`LoginRecord` 实体类中的 `createTime` 和 `updateTime` 字段使用了 `@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")` 注解，但没有指定 `timezone` 属性。对于 `LocalDateTime` 类型，Jackson 序列化时未正确应用全局时区配置，导致时间多了 8 小时。 + +**修复方案**：为 `@JsonFormat` 注解添加 `timezone = "GMT+8"` 属性。 + +**修改文件**：`src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java` + +**状态**：已修复 From 701a135edd8d51685f43c5020048c36ce36c4e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 13 Apr 2026 02:03:37 +0800 Subject: [PATCH 08/60] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=92=8CRedis=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改application-glt.yml的数据源URL、用户名和密码 - 更新application-prod.yml的数据源URL和密码 - 调整application-prod.yml中Redis主机地址和密码配置 --- src/main/resources/application-glt.yml | 6 +++--- src/main/resources/application-prod.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/application-glt.yml b/src/main/resources/application-glt.yml index 42bbb8e..4eb942f 100644 --- a/src/main/resources/application-glt.yml +++ b/src/main/resources/application-glt.yml @@ -3,9 +3,9 @@ # 数据源配置 spring: datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: gltdb - password: EeD4FtzyA5ksj7Bk + url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + username: modules + password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 91b17f0..0f4eb72 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,9 +3,9 @@ # 数据源配置 spring: datasource: - url: jdbc:mysql://1Panel-mysql-Bqdt:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai username: modules - password: P7KsAyDXG8YdLnkA + password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -14,9 +14,9 @@ spring: # redis redis: database: 0 - host: 1Panel-redis-Q1LE + host: 1Panel-redis-GmNr port: 6379 - password: redis_WSDb88 + password: redis_t74P8C # 日志配置 logging: From 9297d13045c9a4b29d1e7d87cac378094ce11214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 13 Apr 2026 02:14:34 +0800 Subject: [PATCH 09/60] =?UTF-8?q?fix(shop):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=9B=9E=E8=B0=83=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将支付成功状态判断由字符串比较改为枚举值比较 - 使用 Transaction.TradeStateEnum.SUCCESS 替代 "支付成功" 字符串判断 - 避免因状态描述字符串不一致导致支付回调处理失败 - 保证支付成功后订单状态能够正确更新 --- .workbuddy/expert-history.json | 2 +- .workbuddy/memory/2026-04-13.md | 15 +++++++++++++++ .../shop/controller/ShopOrderController.java | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .workbuddy/memory/2026-04-13.md diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index dc1d944..c7baacc 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -35,5 +35,5 @@ } ] }, - "lastUpdated": 1776002597201 + "lastUpdated": 1776017110068 } \ No newline at end of file diff --git a/.workbuddy/memory/2026-04-13.md b/.workbuddy/memory/2026-04-13.md new file mode 100644 index 0000000..34250a1 --- /dev/null +++ b/.workbuddy/memory/2026-04-13.md @@ -0,0 +1,15 @@ +# 2026-04-13 工作日志 + +## 修复支付回调订单状态不更新问题 + +**问题描述**：支付成功后，订单支付状态没有更新，回调地址 `https://glt-api.websoft.top/api/shop/shop-order/notify` 接收到了通知但订单状态未改变。 + +**问题原因**：`ShopOrderController.java` 的 `wxNotify` 方法中，使用 `StrUtil.equals("支付成功", transaction.getTradeStateDesc())` 来判断支付状态。但微信返回的 `tradeStateDesc` 可能不是固定的 "支付成功" 字符串（可能是 "SUCCESS" 或其他描述），导致支付成功的回调没有被正确处理。 + +**修复方案**：将状态判断从字符串比较改为枚举值比较： +- 原代码：`if (StrUtil.equals("支付成功", transaction.getTradeStateDesc()))` +- 修复后：`if (Transaction.TradeStateEnum.SUCCESS.equals(transaction.getTradeState()))` + +**修改文件**：`src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java` + +**状态**：已修复 diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index ae553dc..1bd1795 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -888,7 +888,8 @@ public class ShopOrderController extends BaseController { logger.info("✅ 异步通知解析成功 - 交易状态: {}, 商户订单号: {}", transaction.getTradeStateDesc(), transaction.getOutTradeNo()); - if (StrUtil.equals("支付成功", transaction.getTradeStateDesc())) { + // 使用枚举值判断支付状态，避免依赖状态描述字符串 + if (Transaction.TradeStateEnum.SUCCESS.equals(transaction.getTradeState())) { final String outTradeNo = transaction.getOutTradeNo(); final String transactionId = transaction.getTransactionId(); final Integer total = transaction.getAmount().getTotal(); From 47ef45054ae9d93257b694228f41276c451914af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 13 Apr 2026 02:16:00 +0800 Subject: [PATCH 10/60] =?UTF-8?q?fix(shop):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=9B=9E=E8=B0=83=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将支付成功状态判断由字符串比较改为枚举值比较 - 使用 Transaction.TradeStateEnum.SUCCESS 替代 "支付成功" 字符串判断 - 避免因状态描述字符串不一致导致支付回调处理失败 - 保证支付成功后订单状态能够正确更新 --- .workbuddy/expert-history.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index c7baacc..f9fa735 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -35,5 +35,5 @@ } ] }, - "lastUpdated": 1776017110068 + "lastUpdated": 1776017699886 } \ No newline at end of file From 0c4bdc30316aa5474defde2c2653da87a40e5be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 16 Apr 2026 00:33:20 +0800 Subject: [PATCH 11/60] =?UTF-8?q?fix(shop-order):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E7=AD=BE=E5=90=8D=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=A4=B1=E8=B4=A5=E5=8F=8A=E7=8A=B6=E6=80=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正导入 Transaction 类为直连商户模式路径，解决签名验证失败 - 新增按 mchId 缓存 NotificationConfig，避免重复拉取平台证书和重复初始化 - 更新 ShopOrderMapper.xml，增加 update_time 和 expiration_time 字段更新 - 删除 ShopOrderServiceImpl.updateByOutTradeNo 中重置 expirationTime 的代码，确保回调传递值生效 - 补充日志，完善异步通知证书配置流程监控 --- .workbuddy/memory/2026-04-16.md | 45 +++++ .workbuddy/settings.local.json | 5 + .../shop/controller/ShopOrderController.java | 173 ++++++++++-------- .../shop/mapper/xml/ShopOrderMapper.xml | 4 + .../service/impl/ShopOrderServiceImpl.java | 1 - 5 files changed, 147 insertions(+), 81 deletions(-) create mode 100644 .workbuddy/memory/2026-04-16.md create mode 100644 .workbuddy/settings.local.json diff --git a/.workbuddy/memory/2026-04-16.md b/.workbuddy/memory/2026-04-16.md new file mode 100644 index 0000000..cf3c159 --- /dev/null +++ b/.workbuddy/memory/2026-04-16.md @@ -0,0 +1,45 @@ +# 2026-04-16 工作记录 + +## 支付回调状态不更新问题诊断与修复 + +**问题接口**: `POST /api/shop/shop-order/notify/{tenantId}` + +### 发现的 Bug + +1. **根因 Bug**：`ShopOrderServiceImpl.updateByOutTradeNo()` 第837行有 `order.setExpirationTime(null)`，强制覆盖了 Controller 中设置的 `expirationTime`（`LocalDateTime.now().plusYears(10)`），导致 XML 中 expirationTime 条件不生效。**已修复**：删除了该行。 + +2. **XML 缺少 `update_time`**：`ShopOrderMapper.xml` 的 `updateByOutTradeNo` SQL 的 `` 块中没有 `update_time = NOW()` 和 `expiration_time` 字段。**已修复**：新增了这两个字段更新。 + +3. **回调地址路由问题**：Controller 路由为 `/notify/{tenantId}`，但测试访问的 `/notify`（无 tenantId）不存在，返回 fail。正确回调地址格式为 `https://glt-api.websoft.top/api/shop/shop-order/notify/{tenantId}`（需带租户ID）。**待检查**：数据库 Payment 表的 `notify_url` 字段是否正确配置了带 tenantId 的完整路径。 + +### 修复文件 +- `src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java` +- `src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml` + +--- + +## 支付回调签名验证失败：Transaction 类错误（00:29修复） + +**错误日志关键信息**： +``` +signature verification failed, signType[WECHATPAY2-SHA256-RSA2048] +serial[test] message[test\ntest\n{"test":"test"}] sign[test] +``` + +### 根本原因（最致命） + +`ShopOrderController.java` 导入了 **服务商模式** 的 Transaction 类： +```java +// 错误（服务商模式） +import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; +``` +而 `ShopOrderServiceImpl.java` 下单时用的是**直连商户模式**： +```java +// 正确（直连商户模式） +import com.wechat.pay.java.service.payments.model.Transaction; +``` +两个 Transaction 包路径不同，字段结构有差异（服务商 Transaction 有 spAppid/spMchid 等字段），用错误的类解析回调会导致字段映射失败，交易状态无法正确读取。**已修复**：改为正确的直连商户模式 Transaction。 + +### 次要原因 + +`RSAAutoCertificateConfig` 每次回调都重新 `build()`，SDK 内部会发一次 `serial=test` 的探测验签，网络问题或并发场景下可能导致首次回调失败。**已优化**：添加 `notifyConfigCache`（ConcurrentHashMap）按 mchId 缓存 config，避免重复初始化。 diff --git a/.workbuddy/settings.local.json b/.workbuddy/settings.local.json new file mode 100644 index 0000000..7a6d5dd --- /dev/null +++ b/.workbuddy/settings.local.json @@ -0,0 +1,5 @@ +{ + "enabledPlugins": { + "modern-webapp@cb_teams_marketplace": true + } +} \ No newline at end of file diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 1bd1795..d156858 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -35,7 +35,7 @@ import com.wechat.pay.java.core.notification.NotificationConfig; import com.wechat.pay.java.core.notification.NotificationParser; import com.wechat.pay.java.core.notification.RequestParam; import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; +import com.wechat.pay.java.service.payments.model.Transaction; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.Operation; @@ -53,6 +53,7 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; /** * 订单控制器 @@ -65,6 +66,8 @@ import java.util.Objects; @RequestMapping("/api/shop/shop-order") public class ShopOrderController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(ShopOrderController.class); + /** 按商户号缓存 NotificationConfig，避免每次回调都重新拉取平台证书 */ + private final ConcurrentHashMap notifyConfigCache = new ConcurrentHashMap<>(); @Resource private ShopOrderService shopOrderService; @Resource @@ -791,90 +794,100 @@ public class ShopOrderController extends BaseController { .body(body) .build(); - // 创建通知配置 - 使用与下单方法相同的证书配置逻辑 + // 创建通知配置 - 使用与下单方法相同的证书配置逻辑（按 mchId 缓存，避免重复拉取平台证书） NotificationConfig config; - try { - if (active.equals("dev")) { - // 开发环境 - 构建包含租户号的私钥路径 - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); + final String mchId = payment.getMchId(); + config = notifyConfigCache.get(mchId); + if (config == null) { + try { + NotificationConfig newConfig; + if (active.equals("dev")) { + // 开发环境 - 构建包含租户号的私钥路径 + String tenantCertPath = "dev/wechat/" + tenantId; + String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - logger.info("开发环境异步通知证书路径: {}", privateKeyPath); - logger.info("租户ID: {}, 证书目录: {}", tenantId, tenantCertPath); + logger.info("开发环境异步通知证书路径: {}", privateKeyPath); + logger.info("租户ID: {}, 证书目录: {}", tenantId, tenantCertPath); - // 检查证书文件是否存在 - if (!certificateLoader.certificateExists(privateKeyPath)) { - logger.error("证书文件不存在: {}", privateKeyPath); - throw new RuntimeException("证书文件不存在: " + privateKeyPath); + // 检查证书文件是否存在 + if (!certificateLoader.certificateExists(privateKeyPath)) { + logger.error("证书文件不存在: {}", privateKeyPath); + throw new RuntimeException("证书文件不存在: " + privateKeyPath); + } + + String privateKey = certificateLoader.loadCertificatePath(privateKeyPath); + + // 使用验证器获取有效的 APIv3 密钥 + String apiV3Key = wechatPayConfigValidator.getValidApiV3Key(payment); + + logger.info("私钥文件加载成功: {}", privateKey); + logger.info("使用APIv3密钥来源: {}", payment.getApiKey() != null && !payment.getApiKey().trim().isEmpty() ? "数据库配置" : "配置文件默认"); + logger.info("APIv3密钥长度: {}", apiV3Key != null ? apiV3Key.length() : 0); + logger.info("商户证书序列号: {}", payment.getMerchantSerialNumber()); + + // 使用自动证书配置 + newConfig = new RSAAutoCertificateConfig.Builder() + .merchantId(mchId) + .privateKeyFromPath(privateKey) + .merchantSerialNumber(payment.getMerchantSerialNumber()) + .apiV3Key(apiV3Key) + .build(); + + logger.info("✅ 开发环境使用自动证书配置创建通知解析器成功"); + } else { + // 生产环境 - 使用自动证书配置 + final String certRootPath = certConfig.getCertRootPath(); + logger.info("生产环境证书根路径: {}", certRootPath); + + String privateKeyRelativePath = payment.getApiclientKey(); + logger.info("数据库中的私钥相对路径: {}", privateKeyRelativePath); + + // 生产环境已经没有/file目录，所有路径都直接拼接到根路径 + String privateKeyFullPath; + // 处理数据库中可能存在的历史路径格式 + String cleanPath = privateKeyRelativePath; + if (privateKeyRelativePath.startsWith("/file/")) { + // 去掉历史的 /file/ 前缀 + cleanPath = privateKeyRelativePath.substring(6); + } else if (privateKeyRelativePath.startsWith("file/")) { + // 去掉历史的 file/ 前缀 + cleanPath = privateKeyRelativePath.substring(5); + } + // 确保路径以 / 开头 + if (!cleanPath.startsWith("/")) { + cleanPath = "/" + cleanPath; + } + privateKeyFullPath = certRootPath + cleanPath; + + logger.info("生产环境私钥完整路径: {}", privateKeyFullPath); + String privateKey = certificateLoader.loadCertificatePath(privateKeyFullPath); + String apiV3Key = payment.getApiKey(); + + // 使用自动证书配置 + newConfig = new RSAAutoCertificateConfig.Builder() + .merchantId(mchId) + .privateKeyFromPath(privateKey) + .merchantSerialNumber(payment.getMerchantSerialNumber()) + .apiV3Key(apiV3Key) + .build(); + + logger.info("✅ 生产环境使用自动证书配置创建通知解析器成功"); } - - String privateKey = certificateLoader.loadCertificatePath(privateKeyPath); - - // 使用验证器获取有效的 APIv3 密钥 - String apiV3Key = wechatPayConfigValidator.getValidApiV3Key(payment); - - logger.info("私钥文件加载成功: {}", privateKey); - logger.info("使用APIv3密钥来源: {}", payment.getApiKey() != null && !payment.getApiKey().trim().isEmpty() ? "数据库配置" : "配置文件默认"); - logger.info("APIv3密钥长度: {}", apiV3Key != null ? apiV3Key.length() : 0); - logger.info("商户证书序列号: {}", payment.getMerchantSerialNumber()); - - // 使用自动证书配置 - config = new RSAAutoCertificateConfig.Builder() - .merchantId(payment.getMchId()) - .privateKeyFromPath(privateKey) - .merchantSerialNumber(payment.getMerchantSerialNumber()) - .apiV3Key(apiV3Key) - .build(); - - logger.info("✅ 开发环境使用自动证书配置创建通知解析器成功"); - } else { - // 生产环境 - 使用自动证书配置 - final String certRootPath = certConfig.getCertRootPath(); - logger.info("生产环境证书根路径: {}", certRootPath); - - String privateKeyRelativePath = payment.getApiclientKey(); - logger.info("数据库中的私钥相对路径: {}", privateKeyRelativePath); - - // 生产环境已经没有/file目录，所有路径都直接拼接到根路径 - String privateKeyFullPath; - // 处理数据库中可能存在的历史路径格式 - String cleanPath = privateKeyRelativePath; - if (privateKeyRelativePath.startsWith("/file/")) { - // 去掉历史的 /file/ 前缀 - cleanPath = privateKeyRelativePath.substring(6); - } else if (privateKeyRelativePath.startsWith("file/")) { - // 去掉历史的 file/ 前缀 - cleanPath = privateKeyRelativePath.substring(5); - } - // 确保路径以 / 开头 - if (!cleanPath.startsWith("/")) { - cleanPath = "/" + cleanPath; - } - privateKeyFullPath = certRootPath + cleanPath; - - logger.info("生产环境私钥完整路径: {}", privateKeyFullPath); - String privateKey = certificateLoader.loadCertificatePath(privateKeyFullPath); - String apiV3Key = payment.getApiKey(); - - // 使用自动证书配置 - config = new RSAAutoCertificateConfig.Builder() - .merchantId(payment.getMchId()) - .privateKeyFromPath(privateKey) - .merchantSerialNumber(payment.getMerchantSerialNumber()) - .apiV3Key(apiV3Key) - .build(); - - logger.info("✅ 生产环境使用自动证书配置创建通知解析器成功"); + // 放入缓存 + notifyConfigCache.putIfAbsent(mchId, newConfig); + config = notifyConfigCache.get(mchId); + } catch (Exception e) { + logger.error("❌ 创建通知配置失败 - 租户ID: {}, 商户号: {}", tenantId, mchId, e); + logger.error("🔍 错误详情: {}", e.getMessage()); + logger.error("💡 请检查:"); + logger.error("1. 证书文件是否存在且路径正确"); + logger.error("2. APIv3密钥是否配置正确"); + logger.error("3. 商户证书序列号是否正确"); + logger.error("4. 网络连接是否正常"); + throw new RuntimeException("微信支付通知配置失败: " + e.getMessage(), e); } - } catch (Exception e) { - logger.error("❌ 创建通知配置失败 - 租户ID: {}, 商户号: {}", tenantId, payment.getMchId(), e); - logger.error("🔍 错误详情: {}", e.getMessage()); - logger.error("💡 请检查:"); - logger.error("1. 证书文件是否存在且路径正确"); - logger.error("2. APIv3密钥是否配置正确"); - logger.error("3. 商户证书序列号是否正确"); - logger.error("4. 网络连接是否正常"); - throw new RuntimeException("微信支付通知配置失败: " + e.getMessage(), e); + } else { + logger.info("✅ 使用缓存的通知配置 - 商户号: {}", mchId); } // 初始化 NotificationParser diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index 0c28dbf..fb70756 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -329,6 +329,10 @@ UPDATE shop_order + update_time = NOW(), + + expiration_time = #{param.expirationTime}, + pay_type = #{param.payType}, diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index da73b60..06a1b3a 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -834,7 +834,6 @@ public class ShopOrderServiceImpl extends ServiceImpl Date: Thu, 16 Apr 2026 01:17:23 +0800 Subject: [PATCH 12/60] =?UTF-8?q?fix(order):=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E5=91=98=E6=8F=90=E6=88=90=E7=9B=B4=E6=8E=A5=E5=85=A5?= =?UTF-8?q?=E8=B4=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 配送员提成由先入冻结金额 freeze_money 改为直接加入可提现余额 money - 更新两个 LambdaUpdateWrapper SQL 语句，修改相关字段及注释 - total_money 字段保持累计不变 - 修复 Transaction 类路径和字段结构导致的回调字段映射失败问题 - 优化回调通知配置缓存，避免重复初始化带来的网络请求失败风险 --- .workbuddy/memory/2026-04-16.md | 10 ++++++++++ pom.xml | 4 ++-- .../glt/service/impl/GltTicketOrderServiceImpl.java | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.workbuddy/memory/2026-04-16.md b/.workbuddy/memory/2026-04-16.md index cf3c159..2d3b551 100644 --- a/.workbuddy/memory/2026-04-16.md +++ b/.workbuddy/memory/2026-04-16.md @@ -40,6 +40,16 @@ import com.wechat.pay.java.service.payments.model.Transaction; ``` 两个 Transaction 包路径不同，字段结构有差异（服务商 Transaction 有 spAppid/spMchid 等字段），用错误的类解析回调会导致字段映射失败，交易状态无法正确读取。**已修复**：改为正确的直连商户模式 Transaction。 +--- + +## 配送员提成直接入账（01:15修改） + +**文件**：`src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java` + +**变更**：配送员提成（ticketOrderId 关联送水订单）从进入 `freeze_money` 改为直接进入 `money`（可提现余额）。修改了 2 处 `LambdaUpdateWrapper` SQL（`freeze_money` → `money`），注释同步更新。`total_money` 不变（仍累计）。 + +--- + ### 次要原因 `RSAAutoCertificateConfig` 每次回调都重新 `build()`，SDK 内部会发一次 `serial=test` 的探测验签，网络问题或并发场景下可能导致首次回调失败。**已优化**：添加 `notifyConfigCache`（ConcurrentHashMap）按 mchId 缓存 config，避免重复初始化。 diff --git a/pom.xml b/pom.xml index 67b484f..85b1581 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,10 @@ 4.0.0 com.gxwebsoft - glt-api + mp-api 1.0 - glt-api + mp-api WebSoftApi project for Spring Boot diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index cd01711..5a157d9 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -845,13 +845,13 @@ public class GltTicketOrderServiceImpl extends ServiceImpl() .eq(ShopDealerUser::getTenantId, tenantId) .eq(ShopDealerUser::getUserId, riderId) - .setSql("freeze_money = IFNULL(freeze_money,0) + " + money.toPlainString()) + .setSql("money = IFNULL(money,0) + " + money.toPlainString()) .setSql("total_money = IFNULL(total_money,0) + " + money.toPlainString()) .set(ShopDealerUser::getUpdateTime, now) ); @@ -895,7 +895,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl() .eq(ShopDealerUser::getTenantId, tenantId) .eq(ShopDealerUser::getUserId, riderId) - .setSql("freeze_money = IFNULL(freeze_money,0) + " + money.toPlainString()) + .setSql("money = IFNULL(money,0) + " + money.toPlainString()) .setSql("total_money = IFNULL(total_money,0) + " + money.toPlainString()) .set(ShopDealerUser::getUpdateTime, now) ); From eadaa8c4ddb4f5988a8489c2e7833beb8eb037f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 18 Apr 2026 10:58:38 +0800 Subject: [PATCH 13/60] =?UTF-8?q?docs(memory):=20=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=88=86=E9=94=80=E4=BD=A3=E9=87=91=E8=A7=A3=E5=86=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=86=E6=9E=90=E4=B8=8E=E6=8E=92=E6=9F=A5=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 DealerCommissionUnfreeze10584Task 解冻规则详解 - 说明送水套餐与非送水套餐的不同解冻触发条件 - 解析“已送达”与“已完成”状态区别及影响 - 列出常见未解冻原因及排查优先级 - 增加长期记忆文件中分销佣金解冻相关业务规则和状态流转说明 - 添加2026-04-18排查解冻任务未触发的问题及可能原因 - 更新专家历史记录，新增高级开发工程师吴八哥信息 - 新增生产环境 application-test.yml 配置文件示例 --- .workbuddy/expert-history.json | 13 +++- .workbuddy/memory/2026-04-16.md | 20 ++++++ .workbuddy/memory/2026-04-18.md | 13 ++++ .workbuddy/memory/MEMORY.md | 32 ++++++++++ src/main/resources/application-test.yml | 85 +++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 .workbuddy/memory/2026-04-18.md create mode 100644 src/main/resources/application-test.yml diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index f9fa735..9071aad 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -33,7 +33,18 @@ "usedAt": 1776000797914, "industryId": "all" } + ], + "d11a5ebd8e064cc19ff4a85b8d931dac": [ + { + "expertId": "SeniorDeveloper", + "name": "吴八哥", + "profession": "高级开发工程师", + "avatarUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/avatars/02-Engineering/SeniorDeveloper/SeniorDeveloper.png", + "promptUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/experts/02-Engineering/SeniorDeveloper/SeniorDeveloper_zh.md", + "usedAt": 1776443595917, + "industryId": "02-Engineering" + } ] }, - "lastUpdated": 1776017699886 + "lastUpdated": 1776444657438 } \ No newline at end of file diff --git a/.workbuddy/memory/2026-04-16.md b/.workbuddy/memory/2026-04-16.md index 2d3b551..deb77d4 100644 --- a/.workbuddy/memory/2026-04-16.md +++ b/.workbuddy/memory/2026-04-16.md @@ -50,6 +50,26 @@ import com.wechat.pay.java.service.payments.model.Transaction; --- +--- + +## 分销佣金解冻任务分析（DealerCommissionUnfreeze10584Task） + +**订单号**：2038841514750459904 + +### 解冻规则 +- **送水套餐**（shop_order.form_id IN 水票模板的 goods_id）：该订单关联的水票第一条送水订单 deliveryStatus=40（已完成）才触发解冻 +- **非送水套餐**（form_id 不在水票模板中）：shop_order.order_status=1 即触发解冻 + +### "已送达"≠"已完成"的关键区别 +- deliveryStatus=30（送达待确认）：配送员拍照确认送达，此时**不触发解冻** +- deliveryStatus=40（已完成）：需用户手动确认收货 OR 超时24h自动确认后才到达此状态 + +### 常见未解冻原因（按排查优先级） +1. 送水订单停在 deliveryStatus=30（送达待确认），未到 40（已完成） +2. shop_order.form_id 在水票模板里，走的是"送水套餐"逻辑，但没有找到对应的 glt_user_ticket 记录 +3. glt_user_ticket 记录缺失或 order_no 字段为空 +4. 已有 flowType=50 的解冻 marker（说明已解冻） + ### 次要原因 `RSAAutoCertificateConfig` 每次回调都重新 `build()`，SDK 内部会发一次 `serial=test` 的探测验签，网络问题或并发场景下可能导致首次回调失败。**已优化**：添加 `notifyConfigCache`（ConcurrentHashMap）按 mchId 缓存 config，避免重复初始化。 diff --git a/.workbuddy/memory/2026-04-18.md b/.workbuddy/memory/2026-04-18.md new file mode 100644 index 0000000..d8ab728 --- /dev/null +++ b/.workbuddy/memory/2026-04-18.md @@ -0,0 +1,13 @@ +# 2026-04-18 工作日志 + +## 排查解冻任务未触发问题 +- 用户反馈：GltTicketOrder订单已完成配送，但部分订单未触发解冻（freezeMoney未转到money） +- 完整梳理了资金流转链路：结算→冻结→解冻 +- 识别出5个可能原因： + 1. GltTicketOrder.userTicketId为NULL（解冻任务硬性过滤条件） + 2. GltUserTicket.orderNo缺失导致关联断裂 + 3. isFirstTicketOrderFinished()"第一条"逻辑阻断后续订单解冻 + 4. loadWaterFormIds()返回空集导致整个解冻任务跳过 + 5. 配送员提成orderNo格式不匹配（非bug，配送员提成本身不经过冻结） +- 提供了5条排查SQL和修复建议 +- 关键文件：DealerCommissionUnfreeze10584Task.java、GltTicketOrderServiceImpl.java diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md index e69de29..6343d2e 100644 --- a/.workbuddy/memory/MEMORY.md +++ b/.workbuddy/memory/MEMORY.md @@ -0,0 +1,32 @@ +# MEMORY.md - 长期记忆 + +## 项目概况 +- 后端：/Users/gxwebsoft/JAVA/java-10584（Spring Boot + MyBatis-Plus） +- 后台管理：/Users/gxwebsoft/VUE/mp-10584 +- 小程序端：/Users/gxwebsoft/VUE/template-10584 +- 多租户架构（tenantId 隔离），主力租户 10584 + +## 技术栈 +- 后端：Spring Boot + MyBatis-Plus + FastJSON 2.x +- 前端：Nuxt/Vue3 + TypeScript + Ant Design Vue4 + Tailwind +- 小程序：Uni-app/Taro +- 开发环境：Mac + Node.js v22 + JetBrains + Docker + pnpm + +## 业务规则备忘 + +### 分销佣金解冻规则（10584） +- 结算：DealerOrderSettlement10584Task 每10秒，佣金先入 freezeMoney +- 解冻：DealerCommissionUnfreeze10584Task 每20秒，freezeMoney→money +- 送水套餐解冻条件：同一userTicketId下第一条送水订单deliveryStatus=40 +- 非送水套餐解冻条件：ShopOrder.orderStatus=1 且 payStatus=true +- 幂等标记：ShopDealerCapital(flowType=50, comments="佣金解冻(capitalId=xxx)") +- 配送员提成：直接入money（不经过冻结），orderNo格式="gltTicketOrder:"+id + +### 送水订单状态流转 +- 10(待配送)→20(配送中)→30(待客户确认)→40(已完成) +- delivered()配送员确认送达时就会同步ShopOrder.orderStatus=1 +- confirmReceive()/autoConfirmTimeout()也会同步 + +### 已知排查问题 +- 解冻任务可能因 userTicketId为空、GltUserTicket.orderNo缺失、"第一条未完成"阻断等原因未触发 +- 解冻任务依赖 loadWaterFormIds() 不为空，否则整个任务跳过 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..185951d --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,85 @@ +# 生产环境配置 + +# 数据源配置 +spring: + datasource: + url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + username: modules + password: tYmmMGh5wpwXR3ae + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + druid: + remove-abandoned: true + + # redis + redis: + database: 0 + host: 47.107.249.41 + port: 16379 + password: redis_t74P8C + +# 日志配置 +logging: + file: + name: websoft-modules.log + level: + root: WARN + com.gxwebsoft: ERROR + com.baomidou.mybatisplus: ERROR + +socketio: + host: 0.0.0.0 #IP地址 + +# MQTT配置 +mqtt: + enabled: false # 启用MQTT服务 + host: tcp://132.232.214.96:1883 + username: swdev + password: Sw20250523 + client-id-prefix: hjm_car_ + topic: /SW_GPS/# + qos: 2 + connection-timeout: 10 + keep-alive-interval: 20 + auto-reconnect: true + +# 框架配置 +config: + # 文件服务器 + file-server: https://file-s209.shoplnk.cn + # 生产环境接口 + server-url: https://glt-server.websoft.top/api + # 业务模块接口 + api-url: https://glt-api.websoft.top/api + upload-path: /www/wwwroot/file.ws + + # 阿里云OSS云存储 + endpoint: https://oss-cn-shenzhen.aliyuncs.com + accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP + accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM + bucketName: oss-gxwebsoft + bucketDomain: https://oss.wsdns.cn + aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com + +# 生产环境证书配置 +certificate: + load-mode: VOLUME # 生产环境从Docker挂载卷加载 + cert-root-path: /www/wwwroot/file.ws + +# 支付配置缓存 +payment: + cache: + # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 + key-prefix: "Payment:1" + # 缓存过期时间（小时） + expire-hours: 24 +# 阿里云翻译配置 +aliyun: + translate: + access-key-id: LTAI5tEsyhW4GCKbds1qsopg + access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO + endpoint: mt.cn-hangzhou.aliyuncs.com +wechatpay: + transfer: + scene-id: 1005 + scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' From d9e4371735d70f236fe101bc2c7254309c3e21d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 21 Apr 2026 00:04:41 +0800 Subject: [PATCH 14/60] =?UTF-8?q?feat(shop):=20=E5=AE=9E=E7=8E=B0=E5=88=86?= =?UTF-8?q?=E9=94=80=E8=AE=A2=E5=8D=95=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E4=BD=A3=E9=87=91=E8=A7=A3=E5=86=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增ShopDealerOrderController.manualUnfreeze接口，支持通过订单号手动触发佣金解冻 - 在ShopDealerOrderService及实现类添加manualUnfreeze方法，实现手动解冻业务逻辑 - 手动解冻包含分销订单查询、状态校验、关联商城订单与水票套餐校验 - 补充手动解冻中配送奖励发放逻辑，保证幂等，记录详细处理信息 - 丰富手动解冻的异常处理与业务日志，方便排查与追踪 - 优化DealerCommissionUnfreeze10584Task定时任务，增强日志详尽度和流程步骤清晰性 - 对送水订单和非送水订单条件进行精确分类处理，避免误判 - 调整配送奖励发放逻辑，确保任务和手动触发路径一致 - 引入多处日志打印提升监控和调试能力，包括订单过滤、佣金解冻和配送奖励发放情况 --- .workbuddy/expert-history.json | 13 +- .../DealerCommissionUnfreeze10584Task.java | 369 ++++++++----- .../controller/ShopDealerOrderController.java | 19 + .../shop/service/ShopDealerOrderService.java | 9 + .../impl/ShopDealerOrderServiceImpl.java | 497 +++++++++++++++++- 5 files changed, 760 insertions(+), 147 deletions(-) diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index 9071aad..c0f2131 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -44,7 +44,18 @@ "usedAt": 1776443595917, "industryId": "02-Engineering" } + ], + "e339ec20b1ef45479756bdfdf93c3654": [ + { + "expertId": "SeniorDeveloper", + "name": "吴八哥", + "profession": "高级开发工程师", + "avatarUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/avatars/02-Engineering/SeniorDeveloper/SeniorDeveloper.png", + "promptUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/experts/02-Engineering/SeniorDeveloper/SeniorDeveloper_zh.md", + "usedAt": 1776696820692, + "industryId": "02-Engineering" + } ] }, - "lastUpdated": 1776444657438 + "lastUpdated": 1776699418893 } \ No newline at end of file diff --git a/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java b/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java index 1791b86..41ae77b 100644 --- a/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java @@ -33,6 +33,7 @@ import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -48,7 +49,7 @@ import java.util.concurrent.atomic.AtomicBoolean; *

1) 送水套餐(formId in 水票模板 goodsId)：订单号关联的水票产生了第一次送水订单，且该第一次送水订单状态=已完成(40) -> 解冻。

*

2) 非送水套餐(formId not in 水票模板 goodsId)：订单已确认收货(orderStatus=1) -> 解冻。

* - *

实现策略：以 ShopDealerCapital(flowType=10) 的“佣金明细”为解冻粒度， + *

实现策略：以 ShopDealerCapital(flowType=10) 的"佣金明细"为解冻粒度， * 每条佣金明细对应生成一条 ShopDealerCapital(flowType=50) 作为幂等标记，并执行 * ShopDealerUser.freezeMoney -> ShopDealerUser.money 的转移。

*/ @@ -76,7 +77,7 @@ public class DealerCommissionUnfreeze10584Task { if (rawRate == null || rawRate.signum() <= 0) { return null; } - // 如果录入 >= 1，按“百分比”处理（1 => 1%） + // 如果录入 >= 1，按"百分比"处理（1 => 1%） if (rawRate.compareTo(BigDecimal.ONE) >= 0) { return rawRate.movePointLeft(2); } @@ -115,7 +116,7 @@ public class DealerCommissionUnfreeze10584Task { private final AtomicBoolean running = new AtomicBoolean(false); - @Scheduled(cron = "${dealer.commission.unfreeze10584.cron:0/20 * * * * ?}") + @Scheduled(cron = "${dealer.commission.unfreeze10584.cron:0/50 * * * * ?}") @IgnoreTenant("定时任务无登录态，需忽略租户隔离；内部使用 tenantId=10584 精确过滤") public void run() { if (!running.compareAndSet(false, true)) { @@ -124,46 +125,77 @@ public class DealerCommissionUnfreeze10584Task { } try { + // ========== 步骤1: 加载水票模板 ========== Set waterFormIds = loadWaterFormIds(); + log.info("【步骤1】加载水票模板 - tenantId={}, waterFormIds={}", TENANT_ID, waterFormIds); if (waterFormIds.isEmpty()) { // 送水/非送水的判断依赖模板 goodsId；拿不到会导致误判，宁可跳过本轮。 log.warn("分销佣金解冻任务跳过：未找到水票模板 goodsId - tenantId={}", TENANT_ID); return; } - // 先按“最近确认收货”的订单扫描，避免总是卡在很早的历史订单上。 + // ========== 步骤2: 扫描非送水订单（优先最新） ========== Set eligibleOrderNos = new HashSet<>(); - eligibleOrderNos.addAll(findEligibleNonWaterOrderNos(waterFormIds, true)); - eligibleOrderNos.addAll(findEligibleWaterOrderNosByFirstFinishedTicketOrder(waterFormIds)); + List nonWaterOrders = findEligibleNonWaterOrderNos(waterFormIds, true); + log.info("【步骤2】扫描非送水订单（最新优先）- tenantId={}, count={}, orderNos={}", TENANT_ID, nonWaterOrders.size(), nonWaterOrders.size() <= 20 ? nonWaterOrders : nonWaterOrders.subList(0, 20)); + eligibleOrderNos.addAll(nonWaterOrders); + + // ========== 步骤3: 扫描送水订单（第一条送水完成） ========== + Set waterOrders = findEligibleWaterOrderNosByFirstFinishedTicketOrder(waterFormIds); + log.info("【步骤3】扫描送水订单（第一条送水完成）- tenantId={}, count={}, orderNos={}", TENANT_ID, waterOrders.size(), waterOrders); + eligibleOrderNos.addAll(waterOrders); if (eligibleOrderNos.isEmpty()) { + log.info("【步骤4-9】无可处理订单，本轮结束 - tenantId={}", TENANT_ID); return; } + // 订单太多时不打印完整列表 + String orderNosSummary = eligibleOrderNos.size() <= 30 ? eligibleOrderNos.toString() : eligibleOrderNos.size() + " orders (too many to show)"; + log.info("【步骤4】汇总待处理订单 - tenantId={}, totalCount={}, orderNos={}", TENANT_ID, eligibleOrderNos.size(), orderNosSummary); - // 配送奖励（与佣金解冻独立）：按订单发放，幂等保证不会重复入账 + // ========== 步骤5: 发放配送奖励 ========== + log.info("【步骤5】开始发放配送奖励 - tenantId={}, orderCount={}", TENANT_ID, eligibleOrderNos.size()); int rewarded = 0; + List rewardedOrders = new ArrayList<>(); for (String orderNo : eligibleOrderNos) { try { if (settleDeliveryRewardIfNeeded(orderNo)) { rewarded++; + rewardedOrders.add(orderNo); } } catch (Exception e) { log.error("发放配送奖励失败，将在下次任务重试 - tenantId={}, orderNo={}", TENANT_ID, orderNo, e); } } + log.info("【步骤5】配送奖励发放完成 - tenantId={}, rewardedCount={}, rewardedOrders={}", TENANT_ID, rewarded, rewardedOrders); + // ========== 步骤6: 查询佣金明细 ========== + log.info("【步骤6】查询佣金明细（flowType=10）- tenantId={}, orderCount={}", TENANT_ID, eligibleOrderNos.size()); List capitals = findCapitalsByEligibleOrderNos(eligibleOrderNos); + String capitalsSummary = capitals.size() <= 50 + ? capitals.stream().map(c -> "capitalId=" + c.getId() + ", orderNo=" + c.getOrderNo() + ", amount=" + c.getMoney()).toList().toString() + : capitals.size() + " capitals (too many to show)"; + log.info("【步骤6】查询到佣金明细 - tenantId={}, count={}, capitals={}", TENANT_ID, capitals.size(), capitalsSummary); + if (capitals.isEmpty()) { - // 若本轮没有取到佣金明细，回退再按“最早确认收货”的订单扫一轮，尽量覆盖历史遗留未解冻。 + // ========== 步骤6.1: 兜底扫描历史订单 ========== + log.info("【步骤6.1】本轮未取到佣金明细，执行兜底扫描（最早确认收货） - tenantId={}", TENANT_ID); eligibleOrderNos.clear(); - eligibleOrderNos.addAll(findEligibleNonWaterOrderNos(waterFormIds, false)); - eligibleOrderNos.addAll(findEligibleWaterOrderNosByFirstFinishedTicketOrder(waterFormIds)); + List fallbackNonWater = findEligibleNonWaterOrderNos(waterFormIds, false); + log.info("【步骤6.1】兜底-非送水订单 - tenantId={}, count={}", TENANT_ID, fallbackNonWater.size()); + eligibleOrderNos.addAll(fallbackNonWater); + + Set fallbackWater = findEligibleWaterOrderNosByFirstFinishedTicketOrder(waterFormIds); + log.info("【步骤6.1】兜底-送水订单 - tenantId={}, count={}", TENANT_ID, fallbackWater.size()); + eligibleOrderNos.addAll(fallbackWater); // 兜底扫描出来的订单也补发配送奖励（幂等） + log.info("【步骤6.1】兜底扫描后补发配送奖励 - tenantId={}, orderCount={}", TENANT_ID, eligibleOrderNos.size()); for (String orderNo : eligibleOrderNos) { try { if (settleDeliveryRewardIfNeeded(orderNo)) { rewarded++; + rewardedOrders.add(orderNo + "(兜底)"); } } catch (Exception e) { log.error("发放配送奖励失败，将在下次任务重试 - tenantId={}, orderNo={}", TENANT_ID, orderNo, e); @@ -171,32 +203,41 @@ public class DealerCommissionUnfreeze10584Task { } capitals = findCapitalsByEligibleOrderNos(eligibleOrderNos); + log.info("【步骤6.1】兜底扫描到佣金明细 - tenantId={}, count={}", TENANT_ID, capitals.size()); } if (capitals.isEmpty()) { + log.info("【步骤7-9】仍未查到佣金明细，本轮结束 - tenantId={}", TENANT_ID); return; } + // ========== 步骤7: 执行佣金解冻 ========== + log.info("【步骤7】开始执行佣金解冻 - tenantId={}, totalCount={}", TENANT_ID, capitals.size()); int unfrozen = 0; + List unfrozenDetails = new ArrayList<>(); for (ShopDealerCapital cap : capitals) { try { boolean ok = unfreezeOneCapitalIfNeeded(cap); if (ok) { unfrozen++; + unfrozenDetails.add("capitalId=" + cap.getId() + ", orderNo=" + cap.getOrderNo() + ", amount=" + cap.getMoney()); } } catch (Exception e) { log.error("解冻佣金失败，将在下次任务重试 - tenantId={}, capitalId={}, orderNo={}, userId={}", TENANT_ID, cap != null ? cap.getId() : null, cap != null ? cap.getOrderNo() : null, cap != null ? cap.getUserId() : null, e); } } + log.info("【步骤7】佣金解冻完成 - tenantId={}, unfrozenDetails={}", TENANT_ID, unfrozenDetails); - if (unfrozen > 0) { - log.info("分销佣金解冻完成 - tenantId={}, eligibleOrderNos={}, scannedCapitals={}, unfrozen={}", - TENANT_ID, eligibleOrderNos.size(), capitals.size(), unfrozen); - } - if (rewarded > 0) { - log.info("配送奖励发放完成 - tenantId={}, eligibleOrderNos={}, rewarded={}", TENANT_ID, eligibleOrderNos.size(), rewarded); - } + // ========== 步骤8: 更新分销订单状态 ========== + log.info("【步骤8】检查并更新分销订单状态（isUnfreeze=1）- tenantId={}, unfrozenCount={}", TENANT_ID, unfrozen); + + // ========== 步骤9: 汇总报告 ========== + log.info("========================================"); + log.info("【步骤9】本轮任务执行完毕 - tenantId={}", TENANT_ID); + log.info(" - 配送奖励: rewarded={}, orders={}", rewarded, rewardedOrders); + log.info(" - 佣金解冻: unfrozen={}, details={}", unfrozen, unfrozenDetails); + log.info("========================================"); } finally { running.set(false); } @@ -204,8 +245,10 @@ public class DealerCommissionUnfreeze10584Task { private boolean settleDeliveryRewardIfNeeded(String orderNo) { if (orderNo == null || orderNo.isBlank()) { + log.debug("【步骤5.X】配送奖励跳过：orderNo为空 - tenantId={}", TENANT_ID); return false; } + log.debug("【步骤5.X】开始处理配送奖励 - tenantId={}, orderNo={}", TENANT_ID, orderNo); ShopOrder order = shopOrderService.getOne( new LambdaQueryWrapper() @@ -215,13 +258,16 @@ public class DealerCommissionUnfreeze10584Task { .last("limit 1") ); if (order == null) { + log.debug("【步骤5.X】配送奖励跳过：订单不存在 - tenantId={}, orderNo={}", TENANT_ID, orderNo); return false; } Integer riderId = order.getRiderId(); if (riderId == null || riderId <= 0) { + log.debug("【步骤5.X】配送奖励跳过：无配送员 - tenantId={}, orderNo={}", TENANT_ID, orderNo); return false; } + log.debug("【步骤5.X】找到配送员 - tenantId={}, orderNo={}, riderId={}", TENANT_ID, orderNo, riderId); // 快速幂等检查：已发放则跳过（事务内仍会二次校验避免并发重复） boolean already = shopDealerCapitalService.count( @@ -231,147 +277,162 @@ public class DealerCommissionUnfreeze10584Task { .eq(ShopDealerCapital::getOrderNo, orderNo) ) > 0; if (already) { + log.debug("【步骤5.X】配送奖励跳过：已发放（幂等）- tenantId={}, orderNo={}", TENANT_ID, orderNo); return false; } + log.debug("【步骤5.X】进入事务 - tenantId={}, orderNo={}", TENANT_ID, orderNo); - return Boolean.TRUE.equals(transactionTemplate.execute(status -> { - LocalDateTime now = LocalDateTime.now(); + try { + return Boolean.TRUE.equals(transactionTemplate.execute(status -> { + LocalDateTime now = LocalDateTime.now(); + log.debug("【步骤5.X】事务内开始 - tenantId={}, orderNo={}", TENANT_ID, orderNo); - // 锁定配送员资金明细 marker，确保并发幂等 - ShopDealerCapital existedMarker = shopDealerCapitalService.getOne( - new LambdaQueryWrapper() - .eq(ShopDealerCapital::getTenantId, TENANT_ID) - .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_DELIVERY_REWARD) - .eq(ShopDealerCapital::getOrderNo, orderNo) - .last("limit 1 for update") - ); - if (existedMarker != null) { - return false; - } - - Integer orderId = order.getOrderId(); - if (orderId == null) { - return false; - } - - List orderGoodsList = shopOrderGoodsService.list( - new LambdaQueryWrapper() - .eq(ShopOrderGoods::getTenantId, TENANT_ID) - .eq(ShopOrderGoods::getOrderId, orderId) - ); - if (orderGoodsList == null || orderGoodsList.isEmpty()) { - return false; - } - - List goodsIds = orderGoodsList.stream() - .map(ShopOrderGoods::getGoodsId) - .filter(Objects::nonNull) - .distinct() - .toList(); - if (goodsIds.isEmpty()) { - return false; - } - - Map goodsDeliveryMoneyMap = shopGoodsService.list( - new LambdaQueryWrapper() - .eq(ShopGoods::getTenantId, TENANT_ID) - .in(ShopGoods::getGoodsId, goodsIds) - ).stream().collect(java.util.stream.Collectors.toMap( - ShopGoods::getGoodsId, - g -> g.getDeliveryMoney() != null ? g.getDeliveryMoney() : BigDecimal.ZERO, - (a, b) -> a - )); - - BigDecimal reward = BigDecimal.ZERO; - for (ShopOrderGoods og : orderGoodsList) { - Integer goodsId = og.getGoodsId(); - if (goodsId == null) { - continue; + // 锁定配送员资金明细 marker，确保并发幂等 + ShopDealerCapital existedMarker = shopDealerCapitalService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, TENANT_ID) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_DELIVERY_REWARD) + .eq(ShopDealerCapital::getOrderNo, orderNo) + .last("limit 1 for update") + ); + if (existedMarker != null) { + log.debug("【步骤5.X】配送奖励跳过：事务内检测已存在 - tenantId={}, orderNo={}", TENANT_ID, orderNo); + return false; } - int qty = og.getTotalNum() == null ? 0 : og.getTotalNum(); - if (qty <= 0) { - continue; - } - BigDecimal rawRate = goodsDeliveryMoneyMap.getOrDefault(goodsId, BigDecimal.ZERO); - BigDecimal rate = normalizeDeliveryRate(rawRate); - if (rate == null || rate.signum() <= 0) { - continue; - } - BigDecimal unitPrice = og.getPrice() != null ? og.getPrice() : BigDecimal.ZERO; - if (unitPrice.signum() <= 0) { - continue; - } - BigDecimal lineAmount = unitPrice.multiply(BigDecimal.valueOf(qty)); - reward = reward.add(lineAmount.multiply(rate)); - } - reward = reward.setScale(2, RoundingMode.HALF_UP); - if (reward.signum() <= 0) { - return false; - } + Integer orderId = order.getOrderId(); + if (orderId == null) { + log.debug("【步骤5.X】配送奖励跳过：orderId为空 - tenantId={}, orderNo={}", TENANT_ID, orderNo); + return false; + } - // 锁定/创建配送员分销账户 - ShopDealerUser dealerUser = shopDealerUserService.getOne( - new LambdaQueryWrapper() - .eq(ShopDealerUser::getTenantId, TENANT_ID) - .eq(ShopDealerUser::getUserId, riderId) - .last("limit 1 for update") - ); - if (dealerUser == null) { - ShopDealerUser newDealerUser = new ShopDealerUser(); - newDealerUser.setTenantId(TENANT_ID); - newDealerUser.setUserId(riderId); - newDealerUser.setType(0); - newDealerUser.setIsDelete(0); - newDealerUser.setSortNumber(0); - newDealerUser.setFirstNum(0); - newDealerUser.setSecondNum(0); - newDealerUser.setThirdNum(0); - newDealerUser.setMoney(BigDecimal.ZERO); - newDealerUser.setFreezeMoney(BigDecimal.ZERO); - newDealerUser.setTotalMoney(BigDecimal.ZERO); - newDealerUser.setCreateTime(now); - newDealerUser.setUpdateTime(now); - shopDealerUserService.save(newDealerUser); + List orderGoodsList = shopOrderGoodsService.list( + new LambdaQueryWrapper() + .eq(ShopOrderGoods::getTenantId, TENANT_ID) + .eq(ShopOrderGoods::getOrderId, orderId) + ); + if (orderGoodsList == null || orderGoodsList.isEmpty()) { + log.debug("【步骤5.X】配送奖励跳过：订单商品为空 - tenantId={}, orderNo={}", TENANT_ID, orderNo); + return false; + } - dealerUser = shopDealerUserService.getOne( + List goodsIds = orderGoodsList.stream() + .map(ShopOrderGoods::getGoodsId) + .filter(Objects::nonNull) + .distinct() + .toList(); + if (goodsIds.isEmpty()) { + log.debug("【步骤5.X】配送奖励跳过：商品ID列表为空 - tenantId={}, orderNo={}", TENANT_ID, orderNo); + return false; + } + + Map goodsDeliveryMoneyMap = shopGoodsService.list( + new LambdaQueryWrapper() + .eq(ShopGoods::getTenantId, TENANT_ID) + .in(ShopGoods::getGoodsId, goodsIds) + ).stream().collect(java.util.stream.Collectors.toMap( + ShopGoods::getGoodsId, + g -> g.getDeliveryMoney() != null ? g.getDeliveryMoney() : BigDecimal.ZERO, + (a, b) -> a + )); + + BigDecimal reward = BigDecimal.ZERO; + for (ShopOrderGoods og : orderGoodsList) { + Integer goodsId = og.getGoodsId(); + if (goodsId == null) { + continue; + } + int qty = og.getTotalNum() == null ? 0 : og.getTotalNum(); + if (qty <= 0) { + continue; + } + BigDecimal rawRate = goodsDeliveryMoneyMap.getOrDefault(goodsId, BigDecimal.ZERO); + BigDecimal rate = normalizeDeliveryRate(rawRate); + if (rate == null || rate.signum() <= 0) { + continue; + } + BigDecimal unitPrice = og.getPrice() != null ? og.getPrice() : BigDecimal.ZERO; + if (unitPrice.signum() <= 0) { + continue; + } + BigDecimal lineAmount = unitPrice.multiply(BigDecimal.valueOf(qty)); + reward = reward.add(lineAmount.multiply(rate)); + } + + reward = reward.setScale(2, RoundingMode.HALF_UP); + if (reward.signum() <= 0) { + log.debug("【步骤5.X】配送奖励跳过：计算金额为0 - tenantId={}, orderNo={}", TENANT_ID, orderNo); + return false; + } + log.debug("【步骤5.X】计算配送奖励 - tenantId={}, orderNo={}, reward={}", TENANT_ID, orderNo, reward); + + // 锁定/创建配送员分销账户 + ShopDealerUser dealerUser = shopDealerUserService.getOne( new LambdaQueryWrapper() .eq(ShopDealerUser::getTenantId, TENANT_ID) .eq(ShopDealerUser::getUserId, riderId) .last("limit 1 for update") ); if (dealerUser == null) { - log.warn("配送奖励入账失败：未找到/创建分销账户 - tenantId={}, orderNo={}, riderId={}", TENANT_ID, orderNo, riderId); + log.info("【步骤5.X】创建配送员分销账户 - tenantId={}, orderNo={}, riderId={}", TENANT_ID, orderNo, riderId); + ShopDealerUser newDealerUser = new ShopDealerUser(); + newDealerUser.setTenantId(TENANT_ID); + newDealerUser.setUserId(riderId); + newDealerUser.setType(0); + newDealerUser.setIsDelete(0); + newDealerUser.setSortNumber(0); + newDealerUser.setFirstNum(0); + newDealerUser.setSecondNum(0); + newDealerUser.setThirdNum(0); + newDealerUser.setMoney(BigDecimal.ZERO); + newDealerUser.setFreezeMoney(BigDecimal.ZERO); + newDealerUser.setTotalMoney(BigDecimal.ZERO); + newDealerUser.setCreateTime(now); + newDealerUser.setUpdateTime(now); + shopDealerUserService.save(newDealerUser); + + dealerUser = shopDealerUserService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerUser::getTenantId, TENANT_ID) + .eq(ShopDealerUser::getUserId, riderId) + .last("limit 1 for update") + ); + if (dealerUser == null) { + log.warn("配送奖励入账失败：未找到/创建分销账户 - tenantId={}, orderNo={}, riderId={}", TENANT_ID, orderNo, riderId); + return false; + } + } + + BigDecimal moneyVal = dealerUser.getMoney() != null ? dealerUser.getMoney() : BigDecimal.ZERO; + BigDecimal totalMoneyVal = dealerUser.getTotalMoney() != null ? dealerUser.getTotalMoney() : BigDecimal.ZERO; + dealerUser.setMoney(moneyVal.add(reward)); + dealerUser.setTotalMoney(totalMoneyVal.add(reward)); + dealerUser.setUpdateTime(now); + if (!shopDealerUserService.updateById(dealerUser)) { + log.warn("配送奖励入账失败：更新分销账户失败 - tenantId={}, orderNo={}, riderId={}, reward={}", TENANT_ID, orderNo, riderId, reward); return false; } - } - BigDecimal moneyVal = dealerUser.getMoney() != null ? dealerUser.getMoney() : BigDecimal.ZERO; - BigDecimal totalMoneyVal = dealerUser.getTotalMoney() != null ? dealerUser.getTotalMoney() : BigDecimal.ZERO; - dealerUser.setMoney(moneyVal.add(reward)); - dealerUser.setTotalMoney(totalMoneyVal.add(reward)); - dealerUser.setUpdateTime(now); - if (!shopDealerUserService.updateById(dealerUser)) { - log.warn("配送奖励入账失败：更新分销账户失败 - tenantId={}, orderNo={}, riderId={}, reward={}", TENANT_ID, orderNo, riderId, reward); - return false; - } + ShopDealerCapital cap = new ShopDealerCapital(); + cap.setUserId(riderId); + cap.setOrderNo(orderNo); + cap.setFlowType(FLOW_TYPE_DELIVERY_REWARD); + cap.setMoney(reward); + cap.setComments("配送奖励"); + cap.setToUserId(order.getUserId()); + cap.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); + cap.setTenantId(TENANT_ID); + cap.setCreateTime(now); + cap.setUpdateTime(now); + shopDealerCapitalService.save(cap); - ShopDealerCapital cap = new ShopDealerCapital(); - cap.setUserId(riderId); - cap.setOrderNo(orderNo); - cap.setFlowType(FLOW_TYPE_DELIVERY_REWARD); - cap.setMoney(reward); - cap.setComments("配送奖励"); - cap.setToUserId(order.getUserId()); - cap.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); - cap.setTenantId(TENANT_ID); - cap.setCreateTime(now); - cap.setUpdateTime(now); - shopDealerCapitalService.save(cap); - - log.info("配送奖励发放成功 - tenantId={}, orderNo={}, riderId={}, reward={}", TENANT_ID, orderNo, riderId, reward); - return true; - })); + log.info("【步骤5.X】配送奖励发放成功 - tenantId={}, orderNo={}, riderId={}, reward={}", TENANT_ID, orderNo, riderId, reward); + return true; + })); + } catch (Exception e) { + log.error("【步骤5.X】配送奖励发放异常 - tenantId={}, orderNo={}, error={}", TENANT_ID, orderNo, e.getMessage(), e); + return false; + } } private Set loadWaterFormIds() { @@ -408,10 +469,11 @@ public class DealerCommissionUnfreeze10584Task { } private Set findEligibleWaterOrderNosByFirstFinishedTicketOrder(Set waterFormIds) { - // 缓存减少 DB 往返：userTicketId -> 是否“第一次送水单已完成” + // 缓存减少 DB 往返：userTicketId -> 是否"第一次送水单已完成" Map firstFinishedCache = new HashMap<>(); Map userTicketOrderNoCache = new HashMap<>(); + log.info("【步骤3.1】查询已完成的送水订单 - tenantId={}, limit={}", TENANT_ID, MAX_ELIGIBLE_TICKET_ORDERS_PER_RUN); List finishedTicketOrders = gltTicketOrderService.list( new LambdaQueryWrapper() .eq(GltTicketOrder::getTenantId, TENANT_ID) @@ -421,21 +483,27 @@ public class DealerCommissionUnfreeze10584Task { .orderByDesc(GltTicketOrder::getId) .last("limit " + MAX_ELIGIBLE_TICKET_ORDERS_PER_RUN) ); + log.info("【步骤3.1】查到已完成的送水订单数量 - tenantId={}, count={}", TENANT_ID, finishedTicketOrders.size()); Set orderNos = new HashSet<>(); + int checked = 0, skippedNull = 0, skippedNotFirst = 0, skippedNoOrderNo = 0, skippedNotWater = 0; for (GltTicketOrder ticketOrder : finishedTicketOrders) { Integer userTicketId = ticketOrder.getUserTicketId(); + checked++; if (userTicketId == null) { + skippedNull++; continue; } boolean firstFinished = firstFinishedCache.computeIfAbsent(userTicketId, id -> isFirstTicketOrderFinished(id)); if (!firstFinished) { + skippedNotFirst++; continue; } String orderNo = userTicketOrderNoCache.computeIfAbsent(userTicketId, id -> findOrderNoByUserTicketId(id)); if (orderNo == null || orderNo.isBlank()) { + skippedNoOrderNo++; continue; } @@ -449,6 +517,7 @@ public class DealerCommissionUnfreeze10584Task { .last("limit 1") ); if (shopOrder == null || shopOrder.getFormId() == null || !waterFormIds.contains(shopOrder.getFormId())) { + skippedNotWater++; continue; } @@ -457,6 +526,8 @@ public class DealerCommissionUnfreeze10584Task { break; } } + log.info("【步骤3.2】送水订单筛选完成 - tenantId={}, checked={}, skippedNull={}, skippedNotFirst={}, skippedNoOrderNo={}, skippedNotWater={}, matched={}, orderNos={}", + TENANT_ID, checked, skippedNull, skippedNotFirst, skippedNoOrderNo, skippedNotWater, orderNos.size(), orderNos); return orderNos; } @@ -493,7 +564,9 @@ public class DealerCommissionUnfreeze10584Task { if (eligibleOrderNos == null || eligibleOrderNos.isEmpty()) { return List.of(); } - return shopDealerCapitalService.list( + // 先按 eligibleOrderNos 集合的顺序（最新订单优先）处理佣金 + // 注意：MyBatis-Plus 的 in 查询会保持 in() 列表的顺序 + List capitals = shopDealerCapitalService.list( new LambdaQueryWrapper() .eq(ShopDealerCapital::getTenantId, TENANT_ID) .eq(ShopDealerCapital::getFlowType, 10) @@ -502,6 +575,14 @@ public class DealerCommissionUnfreeze10584Task { .orderByAsc(ShopDealerCapital::getId) .last("limit " + MAX_CAPITALS_PER_RUN) ); + // 按 eligibleOrderNos 的顺序重新排序（最新订单优先） + List orderList = List.copyOf(eligibleOrderNos); + capitals.sort((a, b) -> { + int idxA = orderList.indexOf(a.getOrderNo()); + int idxB = orderList.indexOf(b.getOrderNo()); + return Integer.compare(idxA, idxB); + }); + return capitals; } private boolean unfreezeOneCapitalIfNeeded(ShopDealerCapital cap) { @@ -546,7 +627,7 @@ public class DealerCommissionUnfreeze10584Task { return false; } - // RR 隔离级别下，先锁 user 行，再用锁定读检查 marker，避免“读到旧快照”导致重复解冻。 + // RR 隔离级别下，先锁 user 行，再用锁定读检查 marker，避免"读到旧快照"导致重复解冻。 ShopDealerCapital existedMarker = shopDealerCapitalService.getOne( new LambdaQueryWrapper() .eq(ShopDealerCapital::getTenantId, TENANT_ID) @@ -590,7 +671,7 @@ public class DealerCommissionUnfreeze10584Task { marker.setUpdateTime(now); shopDealerCapitalService.save(marker); - // 佣金全部解冻完成后，将分销订单状态置为“已解冻”(0)。 + // 佣金全部解冻完成后，将分销订单状态置为"已解冻"(0)。 // 以当前任务生成的 flowType=50 marker 数量作为完成度判断，避免提前将订单置为已解冻。 setDealerOrderUnfrozenIfCompleted(orderNo, now); diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java index 2ecc05e..8b7aca1 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java @@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * 分销商订单记录表控制器 @@ -168,4 +169,22 @@ public class ShopDealerOrderController extends BaseController { } return fail("导入失败", null); } + + @PreAuthorize("hasAuthority('shop:shopDealerOrder:update')") + @OperationLog + @Operation(summary = "手动触发单条订单佣金解冻") + @PostMapping("/unfreeze") + public ApiResult manualUnfreeze(@RequestBody Map body) { + String orderNo = (String) body.get("orderNo"); + if (orderNo == null || orderNo.isBlank()) { + return fail("订单编号不能为空", null); + } + Integer tenantId = getTenantId(); + try { + String detail = shopDealerOrderService.manualUnfreeze(orderNo, tenantId); + return success("解冻执行完成", detail); + } catch (Exception e) { + return fail(e.getMessage(),null); + } + } } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java index 8390e29..4e4f057 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java @@ -39,4 +39,13 @@ public interface ShopDealerOrderService extends IService { */ ShopDealerOrder getByIdRel(Integer id); + /** + * 手动触发单条订单的佣金解冻（保留与定时任务相同的前置条件检查） + * + * @param orderNo 分销订单号 + * @param tenantId 租户ID + * @return 解冻结果描述（包含成功/失败详情） + */ + String manualUnfreeze(String orderNo, Integer tenantId); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java index 0bab68f..e34a778 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java @@ -1,15 +1,43 @@ package com.gxwebsoft.shop.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.ShopDealerOrderMapper; -import com.gxwebsoft.shop.service.ShopDealerOrderService; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.glt.entity.GltTicketOrder; +import com.gxwebsoft.glt.entity.GltTicketTemplate; +import com.gxwebsoft.glt.entity.GltUserTicket; +import com.gxwebsoft.glt.service.GltTicketOrderService; +import com.gxwebsoft.glt.service.GltTicketTemplateService; +import com.gxwebsoft.glt.service.GltUserTicketService; +import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.entity.ShopDealerOrder; +import com.gxwebsoft.shop.entity.ShopDealerUser; +import com.gxwebsoft.shop.entity.ShopGoods; +import com.gxwebsoft.shop.entity.ShopOrder; +import com.gxwebsoft.shop.entity.ShopOrderGoods; +import com.gxwebsoft.shop.mapper.ShopDealerOrderMapper; +import com.gxwebsoft.shop.service.ShopDealerCapitalService; +import com.gxwebsoft.shop.service.ShopDealerOrderService; import com.gxwebsoft.shop.param.ShopDealerOrderParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.support.TransactionTemplate; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; /** * 分销商订单记录表Service实现 @@ -18,8 +46,41 @@ import java.util.List; * @since 2025-08-12 11:55:18 */ @Service +@Slf4j public class ShopDealerOrderServiceImpl extends ServiceImpl implements ShopDealerOrderService { + private static final int ORDER_STATUS_CONFIRMED_RECEIVE = 1; + private static final int FLOW_TYPE_COMMISSION = 10; + private static final int FLOW_TYPE_UNFREEZE = 50; + private static final int FLOW_TYPE_DELIVERY_REWARD = 60; + + @Resource + private TransactionTemplate transactionTemplate; + + @Resource + private com.gxwebsoft.shop.service.ShopOrderService shopOrderService; + + @Resource + private com.gxwebsoft.shop.service.ShopOrderGoodsService shopOrderGoodsService; + + @Resource + private com.gxwebsoft.shop.service.ShopGoodsService shopGoodsService; + + @Resource + private ShopDealerCapitalService shopDealerCapitalService; + + @Resource + private com.gxwebsoft.shop.service.ShopDealerUserService shopDealerUserService; + + @Resource + private GltUserTicketService gltUserTicketService; + + @Resource + private GltTicketOrderService gltTicketOrderService; + + @Resource + private GltTicketTemplateService gltTicketTemplateService; + @Override public PageResult pageRel(ShopDealerOrderParam param) { PageParam page = new PageParam<>(param); @@ -44,4 +105,436 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl() + .eq(ShopDealerOrder::getTenantId, tenantId) + .eq(ShopDealerOrder::getOrderNo, orderNo) + .last("limit 1") + ); + if (dealerOrder == null) { + throw new BusinessException("分销订单不存在: " + orderNo); + } + result.append(" 分销订单ID=").append(dealerOrder.getId()) + .append(", isSettled=").append(dealerOrder.getIsSettled()) + .append(", isUnfreeze=").append(dealerOrder.getIsUnfreeze()).append("\n"); + + if (dealerOrder.getIsSettled() == null || dealerOrder.getIsSettled() != 1) { + throw new BusinessException("订单未结算，无法解冻"); + } + if (dealerOrder.getIsUnfreeze() != null && dealerOrder.getIsUnfreeze() == 1) { + throw new BusinessException("订单已解冻，无需重复操作"); + } + + // 2) 查商城订单，判断解冻前置条件 + ShopOrder shopOrder = shopOrderService.getOne( + new LambdaQueryWrapper() + .eq(ShopOrder::getTenantId, tenantId) + .eq(ShopOrder::getDeleted, 0) + .eq(ShopOrder::getOrderNo, orderNo) + .last("limit 1") + ); + if (shopOrder == null) { + throw new BusinessException("商城订单不存在: " + orderNo); + } + result.append(" 商城订单: payStatus=").append(shopOrder.getPayStatus()) + .append(", orderStatus=").append(shopOrder.getOrderStatus()) + .append(", formId=").append(shopOrder.getFormId()).append("\n"); + + // 3) 加载水票模板 goodsId 集合（用于判断是否送水套餐） + Set waterFormIds = gltTicketTemplateService.list( + new LambdaQueryWrapper() + .eq(GltTicketTemplate::getTenantId, tenantId) + .eq(GltTicketTemplate::getDeleted, 0) + .isNotNull(GltTicketTemplate::getGoodsId) + ).stream() + .map(GltTicketTemplate::getGoodsId) + .collect(Collectors.toSet()); + result.append(" 水票模板goodsId集合: ").append(waterFormIds).append("\n"); + + boolean isWaterOrder = shopOrder.getFormId() != null && waterFormIds.contains(shopOrder.getFormId()); + result.append(" 是否送水套餐: ").append(isWaterOrder).append("\n"); + + // 4) 检查解冻前置条件 + if (isWaterOrder) { + // 送水套餐：至少有一条送水订单 deliveryStatus=40（已完成） + GltUserTicket userTicket = gltUserTicketService.getOne( + new LambdaQueryWrapper() + .eq(GltUserTicket::getTenantId, tenantId) + .eq(GltUserTicket::getDeleted, 0) + .eq(GltUserTicket::getOrderNo, orderNo) + .last("limit 1") + ); + if (userTicket == null) { + // 兜底：通过 orderId 反查 + userTicket = gltUserTicketService.getOne( + new LambdaQueryWrapper() + .eq(GltUserTicket::getTenantId, tenantId) + .eq(GltUserTicket::getDeleted, 0) + .eq(GltUserTicket::getOrderId, shopOrder.getOrderId()) + .last("limit 1") + ); + } + if (userTicket == null) { + throw new BusinessException("未找到关联的水票记录，无法确认送水状态"); + } + + GltTicketOrder firstTicketOrder = gltTicketOrderService.getOne( + new LambdaQueryWrapper() + .eq(GltTicketOrder::getTenantId, tenantId) + .eq(GltTicketOrder::getDeleted, 0) + .eq(GltTicketOrder::getUserTicketId, userTicket.getId()) + .orderByAsc(GltTicketOrder::getId) + .last("limit 1") + ); + + boolean firstFinished = firstTicketOrder != null + && firstTicketOrder.getDeliveryStatus() != null + && firstTicketOrder.getDeliveryStatus() == GltTicketOrderService.DELIVERY_STATUS_FINISHED; + + result.append(" 送水订单检查: userTicketId=").append(userTicket.getId()) + .append(", firstTicketOrderId=").append(firstTicketOrder != null ? firstTicketOrder.getId() : "null") + .append(", deliveryStatus=").append(firstTicketOrder != null ? firstTicketOrder.getDeliveryStatus() : "null") + .append(", firstFinished=").append(firstFinished).append("\n"); + + if (!firstFinished) { + throw new BusinessException("送水套餐订单尚未完成第一次配送确认收货，不满足解冻条件"); + } + } else { + // 非送水套餐：商城订单 orderStatus=1（已确认收货） + boolean orderCompleted = shopOrder.getOrderStatus() != null + && shopOrder.getOrderStatus() == ORDER_STATUS_CONFIRMED_RECEIVE + && shopOrder.getPayStatus() != null + && shopOrder.getPayStatus(); + + result.append(" 非送水订单检查: orderStatus=").append(shopOrder.getOrderStatus()) + .append(", payStatus=").append(shopOrder.getPayStatus()) + .append(", completed=").append(orderCompleted).append("\n"); + + if (!orderCompleted) { + throw new BusinessException("订单尚未确认收货，不满足解冻条件 (orderStatus=" + shopOrder.getOrderStatus() + ")"); + } + } + + // 5) 发放配送奖励（幂等） + result.append(" 开始发放配送奖励...\n"); + try { + boolean rewarded = settleDeliveryRewardIfNeeded(orderNo, tenantId); + result.append(" 配送奖励结果: ").append(rewarded ? "已发放" : "跳过(无配送员/已发放)").append("\n"); + } catch (Exception e) { + result.append(" 配送奖励异常: ").append(e.getMessage()).append("\n"); + log.warn("手动解冻-配送奖励发放失败 - orderNo={}, error={}", orderNo, e.getMessage(), e); + } + + // 6) 查询该订单的佣金明细（flowType=10） + List capitals = shopDealerCapitalService.list( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_COMMISSION) + .eq(ShopDealerCapital::getOrderNo, orderNo) + ); + result.append(" 佣金明细(flowType=10)数量: ").append(capitals.size()).append("\n"); + + if (capitals.isEmpty()) { + throw new BusinessException("未找到佣金明细(flowType=10)，无法解冻"); + } + + // 7) 逐条执行解冻 + int unfrozen = 0; + for (ShopDealerCapital cap : capitals) { + try { + boolean ok = unfreezeOneCapitalIfNeeded(cap, tenantId); + if (ok) { + unfrozen++; + result.append(" 解冻成功: capitalId=").append(cap.getId()) + .append(", userId=").append(cap.getUserId()) + .append(", amount=").append(cap.getMoney()).append("\n"); + } else { + result.append(" 解冻跳过(已解冻/幂等): capitalId=").append(cap.getId()).append("\n"); + } + } catch (Exception e) { + result.append(" 解冻失败: capitalId=").append(cap.getId()) + .append(", error=").append(e.getMessage()).append("\n"); + log.error("手动解冻-单条佣金解冻失败 - orderNo={}, capitalId={}, error={}", orderNo, cap.getId(), e.getMessage(), e); + } + } + + // 8) 检查是否全部解冻完成 + if (unfrozen > 0) { + long totalCommissions = shopDealerCapitalService.count( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_COMMISSION) + .eq(ShopDealerCapital::getOrderNo, orderNo) + ); + long unfrozenMarkers = shopDealerCapitalService.count( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_UNFREEZE) + .eq(ShopDealerCapital::getOrderNo, orderNo) + .like(ShopDealerCapital::getComments, "佣金解冻(capitalId=") + ); + result.append(" 解冻进度: ").append(unfrozenMarkers).append("/").append(totalCommissions).append("\n"); + + if (unfrozenMarkers >= totalCommissions) { + LocalDateTime now = LocalDateTime.now(); + boolean updated = this.update( + new LambdaUpdateWrapper() + .eq(ShopDealerOrder::getTenantId, tenantId) + .eq(ShopDealerOrder::getOrderNo, orderNo) + .set(ShopDealerOrder::getIsUnfreeze, 1) + .set(ShopDealerOrder::getUnfreezeTime, now) + .set(ShopDealerOrder::getUpdateTime, now) + ); + result.append(" 订单解冻状态更新: ").append(updated ? "成功(isUnfreeze=1)" : "失败").append("\n"); + } + } + + result.append("【手动解冻完成】共解冻 ").append(unfrozen).append("/").append(capitals.size()).append(" 条佣金"); + return result.toString(); + } + + /** + * 发放配送奖励（从定时任务复制，支持 tenantId 参数） + */ + private boolean settleDeliveryRewardIfNeeded(String orderNo, Integer tenantId) { + if (orderNo == null || orderNo.isBlank() || tenantId == null) { + return false; + } + + ShopOrder order = shopOrderService.getOne( + new LambdaQueryWrapper() + .eq(ShopOrder::getTenantId, tenantId) + .eq(ShopOrder::getDeleted, 0) + .eq(ShopOrder::getOrderNo, orderNo) + .last("limit 1") + ); + if (order == null) return false; + + Integer riderId = order.getRiderId(); + if (riderId == null || riderId <= 0) return false; + + // 幂等检查 + boolean already = shopDealerCapitalService.count( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_DELIVERY_REWARD) + .eq(ShopDealerCapital::getOrderNo, orderNo) + ) > 0; + if (already) return false; + + return Boolean.TRUE.equals(transactionTemplate.execute(status -> { + LocalDateTime now = LocalDateTime.now(); + + // 锁定 marker 幂等 + ShopDealerCapital existedMarker = shopDealerCapitalService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_DELIVERY_REWARD) + .eq(ShopDealerCapital::getOrderNo, orderNo) + .last("limit 1 for update") + ); + if (existedMarker != null) return false; + + Integer orderId = order.getOrderId(); + if (orderId == null) return false; + + List orderGoodsList = shopOrderGoodsService.list( + new LambdaQueryWrapper() + .eq(ShopOrderGoods::getTenantId, tenantId) + .eq(ShopOrderGoods::getOrderId, orderId) + ); + if (orderGoodsList == null || orderGoodsList.isEmpty()) return false; + + List goodsIds = orderGoodsList.stream() + .map(ShopOrderGoods::getGoodsId) + .filter(Objects::nonNull) + .distinct() + .toList(); + if (goodsIds.isEmpty()) return false; + + Map goodsDeliveryMoneyMap = shopGoodsService.list( + new LambdaQueryWrapper() + .eq(ShopGoods::getTenantId, tenantId) + .in(ShopGoods::getGoodsId, goodsIds) + ).stream().collect(Collectors.toMap( + ShopGoods::getGoodsId, + g -> g.getDeliveryMoney() != null ? g.getDeliveryMoney() : BigDecimal.ZERO, + (a, b) -> a + )); + + BigDecimal reward = BigDecimal.ZERO; + for (ShopOrderGoods og : orderGoodsList) { + Integer goodsId = og.getGoodsId(); + if (goodsId == null) continue; + int qty = og.getTotalNum() == null ? 0 : og.getTotalNum(); + if (qty <= 0) continue; + BigDecimal rawRate = goodsDeliveryMoneyMap.getOrDefault(goodsId, BigDecimal.ZERO); + BigDecimal rate = normalizeDeliveryRate(rawRate); + if (rate == null || rate.signum() <= 0) continue; + BigDecimal unitPrice = og.getPrice() != null ? og.getPrice() : BigDecimal.ZERO; + if (unitPrice.signum() <= 0) continue; + BigDecimal lineAmount = unitPrice.multiply(BigDecimal.valueOf(qty)); + reward = reward.add(lineAmount.multiply(rate)); + } + + reward = reward.setScale(2, RoundingMode.HALF_UP); + if (reward.signum() <= 0) return false; + + // 锁定/创建配送员分销账户 + ShopDealerUser dealerUser = shopDealerUserService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerUser::getTenantId, tenantId) + .eq(ShopDealerUser::getUserId, riderId) + .last("limit 1 for update") + ); + if (dealerUser == null) { + ShopDealerUser newDealerUser = new ShopDealerUser(); + newDealerUser.setTenantId(tenantId); + newDealerUser.setUserId(riderId); + newDealerUser.setType(0); + newDealerUser.setIsDelete(0); + newDealerUser.setSortNumber(0); + newDealerUser.setFirstNum(0); + newDealerUser.setSecondNum(0); + newDealerUser.setThirdNum(0); + newDealerUser.setMoney(BigDecimal.ZERO); + newDealerUser.setFreezeMoney(BigDecimal.ZERO); + newDealerUser.setTotalMoney(BigDecimal.ZERO); + newDealerUser.setCreateTime(now); + newDealerUser.setUpdateTime(now); + shopDealerUserService.save(newDealerUser); + dealerUser = shopDealerUserService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerUser::getTenantId, tenantId) + .eq(ShopDealerUser::getUserId, riderId) + .last("limit 1 for update") + ); + if (dealerUser == null) return false; + } + + BigDecimal moneyVal = dealerUser.getMoney() != null ? dealerUser.getMoney() : BigDecimal.ZERO; + BigDecimal totalMoneyVal = dealerUser.getTotalMoney() != null ? dealerUser.getTotalMoney() : BigDecimal.ZERO; + dealerUser.setMoney(moneyVal.add(reward)); + dealerUser.setTotalMoney(totalMoneyVal.add(reward)); + dealerUser.setUpdateTime(now); + if (!shopDealerUserService.updateById(dealerUser)) return false; + + ShopDealerCapital cap = new ShopDealerCapital(); + cap.setUserId(riderId); + cap.setOrderNo(orderNo); + cap.setFlowType(FLOW_TYPE_DELIVERY_REWARD); + cap.setMoney(reward); + cap.setComments("配送奖励"); + cap.setToUserId(order.getUserId()); + cap.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); + cap.setTenantId(tenantId); + cap.setCreateTime(now); + cap.setUpdateTime(now); + shopDealerCapitalService.save(cap); + + log.info("手动解冻-配送奖励发放成功 - orderNo={}, riderId={}, reward={}", orderNo, riderId, reward); + return true; + })); + } + + /** + * 解冻单条佣金（从定时任务复制，支持 tenantId 参数） + */ + private boolean unfreezeOneCapitalIfNeeded(ShopDealerCapital cap, Integer tenantId) { + if (cap == null) return false; + Integer capitalId = cap.getId(); + Integer dealerUserId = cap.getUserId(); + String orderNo = cap.getOrderNo(); + BigDecimal amount = cap.getMoney(); + if (capitalId == null || dealerUserId == null || orderNo == null || orderNo.isBlank() || amount == null || amount.signum() <= 0) { + return false; + } + + String markerComment = "佣金解冻(capitalId=" + capitalId + ")"; + + // 快速幂等检查 + boolean already = shopDealerCapitalService.count( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_UNFREEZE) + .eq(ShopDealerCapital::getUserId, dealerUserId) + .eq(ShopDealerCapital::getOrderNo, orderNo) + .eq(ShopDealerCapital::getComments, markerComment) + ) > 0; + if (already) return false; + + return Boolean.TRUE.equals(transactionTemplate.execute(status -> { + LocalDateTime now = LocalDateTime.now(); + + ShopDealerUser dealerUser = shopDealerUserService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerUser::getTenantId, tenantId) + .eq(ShopDealerUser::getUserId, dealerUserId) + .last("limit 1 for update") + ); + if (dealerUser == null) { + log.warn("手动解冻失败：未找到分销账户 - orderNo={}, dealerUserId={}, amount={}", orderNo, dealerUserId, amount); + return false; + } + + // 二次幂等检查 + ShopDealerCapital existedMarker = shopDealerCapitalService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, tenantId) + .eq(ShopDealerCapital::getFlowType, FLOW_TYPE_UNFREEZE) + .eq(ShopDealerCapital::getUserId, dealerUserId) + .eq(ShopDealerCapital::getOrderNo, orderNo) + .eq(ShopDealerCapital::getComments, markerComment) + .last("limit 1 for update") + ); + if (existedMarker != null) return false; + + BigDecimal freezeMoney = dealerUser.getFreezeMoney() != null ? dealerUser.getFreezeMoney() : BigDecimal.ZERO; + if (freezeMoney.compareTo(amount) < 0) { + log.warn("手动解冻失败：冻结金额不足 - orderNo={}, dealerUserId={}, freezeMoney={}, amount={}", + orderNo, dealerUserId, freezeMoney, amount); + return false; + } + + BigDecimal moneyVal = dealerUser.getMoney() != null ? dealerUser.getMoney() : BigDecimal.ZERO; + dealerUser.setFreezeMoney(freezeMoney.subtract(amount)); + dealerUser.setMoney(moneyVal.add(amount)); + dealerUser.setUpdateTime(now); + if (!shopDealerUserService.updateById(dealerUser)) { + log.warn("手动解冻失败：更新分销账户失败 - orderNo={}, dealerUserId={}, amount={}", orderNo, dealerUserId, amount); + return false; + } + + ShopDealerCapital marker = new ShopDealerCapital(); + marker.setUserId(dealerUserId); + marker.setOrderNo(orderNo); + marker.setFlowType(FLOW_TYPE_UNFREEZE); + marker.setMoney(amount); + marker.setComments(markerComment); + marker.setToUserId(cap.getToUserId()); + marker.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); + marker.setTenantId(tenantId); + marker.setCreateTime(now); + marker.setUpdateTime(now); + shopDealerCapitalService.save(marker); + + log.info("手动解冻成功 - orderNo={}, dealerUserId={}, amount={}, capitalId={}", orderNo, dealerUserId, amount, capitalId); + return true; + })); + } + + private static BigDecimal normalizeDeliveryRate(BigDecimal rawRate) { + if (rawRate == null || rawRate.signum() <= 0) return null; + if (rawRate.compareTo(BigDecimal.ONE) >= 0) return rawRate.movePointLeft(2); + return rawRate; + } + } From 47ae81ca9fbfff3173f142d8ba5731f7efd0aa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 21 Apr 2026 12:44:25 +0800 Subject: [PATCH 15/60] =?UTF-8?q?fix(wxlogin):=20=E4=BF=AE=E5=A4=8Dscene?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90=E4=B8=8E=E5=A4=9A=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改UserMapper接口，selectByIdIgnoreTenant由返回单用户改为返回用户列表，避免多结果异常 - UserService新增listByIdIgnoreTenant方法，兼容多条用户记录查询 - WxLoginController优先从scene参数直接解析tenantId，兼容旧格式时使用list接口查询用户 - 调整website.getRunning判空，避免空指针异常 - 多处调用处修改获取用户信息的逻辑，防止因多租户导致的查询失败 - 前端三处vue组件调整scene格式为uid_userId_tenantId，确保tenantId正确传递 --- .workbuddy/memory/2026-04-21.md | 18 ++++++++ .../system/controller/WxLoginController.java | 46 +++++++++++++------ .../common/system/mapper/UserMapper.java | 2 +- .../common/system/service/UserService.java | 5 ++ .../system/service/impl/UserServiceImpl.java | 12 +++++ .../impl/GltTicketOrderServiceImpl.java | 3 +- .../task/DealerOrderSettlement10584Task.java | 3 +- 7 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 .workbuddy/memory/2026-04-21.md diff --git a/.workbuddy/memory/2026-04-21.md b/.workbuddy/memory/2026-04-21.md new file mode 100644 index 0000000..7bb7332 --- /dev/null +++ b/.workbuddy/memory/2026-04-21.md @@ -0,0 +1,18 @@ +# 2026-04-21 日志 + +## WxLoginController.getOrderQRCodeUnlimited 修复（完整） + +### 根因 +1. `extractTenantIdFromScene` 通过 `selectByIdIgnoreTenant` 反查用户获取 tenantId，userId=35280 在多租户下有2条记录 → `TooManyResultsException` +2. 异常被 catch 后 fallback 到默认租户 10550，Redis 中无 `mp-weixin:10550` 缓存 → 最终失败 +3. 第 452 行 `website.getRunning().equals(2)` 存在 NPE 风险 + +### 修复内容 +- **后端 WxLoginController**: scene 格式改为 `uid_userId_tenantId`，优先从 scene 直接解析 tenantId；兼容旧 `uid_userId` 格式时改用 `selectList` 避免多条记录异常 +- **后端 UserMapper/UserService**: `selectByIdIgnoreTenant` 返回类型从 `User` 改为 `List`；新增 `listByIdIgnoreTenant` 方法 +- **后端 NPE 修复**: `website.getRunning().equals(2)` → `website != null && Integer.valueOf(2).equals(website.getRunning())` +- **前端 3 个 vue**: scene 从 `uid_${userId}` 改为 `uid_${userId}_${tenantId}`（从 tenantStore.company.tenantId 获取） + - shopDealerUser/index.vue + - shopDealerUserShop/index.vue + - shopDealerUserDelivery/index.vue + diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java index 9ed476a..533bb03 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -40,6 +40,7 @@ import java.io.File; import java.io.IOException; import java.time.Instant; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit; @@ -449,7 +450,7 @@ public class WxLoginController extends BaseController { // 判断应用运行状态 final CmsWebsite website = cmsWebsiteService.getByTenantId(tenantId); - if(website.getRunning().equals(2)){ + if(website != null && Integer.valueOf(2).equals(website.getRunning())){ map.put("check_path",false); map.put("env_version","trial"); } @@ -725,26 +726,43 @@ public class WxLoginController extends BaseController { /** * 从scene参数中提取租户ID - * scene格式可能是: uid_33103 或其他包含用户ID的格式 + * scene格式: uid_userId_tenantId（优先）或 uid_userId（兼容旧格式） */ private Integer extractTenantIdFromScene(String scene) { try { System.out.println("解析scene参数: " + scene); - // 如果scene包含uid_前缀，提取用户ID if (scene != null && scene.startsWith("uid_")) { - String userIdStr = scene.substring(4); // 去掉"uid_"前缀 - Integer userId = Integer.parseInt(userIdStr); - System.out.println("userId = " + userId); + String content = scene.substring(4); // 去掉"uid_"前缀 - // 根据用户ID查询用户信息，获取租户ID - User user = userService.getByIdIgnoreTenant(userId); - System.out.println("user = " + user); - if (user != null) { - System.out.println("从用户ID " + userId + " 获取到租户ID: " + user.getTenantId()); - return user.getTenantId(); - } else { - System.err.println("未找到用户ID: " + userId); + // 优先解析 uid_userId_tenantId 格式 + String[] parts = content.split("_"); + if (parts.length >= 2) { + try { + Integer tenantId = Integer.parseInt(parts[1]); + System.out.println("从scene直接解析到tenantId = " + tenantId); + return tenantId; + } catch (NumberFormatException e) { + System.err.println("scene中tenantId格式异常: " + parts[1]); + } + } + + // 兼容旧格式 uid_userId：根据用户ID查询租户ID + if (parts.length == 1) { + Integer userId = Integer.parseInt(parts[0]); + System.out.println("userId = " + userId); + try { + List users = userService.listByIdIgnoreTenant(userId); + System.out.println("查询到用户数量 = " + (users != null ? users.size() : 0)); + if (users != null && !users.isEmpty()) { + System.out.println("从用户ID " + userId + " 获取到租户ID: " + users.get(0).getTenantId()); + return users.get(0).getTenantId(); + } else { + System.err.println("未找到用户ID: " + userId); + } + } catch (Exception ex) { + System.err.println("查询用户异常: " + ex.getMessage()); + } } } diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java index 41c8be0..53b114d 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java @@ -60,7 +60,7 @@ public interface UserMapper extends BaseMapper { * @return User */ @InterceptorIgnore(tenantLine = "true") - User selectByIdIgnoreTenant(@Param("userId") Integer userId); + List selectByIdIgnoreTenant(@Param("userId") Integer userId); @InterceptorIgnore(tenantLine = "true") List pageAdminByPhone(@Param("param") UserParam param); diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserService.java b/src/main/java/com/gxwebsoft/common/system/service/UserService.java index 2230d94..427c471 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/UserService.java +++ b/src/main/java/com/gxwebsoft/common/system/service/UserService.java @@ -117,6 +117,11 @@ public interface UserService extends IService, UserDetailsService { */ User getByIdIgnoreTenant(Integer userId); + /** + * 根据用户ID查询用户列表（忽略租户隔离） + */ + List listByIdIgnoreTenant(Integer userId); + List pageAdminByPhone(UserParam param); List listByAlert(); diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java index b321832..c120579 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java @@ -2,6 +2,9 @@ package com.gxwebsoft.common.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; + +import java.util.Collections; +import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -224,6 +227,15 @@ public class UserServiceImpl extends ServiceImpl implements Us if (userId == null) { return null; } + List users = baseMapper.selectByIdIgnoreTenant(userId); + return users != null && !users.isEmpty() ? users.get(0) : null; + } + + @Override + public List listByIdIgnoreTenant(Integer userId) { + if (userId == null) { + return Collections.emptyList(); + } return baseMapper.selectByIdIgnoreTenant(userId); } diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 5a157d9..fceae4c 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -878,7 +878,8 @@ public class GltTicketOrderServiceImpl extends ServiceImpl sysUsers = userMapper.selectByIdIgnoreTenant(riderId); + User sysUser = (sysUsers != null && !sysUsers.isEmpty()) ? sysUsers.get(0) : null; if (sysUser != null) { newDealerUser.setRealName(sysUser.getRealName() != null ? sysUser.getRealName() : sysUser.getNickname()); newDealerUser.setMobile(sysUser.getPhone()); diff --git a/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java b/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java index 25b2b37..1197fab 100644 --- a/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java @@ -620,7 +620,8 @@ public class DealerOrderSettlement10584Task { newDealerUser.setTotalMoney(BigDecimal.ZERO); // 尽量补齐基础信息，避免表字段 NOT NULL 导致插入失败（插入失败会让门店分佣“找到了人但入不了账”）。 try { - User sysUser = userMapper.selectByIdIgnoreTenant(dealerUserId); + List sysUsers = userMapper.selectByIdIgnoreTenant(dealerUserId); + User sysUser = (sysUsers != null && !sysUsers.isEmpty()) ? sysUsers.get(0) : null; if (sysUser != null) { newDealerUser.setRealName(sysUser.getRealName() != null ? sysUser.getRealName() : sysUser.getNickname()); newDealerUser.setMobile(sysUser.getPhone()); From 1575bf504cb7ea4d20fce8af2b955abd42400f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 21 Apr 2026 13:04:35 +0800 Subject: [PATCH 16/60] =?UTF-8?q?fix(payment):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 apiUrl 配置属性，支持通过 API 网关地址访问回调 - 优先使用 apiUrl 拼接回调地址，确保回调服务公网可访问 - 兼容原有 serverUrl 配置，作为备用回调地址使用 - 移除默认注释，明确支付回调地址的选择逻辑 --- .../core/service/EnvironmentAwarePaymentService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java b/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java index 2155cc9..c8bdf53 100644 --- a/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java +++ b/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.core.service; +import cn.hutool.core.util.StrUtil; import com.gxwebsoft.common.system.entity.Payment; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +27,9 @@ public class EnvironmentAwarePaymentService { @Value("${config.server-url:}") private String serverUrl; + @Value("${config.api-url:}") + private String apiUrl; + // 开发环境回调地址配置 @Value("${payment.dev.notify-url:http://frps-10550.s209.websoft.top/api/shop/shop-order/notify}") private String devNotifyUrl; @@ -73,8 +77,8 @@ public class EnvironmentAwarePaymentService { // 生产环境使用生产回调地址 return prodNotifyUrl; } else { - // 默认使用配置的服务器地址 - return serverUrl + "/shop/shop-order/notify"; + // 默认使用 API 网关地址（支付回调需要公网可访问的 API 地址） + return (StrUtil.isNotBlank(apiUrl) ? apiUrl : serverUrl) + "/shop/shop-order/notify"; } } From 9344f3750c465fde163cf948ecc205d036cc7e22 Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Thu, 23 Apr 2026 15:59:10 +0800 Subject: [PATCH 17/60] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5=E9=85=8D=E7=BD=AE=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8=E7=A0=81=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E6=B1=A0=203.=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=B8=9A=E5=8A=A1=204.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constants/BaseConstants.java | 3 + .../common/core/enums/UserTypeEnum.java | 43 +++++ .../common/core/exception/ErrorCode.java | 27 +++ .../enums/GlobalErrorCodeConstants.java | 40 +++++ .../common/core/utils/LoginUserUtil.java | 29 ++++ .../ShopFlashSaleActivityController.java | 156 +++++++++++++++++ .../shop/entity/ShopFlashSaleActivity.java | 98 +++++++++++ .../mapper/ShopFlashSaleActivityMapper.java | 38 +++++ .../xml/ShopFlashSaleActivityMapper.xml | 75 ++++++++ .../param/ShopFlashSaleActivityParam.java | 79 +++++++++ .../service/ShopFlashSaleActivityService.java | 65 +++++++ .../ShopFlashSaleActivityServiceImpl.java | 160 ++++++++++++++++++ .../shop/vo/ShopFlashSaleActivityVO.java | 87 ++++++++++ src/main/resources/application-dev.yml | 4 +- .../gxwebsoft/generator/ShopGenerator.java | 9 +- .../generator/templates/controller.java.btl | 4 +- .../generator/templates/entity.java.btl | 2 + .../generator/templates/service.java.btl | 2 +- .../generator/templates/serviceImpl.java.btl | 3 +- 19 files changed, 913 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/common/core/enums/UserTypeEnum.java create mode 100644 src/main/java/com/gxwebsoft/common/core/exception/ErrorCode.java create mode 100644 src/main/java/com/gxwebsoft/common/core/exception/enums/GlobalErrorCodeConstants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/LoginUserUtil.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/ShopFlashSaleActivityMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/ShopFlashSaleActivityMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java diff --git a/src/main/java/com/gxwebsoft/common/core/constants/BaseConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/BaseConstants.java index 66cf4c0..e389908 100644 --- a/src/main/java/com/gxwebsoft/common/core/constants/BaseConstants.java +++ b/src/main/java/com/gxwebsoft/common/core/constants/BaseConstants.java @@ -2,4 +2,7 @@ package com.gxwebsoft.common.core.constants; public class BaseConstants { public static final String[] STATUS = {"未定义","显示","隐藏"}; + + public static final String FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND = "yyyy-MM-dd HH:mm:ss"; + } diff --git a/src/main/java/com/gxwebsoft/common/core/enums/UserTypeEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/UserTypeEnum.java new file mode 100644 index 0000000..824b7dc --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/enums/UserTypeEnum.java @@ -0,0 +1,43 @@ +package com.gxwebsoft.common.core.enums; + +import cn.hutool.core.util.ArrayUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 全局用户类型枚举 + */ +@AllArgsConstructor +@Getter +public enum UserTypeEnum { + + // 面向 a 端，管理后台 + RIDER(0, "骑手"), + // 面向 c 端，普通用户 + MEMBER(1, "会员"), + + STORE(3, "门店"), + // 面向 b 端，管理后台 + ADMIN(2, "管理员"), + + CHAT(4, "群聊"); + + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(UserTypeEnum::getValue).toArray(); + + /** + * 类型 + */ + private final Integer value; + /** + * 类型名 + */ + private final String name; + + public static UserTypeEnum valueOf(Integer value) { + return ArrayUtil.firstMatch(userType -> userType.getValue().equals(value), UserTypeEnum.values()); + } + + +} diff --git a/src/main/java/com/gxwebsoft/common/core/exception/ErrorCode.java b/src/main/java/com/gxwebsoft/common/core/exception/ErrorCode.java new file mode 100644 index 0000000..7ce2521 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/exception/ErrorCode.java @@ -0,0 +1,27 @@ +package com.gxwebsoft.common.core.exception; +import lombok.Data; + +/** + * 错误码对象 + * + * 全局错误码，占用 [0, 999], 参见 {@link com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants} + * + */ +@Data +public class ErrorCode { + + /** + * 错误码 + */ + private final Integer code; + /** + * 错误提示 + */ + private final String msg; + + public ErrorCode(Integer code, String message) { + this.code = code; + this.msg = message; + } + +} diff --git a/src/main/java/com/gxwebsoft/common/core/exception/enums/GlobalErrorCodeConstants.java b/src/main/java/com/gxwebsoft/common/core/exception/enums/GlobalErrorCodeConstants.java new file mode 100644 index 0000000..6f7e49f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/exception/enums/GlobalErrorCodeConstants.java @@ -0,0 +1,40 @@ +package com.gxwebsoft.common.core.exception.enums; + +import com.gxwebsoft.common.core.exception.ErrorCode; + +/** + * 全局错误码枚举 + * 0-999 系统异常编码保留 + * + * 一般情况下，使用 HTTP 响应状态码 https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status + * 虽然说，HTTP 响应状态码作为业务使用表达能力偏弱，但是使用在系统层面还是非常不错的 + * 比较特殊的是，因为之前一直使用 0 作为成功，就不使用 200 啦。 + * + * @author xm + */ +public interface GlobalErrorCodeConstants { + + ErrorCode SUCCESS = new ErrorCode(0, "成功"); + + // ========== 客户端错误段 ========== + + ErrorCode BAD_REQUEST = new ErrorCode(400, "请求参数不正确"); + ErrorCode UNAUTHORIZED = new ErrorCode(401, "账号未登录"); + ErrorCode FORBIDDEN = new ErrorCode(403, "没有该操作权限"); + ErrorCode NOT_FOUND = new ErrorCode(404, "查询无此数据"); + ErrorCode METHOD_NOT_ALLOWED = new ErrorCode(405, "请求方法不正确"); + ErrorCode LOCKED = new ErrorCode(423, "请求失败，请稍后重试"); // 并发请求，不允许 + ErrorCode TOO_MANY_REQUESTS = new ErrorCode(429, "请求过于频繁，请稍后重试"); + + // ========== 服务端错误段 ========== + + ErrorCode INTERNAL_SERVER_ERROR = new ErrorCode(500, "系统异常"); + ErrorCode NOT_IMPLEMENTED = new ErrorCode(501, "功能未实现/未开启"); + + // ========== 自定义错误段 ========== + ErrorCode REPEATED_REQUESTS = new ErrorCode(900, "重复请求，请稍后重试"); // 重复请求 + ErrorCode DEMO_DENY = new ErrorCode(901, "演示模式，禁止写操作"); + + ErrorCode UNKNOWN = new ErrorCode(999, "未知错误"); + ErrorCode FINANCE_BILL_NOT_EXISTS = new ErrorCode(600, "门店财务账单不存在"); +} diff --git a/src/main/java/com/gxwebsoft/common/core/utils/LoginUserUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/LoginUserUtil.java new file mode 100644 index 0000000..1f5fe8d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/LoginUserUtil.java @@ -0,0 +1,29 @@ +package com.gxwebsoft.common.core.utils; + +import com.gxwebsoft.common.system.entity.User; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; + +public class LoginUserUtil { + + /** + * 获取当前登录的user + * + * @return User + */ + public static User getLoginUser() { + try { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null) { + Object object = authentication.getPrincipal(); + if (object instanceof User) { + return (User) object; + } + } + } catch (Exception e) { + System.out.println(e.getMessage()); + return null; + } + return null; + } +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java new file mode 100644 index 0000000..47fdde5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java @@ -0,0 +1,156 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; +import com.gxwebsoft.shop.param.ShopFlashSaleActivityParam; +import com.gxwebsoft.shop.service.ShopFlashSaleActivityService; +import com.gxwebsoft.shop.vo.ShopFlashSaleActivityVO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 秒杀活动控制器 + * + * @author xm + * @since 2026-04-22 17:18:18 + */ +@Tag(name = "秒杀活动管理") +@RestController +@RequestMapping("/api/shop/shop-flash-sale-activity") +public class ShopFlashSaleActivityController extends BaseController { + @Resource + private ShopFlashSaleActivityService shopFlashSaleActivityService; + +// @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')") + @Operation(summary = "后台分页查询秒杀活动") + @GetMapping("/page") + public ApiResult> page(ShopFlashSaleActivityParam param) { + // 使用关联查询 + return success(shopFlashSaleActivityService.pageRel(param)); + } + + @Operation(summary = "个人获取秒杀活动数据") + @GetMapping("/getMyActive") + public ApiResult> getMyActive(@RequestParam("tenantId") Integer tenantId) { + // 使用关联查询 + return success(shopFlashSaleActivityService.getMyActive(tenantId)); + } + +// @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')") + @Operation(summary = "查询全部秒杀活动") + @GetMapping() + public ApiResult> list(ShopFlashSaleActivityParam param) { + // 使用关联查询 + return success(shopFlashSaleActivityService.listRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')") + @Operation(summary = "根据id查询秒杀活动") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Long id) { + // 使用关联查询 + return success(shopFlashSaleActivityService.getByIdRel(id)); + } + +// @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:save')") + @OperationLog + @Operation(summary = "添加秒杀活动") + @PostMapping() + public ApiResult save(@RequestBody ShopFlashSaleActivity shopFlashSaleActivity) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + shopFlashSaleActivity.setCreator(loginUser.getUserId().toString()); + } + if (shopFlashSaleActivityService.save(shopFlashSaleActivity)) { + return success("添加成功"); + } + return fail("添加失败"); + } + +// @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:update')") + @OperationLog + @Operation(summary = "修改秒杀活动") + @PutMapping() + public ApiResult update(@RequestBody ShopFlashSaleActivity shopFlashSaleActivity) { + shopFlashSaleActivity.setUpdater(String.valueOf(getLoginUserId())); + if (shopFlashSaleActivityService.updateById(shopFlashSaleActivity)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @Operation(summary = "开启/关闭秒杀活动状态") + @PutMapping("/updateStatus") + public ApiResult updateStatus(@RequestParam("id") Long id) { + return success(shopFlashSaleActivityService.updateStatus(id)); + } + + @Operation(summary = "修改秒杀活动排序") + @PutMapping("/updateSortNumber") + @Parameters({ + @Parameter(name = "id", description = "活动ID", required = true, example = "1"), + @Parameter(name = "sortNumber", description = "排序", required = true, example = "2") + }) + public ApiResult updateSortNumber(@RequestParam("id") Long id, @RequestParam("sortNumber") Integer sortNumber) { + return success(shopFlashSaleActivityService.updateSortNumber(id, sortNumber)); + } + +// @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:remove')") + @OperationLog + @Operation(summary = "删除秒杀活动") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (shopFlashSaleActivityService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:save')") + @OperationLog + @Operation(summary = "批量添加秒杀活动") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (shopFlashSaleActivityService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:update')") + @OperationLog + @Operation(summary = "批量修改秒杀活动") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(shopFlashSaleActivityService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:remove')") + @OperationLog + @Operation(summary = "批量删除秒杀活动") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (shopFlashSaleActivityService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java new file mode 100644 index 0000000..5e05533 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java @@ -0,0 +1,98 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.io.Serializable; + +import com.gxwebsoft.common.core.constants.BaseConstants; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 秒杀活动 + * + * @author xm + * @since 2026-04-22 17:18:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(name = "ShopFlashSaleActivity对象", description = "秒杀活动") +@TableName("shop_flash_sale_activity") +public class ShopFlashSaleActivity implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "秒杀活动编号") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "秒杀活动名称") + private String name; + + @Schema(description = "秒杀活动商品") + private Integer goodsId; + + @Schema(description = "商品skuId") + private Integer skuId; + + @Schema(description = "商品数量") + private Integer num; + + @Schema(description = "秒杀活动商品价格") + private BigDecimal price; + + @Schema(description = "活动状态 0-开启 1-关闭") + private Integer status; + + @Schema( + description = "活动开始时间", + type = "string", + pattern = BaseConstants.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, + example = "2026-04-01 12:00:00" + ) + private LocalDateTime startTime; + + @Schema( + description = "活动结束时间", + type = "string", + pattern = BaseConstants.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, + example = "2027-01-01 12:00:00" + ) + private LocalDateTime endTime; + + @Schema(description = "库存") + private Integer stock; + + @Schema(description = "展示类型，0：普通用户，1：新用户") + private Integer displayType; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "排序") + private Integer sortNumber; + + @Schema(description = "租户id") + private Integer tenantId; + + @Schema(description = "创建者") + private String creator; + + @Schema(description = "创建时间", pattern = BaseConstants.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime createTime; + + @Schema(description = "更新者") + private String updater; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = BaseConstants.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime updateTime; + + @Schema(description = "是否删除") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopFlashSaleActivityMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopFlashSaleActivityMapper.java new file mode 100644 index 0000000..d58b0b6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopFlashSaleActivityMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; +import com.gxwebsoft.shop.param.ShopFlashSaleActivityParam; +import com.gxwebsoft.shop.vo.ShopFlashSaleActivityVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 秒杀活动Mapper + * + * @author xm + * @since 2026-04-22 17:18:17 + */ +public interface ShopFlashSaleActivityMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ShopFlashSaleActivityParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ShopFlashSaleActivityParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopFlashSaleActivityMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopFlashSaleActivityMapper.xml new file mode 100644 index 0000000..60a78a9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopFlashSaleActivityMapper.xml @@ -0,0 +1,75 @@ + + + + + + + SELECT a.* + FROM shop_flash_sale_activity a + + + AND a.id = #{param.id} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.goods_id LIKE CONCAT('%', #{param.goodsId}, '%') + + + AND a.status = #{param.status} + + + AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') + + + AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') + + + AND a.stock = #{param.stock} + + + AND a.display_type = #{param.displayType} + + + AND a.remark LIKE CONCAT('%', #{param.remark}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.creator LIKE CONCAT('%', #{param.creator}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.updater LIKE CONCAT('%', #{param.updater}, '%') + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java new file mode 100644 index 0000000..bd96c32 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 秒杀活动查询参数 + * + * @author xm + * @since 2026-04-22 17:18:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@Schema(name = "ShopFlashSaleActivityParam对象", description = "秒杀活动查询参数") +public class ShopFlashSaleActivityParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @Schema(description = "秒杀活动编号") + @QueryField(type = QueryType.EQ) + private Long id; + + @Schema(description = "秒杀活动名称") + private String name; + + @Schema(description = "秒杀活动商品") + private Integer goodsId; + + @Schema(description = "商品skuId") + private Integer skuId; + + @Schema(description = "商品数量") + private Integer num; + + @Schema(description = "秒杀活动商品价格") + private BigDecimal price; + + @Schema(description = "活动状态 0-开启 1-关闭") + @QueryField(type = QueryType.EQ) + private Integer status; + + @Schema(description = "活动开始时间") + private String startTime; + + @Schema(description = "活动结束时间") + private String endTime; + + @Schema(description = "库存") + @QueryField(type = QueryType.EQ) + private Integer stock; + + @Schema(description = "展示类型，0：普通用户，1：新用户") + @QueryField(type = QueryType.EQ) + private Integer displayType; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "排序") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @Schema(description = "创建者") + private String creator; + + @Schema(description = "更新者") + private String updater; + + @Schema(description = "是否删除") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java new file mode 100644 index 0000000..b3e17af --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; +import com.gxwebsoft.shop.param.ShopFlashSaleActivityParam; +import com.gxwebsoft.shop.vo.ShopFlashSaleActivityVO; + +import java.util.List; + +/** + * 秒杀活动Service + * + * @author xm + * @since 2026-04-22 17:18:17 + */ +public interface ShopFlashSaleActivityService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ShopFlashSaleActivityParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ShopFlashSaleActivityParam param); + + /** + * 根据id查询 + * + * @param id 秒杀活动编号 + * @return ShopFlashSaleActivity + */ + ShopFlashSaleActivity getByIdRel(Long id); + + /** + * 查询个人可参与的活动数据 + * @param tenantId 租户ID + * @return + */ + List getMyActive(Integer tenantId); + + /** + * 修改秒杀活动状态 + * @param id + * @return + */ + Boolean updateStatus(Long id); + + /** + * 修改秒杀活动排序 + * @param id + * @param sortNumber + * @return + */ + Boolean updateSortNumber(Long id, Integer sortNumber); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java new file mode 100644 index 0000000..ac09f3a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java @@ -0,0 +1,160 @@ +package com.gxwebsoft.shop.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; +import com.gxwebsoft.common.core.utils.LoginUserUtil; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; +import com.gxwebsoft.shop.entity.ShopGoods; +import com.gxwebsoft.shop.entity.ShopOrder; +import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; +import com.gxwebsoft.shop.mapper.ShopGoodsMapper; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; +import com.gxwebsoft.shop.param.ShopFlashSaleActivityParam; +import com.gxwebsoft.shop.service.ShopFlashSaleActivityService; +import com.gxwebsoft.shop.vo.ShopFlashSaleActivityVO; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 秒杀活动Service实现 + * + * @author xm + * @since 2026-04-22 17:18:17 + */ +@Service +@AllArgsConstructor +public class ShopFlashSaleActivityServiceImpl extends ServiceImpl implements ShopFlashSaleActivityService { + + private ShopGoodsMapper shopGoodsMapper; + + private ShopOrderMapper shopOrderMapper; + + @Override + public PageResult pageRel(ShopFlashSaleActivityParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + if(CollectionUtils.isNotEmpty(list)){ + List goodsIdList = list.stream().map(ShopFlashSaleActivityVO::getGoodsId).distinct().collect(Collectors.toList()); + List shopGoods = shopGoodsMapper.selectBatchIds(goodsIdList); + list.forEach(shopFlashSaleActivityVO -> { + ShopGoods shopGood = shopGoods.stream().filter(goods -> shopFlashSaleActivityVO.getGoodsId().equals(goods.getGoodsId())).findFirst().orElse(null); + if(shopGood != null){ + shopFlashSaleActivityVO.setGoodsPrice(shopGood.getPrice()); + shopFlashSaleActivityVO.setGoodsTotalPrice(shopGood.getPrice().multiply(new BigDecimal(shopFlashSaleActivityVO.getNum()))); + shopFlashSaleActivityVO.setGoodsName(shopGood.getName()); + } + }); + } + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(ShopFlashSaleActivityParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public ShopFlashSaleActivity getByIdRel(Long id) { + ShopFlashSaleActivityParam param = new ShopFlashSaleActivityParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public List getMyActive(Integer tenantId) { + List resultVOList = new ArrayList<>(); + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser == null){ + throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg()); + } + + + Boolean newUser = true; + //判断是否为新用户【只要未成功下单都判定为新用户】 + LambdaQueryWrapper shopOrderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getUserId, loginUser.getUserId()).eq(ShopOrder::getPayStatus, 1) + .in(ShopOrder::getOrderStatus, Arrays.asList(0, 1)); + List shopOrderList = shopOrderMapper.selectList(shopOrderLambdaQueryWrapper); + if(CollectionUtils.isNotEmpty(shopOrderList)){ + newUser = false; + } + + //查询满足条件的活动数据 + LambdaQueryChainWrapper activityWrapper = lambdaQuery().eq(ShopFlashSaleActivity::getStatus, 0).gt(ShopFlashSaleActivity::getStock, 0).eq(ShopFlashSaleActivity::getTenantId, tenantId) + .apply("NOW() BETWEEN start_time AND end_time"); + if(!newUser){ + activityWrapper.eq(ShopFlashSaleActivity::getDisplayType, 0); + } + activityWrapper.orderByAsc(ShopFlashSaleActivity::getSortNumber); + List activityList = activityWrapper.list(); + + if(CollectionUtils.isNotEmpty(activityList)){ + resultVOList = BeanUtil.copyToList(activityList, ShopFlashSaleActivityVO.class); + List goodsIdList = resultVOList.stream().map(ShopFlashSaleActivityVO::getGoodsId).distinct().collect(Collectors.toList()); + List shopGoods = shopGoodsMapper.selectBatchIds(goodsIdList); + resultVOList.forEach(activity -> { + ShopGoods shopGood = shopGoods.stream().filter(goods -> activity.getGoodsId().equals(goods.getGoodsId())).findFirst().orElse(null); + if(shopGood != null){ + activity.setGoodsPrice(shopGood.getPrice()); + activity.setGoodsTotalPrice(shopGood.getPrice().multiply(new BigDecimal(activity.getNum()))); + activity.setGoodsName(shopGood.getName()); + } + }); + } + return resultVOList; + } + + @Override + public Boolean updateStatus(Long id) { + ShopFlashSaleActivity saleActivity = baseMapper.selectById(id); + if(saleActivity != null){ + if (saleActivity.getStatus() == 0){ + saleActivity.setStatus(1); + }else { + saleActivity.setStatus(0); + } + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser != null){ + saleActivity.setUpdater(loginUser.getUserId().toString()); + } + saleActivity.setUpdateTime(LocalDateTime.now()); + baseMapper.updateById(saleActivity); + return Boolean.TRUE; + }else { + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + } + + @Override + public Boolean updateSortNumber(Long id, Integer sortNumber) { + ShopFlashSaleActivity saleActivity = baseMapper.selectById(id); + if(saleActivity != null){ + saleActivity.setSortNumber(sortNumber); + saleActivity.setUpdateTime(LocalDateTime.now()); + baseMapper.updateById(saleActivity); + return Boolean.TRUE; + }else { + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java new file mode 100644 index 0000000..07b5f10 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java @@ -0,0 +1,87 @@ +package com.gxwebsoft.shop.vo; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 秒杀活动 + * + * @author xm + * @since 2026-04-22 17:18:17 + */ +@Data +public class ShopFlashSaleActivityVO implements Serializable { + + @Schema(description = "秒杀活动编号") + private Long id; + + @Schema(description = "秒杀活动名称") + private String name; + + @Schema(description = "秒杀活动商品") + private Integer goodsId; + + @Schema(description = "秒杀活动商品名称") + private String goodsName; + + @Schema(description = "商品skuId") + private Integer skuId; + + @Schema(description = "商品数量") + private Integer num; + + @Schema(description = "秒杀价") + private BigDecimal price; + + @Schema(description = "商品单价") + private BigDecimal goodsPrice; + + @Schema(description = "商品总价") + private BigDecimal goodsTotalPrice; + + @Schema(description = "活动状态 0-开启 1-关闭") + private Integer status; + + @Schema(description = "活动开始时间") + private LocalDateTime startTime; + + @Schema(description = "活动结束时间") + private LocalDateTime endTime; + + @Schema(description = "库存") + private Integer stock; + + @Schema(description = "展示类型，0：普通用户，1：新用户") + private Integer displayType; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "排序") + private Integer sortNumber; + + @Schema(description = "租户id") + private Integer tenantId; + + @Schema(description = "创建者") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者") + private String updater; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "是否删除") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8a221d2..34972e5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,9 +7,9 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://8.134.55.105:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: modules - password: tYmmMGh5wpwXR3ae + password: tYmmMGh5wpwXR3ae2 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 9d1224c..5fdf7cf 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -38,14 +38,14 @@ public class ShopGenerator { // Vue文件输出目录 private static final String OUTPUT_DIR_VUE = "/src"; // 作者名称 - private static final String AUTHOR = "科技小王子"; + private static final String AUTHOR = "xm"; // 是否在xml中添加二级缓存配置 private static final boolean ENABLE_CACHE = false; // 数据库连接配置 - private static final String DB_URL = "jdbc:mysql://8.134.169.209:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_URL = "jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; private static final String DB_USERNAME = "modules"; - private static final String DB_PASSWORD = "8YdLnk7KsPAyDXGA"; + private static final String DB_PASSWORD = "tYmmMGh5wpwXR3ae2"; // 包名 private static final String PACKAGE_NAME = "com.gxwebsoft"; // 模块名 @@ -105,7 +105,8 @@ public class ShopGenerator { // "shop_express_template", // "shop_express_template_detail", // "shop_gift" - "shop_article" +// "shop_flash_sale_activity" +// "shop_flash_sale_product" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{ diff --git a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl index e278dc1..24e6cdf 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl @@ -19,10 +19,8 @@ import ${cfg.packageName!}.${package.ModuleName}.entity.${entity}; import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param; import ${cfg.packageName!}.common.core.web.ApiResult; import ${cfg.packageName!}.common.core.web.PageResult; -import ${cfg.packageName!}.common.core.web.PageParam; import ${cfg.packageName!}.common.core.web.BatchParam; import ${cfg.packageName!}.common.core.annotation.OperationLog; -import ${cfg.packageName!}.common.system.entity.User; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; @@ -107,7 +105,7 @@ public class ${table.controllerName} { @PreAuthorize("hasAuthority('${authPre}:list')") @Operation(summary = "根据id查询${table.comment!}") @GetMapping("/{id}") - public ApiResult<${entity}> get(@PathVariable("id") Integer id) { + public ApiResult<${entity}> get(@PathVariable("id") Long id) { // 使用关联查询 return success(${serviceIns}.getByIdRel(id)); } diff --git a/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl b/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl index e98a1d3..88f6b79 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl @@ -3,6 +3,7 @@ package ${package.Entity}; <% for(pkg in table.importPackages) { %> import ${pkg}; <% } %> +import com.baomidou.mybatisplus.annotation.TableName; <% if(swagger2) { %> import io.swagger.v3.oas.annotations.media.Schema; <% } %> @@ -34,6 +35,7 @@ import lombok.experimental.Accessors; <% if(swagger2) { %> @Schema(name = "${entity}对象", description = "${table.comment!''}") <% } %> +@TableName("${table.name}") <% if(table.convert) { %> @TableName("${table.name}") <% } %> diff --git a/src/test/java/com/gxwebsoft/generator/templates/service.java.btl b/src/test/java/com/gxwebsoft/generator/templates/service.java.btl index 67efe6a..3a6c3ae 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/service.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/service.java.btl @@ -49,7 +49,7 @@ public interface ${table.serviceName} extends ${superServiceClass}<${entity}> { * @param ${idPropertyName!} ${idComment!} * @return ${entity} */ - ${entity} getByIdRel(Integer ${idPropertyName!}); + ${entity} getByIdRel(Long ${idPropertyName!}); } <% } %> diff --git a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl index 20b998d..072e052 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl @@ -27,6 +27,7 @@ import java.util.List; * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} */ @Service +@AllArgsConstructor <% if(kotlin){ %> open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} { @@ -52,7 +53,7 @@ public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.m } @Override - public ${entity} getByIdRel(Integer ${idPropertyName!}) { + public ${entity} getByIdRel(Long ${idPropertyName!}) { ${entity}Param param = new ${entity}Param(); param.set${idCapitalName!}(${idPropertyName!}); return param.getOne(baseMapper.selectListRel(param)); From 95964219a59737e4a02ee7b3c83d05532fdb7464 Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Thu, 23 Apr 2026 17:17:05 +0800 Subject: [PATCH 18/60] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=99=90=E8=B4=AD=E6=95=B0=E9=87=8F=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/dto/OrderCreateRequest.java | 3 +++ .../shop/entity/ShopFlashSaleActivity.java | 3 +++ .../com/gxwebsoft/shop/entity/ShopOrder.java | 3 +++ .../param/ShopFlashSaleActivityParam.java | 3 +++ .../ShopFlashSaleActivityServiceImpl.java | 25 ++++++++++++++++--- .../shop/vo/ShopFlashSaleActivityVO.java | 3 +++ 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java index be9ca22..3553a59 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java +++ b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java @@ -147,6 +147,9 @@ public class OrderCreateRequest { @NotNull(message = "租户ID不能为空") private Integer tenantId; + @Schema(description = "秒杀活动ID") + private Long activityId; + @Schema(description = "订单商品列表") @Valid @NotEmpty(message = "订单商品列表不能为空") diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java index 5e05533..7494f54 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java @@ -63,6 +63,9 @@ public class ShopFlashSaleActivity implements Serializable { ) private LocalDateTime endTime; + @Schema(description = "活动限购数量") + private Integer saleLimit; + @Schema(description = "库存") private Integer stock; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index 97566ce..c82416b 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -306,6 +306,9 @@ public class ShopOrder implements Serializable { @NotNull(message = "租户ID不能为空") private Integer tenantId; + @Schema(description = "秒杀活动ID") + private Long activityId; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java index bd96c32..a03d584 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java @@ -51,6 +51,9 @@ public class ShopFlashSaleActivityParam extends BaseParam { @Schema(description = "活动结束时间") private String endTime; + @Schema(description = "活动限购数量") + private Integer saleLimit; + @Schema(description = "库存") @QueryField(type = QueryType.EQ) private Integer stock; diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java index ac09f3a..6819dd3 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java @@ -25,9 +25,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -101,7 +99,15 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl activityWrapper = lambdaQuery().eq(ShopFlashSaleActivity::getStatus, 0).gt(ShopFlashSaleActivity::getStock, 0).eq(ShopFlashSaleActivity::getTenantId, tenantId) .apply("NOW() BETWEEN start_time AND end_time"); + + Map activityMap = new HashMap<>(); if(!newUser){ + //查询当前用户是否有下过秒杀活动订单数据【判断下单数量是否超过限制】 + List activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList()); + LambdaQueryWrapper shopOrderWrapper = new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum) + .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1)); + activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum))); + activityWrapper.eq(ShopFlashSaleActivity::getDisplayType, 0); } activityWrapper.orderByAsc(ShopFlashSaleActivity::getSortNumber); @@ -120,6 +126,19 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl iterator = resultVOList.iterator(); + while (iterator.hasNext()){ + ShopFlashSaleActivityVO vo = iterator.next(); + Integer orderTotalNum = activityMap.get(vo.getId()); + if(orderTotalNum != null && orderTotalNum >= vo.getSaleLimit()){ + iterator.remove(); + } + } + } + return resultVOList; } diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java index 07b5f10..bee0f6a 100644 --- a/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java @@ -53,6 +53,9 @@ public class ShopFlashSaleActivityVO implements Serializable { @Schema(description = "活动结束时间") private LocalDateTime endTime; + @Schema(description = "活动限购数量") + private Integer saleLimit; + @Schema(description = "库存") private Integer stock; From 1ae7a7690123f9d8d5c2221f830c27bed39af8cc Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Mon, 27 Apr 2026 17:09:39 +0800 Subject: [PATCH 19/60] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1ID=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java | 2 +- src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java | 2 +- .../com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java | 2 +- .../java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java index 7494f54..7420d0f 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java @@ -27,7 +27,7 @@ public class ShopFlashSaleActivity implements Serializable { @Schema(description = "秒杀活动编号") @TableId(value = "id", type = IdType.AUTO) - private Long id; + private Integer id; @Schema(description = "秒杀活动名称") private String name; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index c82416b..340f7aa 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -307,7 +307,7 @@ public class ShopOrder implements Serializable { private Integer tenantId; @Schema(description = "秒杀活动ID") - private Long activityId; + private Integer activityId; @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java index a03d584..02cf4a1 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java @@ -24,7 +24,7 @@ public class ShopFlashSaleActivityParam extends BaseParam { @Schema(description = "秒杀活动编号") @QueryField(type = QueryType.EQ) - private Long id; + private Integer id; @Schema(description = "秒杀活动名称") private String name; diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java index bee0f6a..1f440ba 100644 --- a/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; public class ShopFlashSaleActivityVO implements Serializable { @Schema(description = "秒杀活动编号") - private Long id; + private Integer id; @Schema(description = "秒杀活动名称") private String name; From 818be01c7c3aabf83dbb5497553b3433459e2071 Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Mon, 27 Apr 2026 17:23:08 +0800 Subject: [PATCH 20/60] =?UTF-8?q?1.=E5=95=86=E5=93=81=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=92=E6=9D=80=E8=AE=A2=E5=8D=95=E4=BB=A5?= =?UTF-8?q?=E7=A7=92=E6=9D=80=E4=BB=B7=E6=A0=BC=E4=B8=BA=E5=87=86=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E7=A5=A8=E5=A5=97=E7=A5=A8=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=AA=E4=BA=BA=E6=B0=B4?= =?UTF-8?q?=E7=A5=A8=E5=8F=91=E6=94=BE=E4=BB=A5=E6=AC=A1=E6=9C=88=E4=BB=A5?= =?UTF-8?q?1=E6=97=A5=E5=87=8C=E6=99=A8=E4=B8=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8A=82=E7=82=B9=203.=E5=A2=9E=E5=8A=A0=E4=BB=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=BD=A2=E5=BC=8F=E5=8F=91=E9=80=81=E6=B0=B4?= =?UTF-8?q?=E7=A5=A8=E5=A5=97=E7=A5=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glt/service/GltTicketIssueService.java | 84 +++++++++++++++++-- .../shop/controller/ShopOrderController.java | 11 ++- .../shop/dto/OrderCreateRequest.java | 5 +- .../shop/service/OrderBusinessService.java | 35 ++++++++ src/main/resources/application-dev.yml | 2 +- 5 files changed, 124 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 5b4ccae..75c20c8 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -2,6 +2,7 @@ package com.gxwebsoft.glt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.gxwebsoft.common.core.annotation.IgnoreTenant; import com.gxwebsoft.glt.entity.GltTicketTemplate; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; @@ -12,17 +13,18 @@ import com.gxwebsoft.shop.service.ShopOrderGoodsService; import com.gxwebsoft.shop.service.ShopOrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; /** * 套票发放（从订单生成用户套票 + 释放计划）的业务逻辑。 @@ -128,6 +130,57 @@ public class GltTicketIssueService { tenantId, uniqueGoodsIds, orders.size(), success, skipped, failed); } + @Async +// @Scheduled(cron = "0/1 * 4-22 * * ?") 没秒钟执行一次 + public void paySuccessExecute(String orderNo, Integer tenantId){ + suerTicketRelease(orderNo, tenantId); + } + + /** + * 订单支付成功，直接发送水票【后期优化订单类型，为水票的订单才需要执行此业务】 + * @param orderNo 订单号 + * @param tenantId 租户ID + */ + public void suerTicketRelease(String orderNo, Integer tenantId){ + //1.订单为空跳过执行 + ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId); + if(shopOrder == null){ + return; + } + + //2.跳过已完成发放套票订单 + if(shopOrder.getOrderStatus() == 1){ + return; + } + + //3.订单商品为空跳过执行 + List goodsList = shopOrderGoodsService.getListByOrderIdIgnoreTenant(shopOrder.getOrderId()); + if (CollectionUtils.isEmpty(goodsList)) { + return; + } + + //4.执行水票发放业务【】 + AtomicBoolean release = new AtomicBoolean(false); + goodsList.forEach(orderGood ->{ + IssueOutcome outcome = transactionTemplate.execute(status -> doIssueOne(tenantId, shopOrder, orderGood)); + if(Arrays.asList(IssueOutcome.ISSUED, IssueOutcome.ALREADY_ISSUED).contains(outcome)){ + release.set(true); + } + }); + + //5.更新商品订单为已完成、已收到赠品状态 + if (release.get()) { + shopOrderService.update(new LambdaUpdateWrapper() + .eq(ShopOrder::getOrderId, shopOrder.getOrderId()) + .eq(ShopOrder::getTenantId, tenantId) + .eq(ShopOrder::getOrderStatus, 0) + .set(ShopOrder::getOrderStatus, 1) + .set(ShopOrder::getHasTakeGift, true) + .set(ShopOrder::getUpdateTime, LocalDateTime.now()) + ); + } + } + private int issueForOrder(Integer tenantId, Set goodsIds, ShopOrder order) { List goodsList = shopOrderGoodsService.getListByOrderIdIgnoreTenant(order.getOrderId()); if (goodsList == null || goodsList.isEmpty()) { @@ -304,12 +357,14 @@ public class GltTicketIssueService { // 若启用了 releasePeriods 且首期释放时机为“支付成功当刻”，则将首期释放量直接计入可用， // 避免用户刚购买后短时间内无可用水票；后续期数仍由自动释放任务按 release_time 释放。 - if (useReleasePeriods && !releases.isEmpty() && !Objects.equals(template.getFirstReleaseMode(), 1)) { +// if (useReleasePeriods && !releases.isEmpty() && !Objects.equals(template.getFirstReleaseMode(), 1)) { + if (!releases.isEmpty() && !Objects.equals(template.getFirstReleaseMode(), 1)) { GltUserTicketRelease first = releases.get(0); Integer firstQtyObj = first.getReleaseQty(); LocalDateTime firstTime = first.getReleaseTime(); int firstQty = firstQtyObj != null ? firstQtyObj : 0; - if (firstQty > 0 && (firstTime == null || !firstTime.isAfter(now))) { +// if (firstQty > 0 && (firstTime == null || !firstTime.isAfter(now))) { + if (firstQty > 0) { first.setStatus(1); first.setUpdateTime(now); @@ -376,10 +431,13 @@ public class GltTicketIssueService { // 首期释放时间 LocalDateTime firstReleaseTime; + LocalDateTime referenceTime; if (Objects.equals(template.getFirstReleaseMode(), 1)) { firstReleaseTime = nextMonthSameDay(baseTime); + referenceTime = firstReleaseTime.withDayOfMonth(1).toLocalDate().atStartOfDay(); } else { firstReleaseTime = baseTime; + referenceTime = firstReleaseTime.withDayOfMonth(1).toLocalDate().atStartOfDay(); } // 每期释放数量计算 @@ -393,7 +451,11 @@ public class GltTicketIssueService { if (qty <= 0) { continue; } - list.add(buildRelease(userTicket, i, qty, firstReleaseTime.plusMonths(i), now)); + if(i == 0){ + list.add(buildRelease(userTicket, i, qty, firstReleaseTime, now)); + }else { + list.add(buildRelease(userTicket, i, qty, referenceTime.plusMonths(i), now)); + } } return list; } @@ -410,7 +472,11 @@ public class GltTicketIssueService { break; } remaining -= qty; - list.add(buildRelease(userTicket, i, qty, firstReleaseTime.plusMonths(i), now)); + if(i == 0){ + list.add(buildRelease(userTicket, i, qty, firstReleaseTime, now)); + }else { + list.add(buildRelease(userTicket, i, qty, referenceTime.plusMonths(i), now)); + } } return list; diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index d156858..2b241e0 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -13,6 +13,7 @@ import com.gxwebsoft.common.core.utils.WechatCertAutoConfig; import com.gxwebsoft.common.core.utils.WechatPayConfigValidator; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.Payment; +import com.gxwebsoft.glt.service.GltTicketIssueService; import com.gxwebsoft.shop.entity.ShopOrderDelivery; import com.gxwebsoft.shop.entity.ShopUserAddress; import com.gxwebsoft.shop.service.*; @@ -110,6 +111,8 @@ public class ShopOrderController extends BaseController { private GltTicketRevokeService gltTicketRevokeService; @Resource private ShopDealerCommissionRollbackService shopDealerCommissionRollbackService; + @Resource + private GltTicketIssueService gltTicketIssueService; @Operation(summary = "分页查询订单") @GetMapping("/page") @@ -763,7 +766,7 @@ public class ShopOrderController extends BaseController { @Schema(description = "异步通知11") @PostMapping("/notify/{tenantId}") public String wxNotify(@RequestHeader Map header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) { - logger.info("异步通知*************** = " + tenantId); + logger.info("异步通知*************** = " + body + ",租户：" +tenantId); // 获取支付配置信息用于解密 String key = "Payment:1:".concat(tenantId.toString()); @@ -899,7 +902,7 @@ public class ShopOrderController extends BaseController { logger.info("开始解析微信支付异步通知..."); Transaction transaction = parser.parse(requestParam, Transaction.class); logger.info("✅ 异步通知解析成功 - 交易状态: {}, 商户订单号: {}", - transaction.getTradeStateDesc(), transaction.getOutTradeNo()); + transaction.getTradeState(), transaction.getOutTradeNo()); // 使用枚举值判断支付状态，避免依赖状态描述字符串 if (Transaction.TradeStateEnum.SUCCESS.equals(transaction.getTradeState())) { @@ -934,6 +937,10 @@ public class ShopOrderController extends BaseController { System.out.println("实际付款金额 = " + order.getPayPrice()); // 更新订单状态并处理支付成功后的业务逻辑（包括累加商品销量） shopOrderService.updateByOutTradeNo(order); + +// //支付成功执行一步任务 +// gltTicketIssueService.paySuccessExecute(order.getOrderNo(), tenantId); + return "SUCCESS"; } } diff --git a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java index 3553a59..07455ef 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java +++ b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java @@ -148,7 +148,7 @@ public class OrderCreateRequest { private Integer tenantId; @Schema(description = "秒杀活动ID") - private Long activityId; + private Integer activityId; @Schema(description = "订单商品列表") @Valid @@ -161,6 +161,9 @@ public class OrderCreateRequest { @Data @Schema(name = "OrderGoodsItem", description = "订单商品项") public static class OrderGoodsItem { + @Schema(description = "秒杀活动ID") + private Integer activityId; + @Schema(description = "商品ID", required = true) @NotNull(message = "商品ID不能为空") private Integer goodsId; diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java index ed8b43c..1e9a1b9 100644 --- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java +++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java @@ -3,10 +3,12 @@ package com.gxwebsoft.shop.service; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.config.OrderConfigProperties; import com.gxwebsoft.shop.dto.OrderCreateRequest; import com.gxwebsoft.shop.entity.*; +import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; import com.gxwebsoft.shop.service.ShopStoreFenceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -52,11 +54,16 @@ public class OrderBusinessService { @Resource private ShopUserAddressService shopUserAddressService; + @Resource private ShopUserCouponService shopUserCouponService; + @Resource private ShopStoreFenceService shopStoreFenceService; + @Resource + private ShopFlashSaleActivityMapper shopFlashSaleActivityMapper; + /** * 创建订单 * @@ -167,6 +174,8 @@ public class OrderBusinessService { BigDecimal total = BigDecimal.ZERO; for (OrderCreateRequest.OrderGoodsItem item : request.getGoodsItems()) { + Integer activityId = item.getActivityId(); + // 验证商品ID if (item.getGoodsId() == null) { throw new BusinessException("商品ID不能为空"); @@ -216,6 +225,25 @@ public class OrderBusinessService { productName = goods.getName() + "(" + (item.getSpecInfo() != null ? item.getSpecInfo() : sku.getSku()) + ")"; } + //秒杀商品价格以秒杀价为准 + if(activityId != null){ + request.setActivityId(activityId); + ShopFlashSaleActivity saleActivity = shopFlashSaleActivityMapper.selectById(activityId); + if(saleActivity == null){ + throw new BusinessException("秒杀活动数据查询失败！"); + } + if(saleActivity.getStatus() != 0){ + throw new BusinessException("当前秒杀活动已失效！"); + } + if(saleActivity.getStock() <= 0){ + throw new BusinessException("当前秒杀活动商品已售罄！"); + } + if(item.getQuantity() > saleActivity.getSaleLimit()){ + throw new BusinessException("选购数量已超秒杀活动限购数量！"); + } + actualPrice = saleActivity.getPrice(); + } + // 验证实际价格 if (actualPrice == null || actualPrice.compareTo(BigDecimal.ZERO) <= 0) { throw new BusinessException("商品价格异常：" + productName); @@ -651,6 +679,13 @@ public class OrderBusinessService { } } + //秒杀商品价格以秒杀价为准 + Integer activityId = item.getActivityId(); + if(activityId != null){ + ShopFlashSaleActivity saleActivity = shopFlashSaleActivityMapper.selectById(activityId); + actualPrice = saleActivity.getPrice(); + } + // 验证库存 if (actualStock == null || actualStock < item.getQuantity()) { String stockMsg = sku != null ? "商品规格库存不足" : "商品库存不足"; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 34972e5..7c3a897 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,7 +9,7 @@ spring: datasource: url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: modules - password: tYmmMGh5wpwXR3ae2 + password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource From 9eeb0c5682c28802736a6c4a2de1ccaf061dd053 Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Mon, 27 Apr 2026 17:45:00 +0800 Subject: [PATCH 21/60] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopFlashSaleActivityController.java | 6 +++--- .../shop/service/ShopFlashSaleActivityService.java | 6 +++--- .../service/impl/ShopFlashSaleActivityServiceImpl.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java index 47fdde5..dc2e0c9 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java @@ -59,7 +59,7 @@ public class ShopFlashSaleActivityController extends BaseController { // @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')") @Operation(summary = "根据id查询秒杀活动") @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Long id) { + public ApiResult get(@PathVariable("id") Integer id) { // 使用关联查询 return success(shopFlashSaleActivityService.getByIdRel(id)); } @@ -95,7 +95,7 @@ public class ShopFlashSaleActivityController extends BaseController { @OperationLog @Operation(summary = "开启/关闭秒杀活动状态") @PutMapping("/updateStatus") - public ApiResult updateStatus(@RequestParam("id") Long id) { + public ApiResult updateStatus(@RequestParam("id") Integer id) { return success(shopFlashSaleActivityService.updateStatus(id)); } @@ -105,7 +105,7 @@ public class ShopFlashSaleActivityController extends BaseController { @Parameter(name = "id", description = "活动ID", required = true, example = "1"), @Parameter(name = "sortNumber", description = "排序", required = true, example = "2") }) - public ApiResult updateSortNumber(@RequestParam("id") Long id, @RequestParam("sortNumber") Integer sortNumber) { + public ApiResult updateSortNumber(@RequestParam("id") Integer id, @RequestParam("sortNumber") Integer sortNumber) { return success(shopFlashSaleActivityService.updateSortNumber(id, sortNumber)); } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java index b3e17af..eee7133 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java @@ -38,7 +38,7 @@ public interface ShopFlashSaleActivityService extends IService activityWrapper = lambdaQuery().eq(ShopFlashSaleActivity::getStatus, 0).gt(ShopFlashSaleActivity::getStock, 0).eq(ShopFlashSaleActivity::getTenantId, tenantId) .apply("NOW() BETWEEN start_time AND end_time"); - Map activityMap = new HashMap<>(); + Map activityMap = new HashMap<>(); if(!newUser){ //查询当前用户是否有下过秒杀活动订单数据【判断下单数量是否超过限制】 - List activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList()); + List activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList()); LambdaQueryWrapper shopOrderWrapper = new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum) .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1)); activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum))); @@ -143,7 +143,7 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl Date: Mon, 27 Apr 2026 17:47:04 +0800 Subject: [PATCH 22/60] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4ID=E6=9F=A5=E8=AF=A2=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gxwebsoft/generator/templates/controller.java.btl | 2 +- .../java/com/gxwebsoft/generator/templates/service.java.btl | 2 +- .../java/com/gxwebsoft/generator/templates/serviceImpl.java.btl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl index 24e6cdf..12e12d4 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl @@ -105,7 +105,7 @@ public class ${table.controllerName} { @PreAuthorize("hasAuthority('${authPre}:list')") @Operation(summary = "根据id查询${table.comment!}") @GetMapping("/{id}") - public ApiResult<${entity}> get(@PathVariable("id") Long id) { + public ApiResult<${entity}> get(@PathVariable("id") Integer id) { // 使用关联查询 return success(${serviceIns}.getByIdRel(id)); } diff --git a/src/test/java/com/gxwebsoft/generator/templates/service.java.btl b/src/test/java/com/gxwebsoft/generator/templates/service.java.btl index 3a6c3ae..67efe6a 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/service.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/service.java.btl @@ -49,7 +49,7 @@ public interface ${table.serviceName} extends ${superServiceClass}<${entity}> { * @param ${idPropertyName!} ${idComment!} * @return ${entity} */ - ${entity} getByIdRel(Long ${idPropertyName!}); + ${entity} getByIdRel(Integer ${idPropertyName!}); } <% } %> diff --git a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl index 072e052..f1de081 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl @@ -53,7 +53,7 @@ public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.m } @Override - public ${entity} getByIdRel(Long ${idPropertyName!}) { + public ${entity} getByIdRel(Integer ${idPropertyName!}) { ${entity}Param param = new ${entity}Param(); param.set${idCapitalName!}(${idPropertyName!}); return param.getOne(baseMapper.selectListRel(param)); From 359c080023ed896612493b266302ec045c828c3e Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Tue, 28 Apr 2026 09:43:58 +0800 Subject: [PATCH 23/60] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=BA=95=E5=9B=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopActiveImageController.java | 127 ++++++++++++++++++ .../shop/entity/ShopActiveImage.java | 71 ++++++++++ .../shop/mapper/ShopActiveImageMapper.java | 37 +++++ .../shop/mapper/xml/ShopActiveImageMapper.xml | 63 +++++++++ .../shop/param/ShopActiveImageParam.java | 56 ++++++++ .../shop/service/ShopActiveImageService.java | 42 ++++++ .../impl/ShopActiveImageServiceImpl.java | 70 ++++++++++ .../gxwebsoft/generator/ShopGenerator.java | 4 +- .../generator/templates/serviceImpl.java.btl | 1 + 9 files changed, 469 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/controller/ShopActiveImageController.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/ShopActiveImageMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/ShopActiveImageMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/ShopActiveImageService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopActiveImageController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopActiveImageController.java new file mode 100644 index 0000000..0d9b16b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopActiveImageController.java @@ -0,0 +1,127 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.ShopActiveImageService; +import com.gxwebsoft.shop.entity.ShopActiveImage; +import com.gxwebsoft.shop.param.ShopActiveImageParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 推广码底图控制器 + * + * @author xm + * @since 2026-04-27 18:02:18 + */ +@Tag(name = "推广码底图管理") +@RestController +@RequestMapping("/api/shop/shop-active-image") +public class ShopActiveImageController extends BaseController { + @Resource + private ShopActiveImageService shopActiveImageService; + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:list')") + @Operation(summary = "分页查询推广码底图") + @GetMapping("/page") + public ApiResult> page(ShopActiveImageParam param) { + // 使用关联查询 + return success(shopActiveImageService.pageRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:list')") + @Operation(summary = "查询全部推广码底图") + @GetMapping() + public ApiResult> list(ShopActiveImageParam param) { + // 使用关联查询 + return success(shopActiveImageService.listRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:list')") + @Operation(summary = "根据id查询推广码底图") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(shopActiveImageService.getByIdRel(id)); + } + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:save')") + @OperationLog + @Operation(summary = "添加推广码底图") + @PostMapping() + public ApiResult save(@RequestBody ShopActiveImage shopActiveImage) { + shopActiveImage.setCreator(String.valueOf(getLoginUserId())); + shopActiveImage.setCreateTime(LocalDateTime.now()); + if (shopActiveImageService.save(shopActiveImage)) { + return success("添加成功"); + } + return fail("添加失败"); + } + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:update')") + @OperationLog + @Operation(summary = "修改推广码底图") + @PutMapping() + public ApiResult update(@RequestBody ShopActiveImage shopActiveImage) { + shopActiveImage.setUpdater(String.valueOf(getLoginUserId())); + shopActiveImage.setUpdateTime(LocalDateTime.now()); + if (shopActiveImageService.updateById(shopActiveImage)) { + return success("修改成功"); + } + return fail("修改失败"); + } + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:remove')") + @OperationLog + @Operation(summary = "删除推广码底图") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (shopActiveImageService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:shopActiveImage:save')") + @OperationLog + @Operation(summary = "批量添加推广码底图") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (shopActiveImageService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:shopActiveImage:update')") + @OperationLog + @Operation(summary = "批量修改推广码底图") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(shopActiveImageService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + +// @PreAuthorize("hasAuthority('shop:shopActiveImage:remove')") + @OperationLog + @Operation(summary = "批量删除推广码底图") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (shopActiveImageService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java new file mode 100644 index 0000000..86b3831 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java @@ -0,0 +1,71 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.List; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 推广码底图 + * + * @author xm + * @since 2026-04-27 18:02:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(name = "ShopActiveImage对象", description = "推广码底图") +@TableName("shop_active_image") +public class ShopActiveImage implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @Schema(description = "名称") + private String name; + + @Schema(description = "类型 0-推广底图 1-其他") + private Integer type; + + @Schema(description = "图片地址，多个以‘,’隔开") + private String imgUrl; + + @Schema(description = "图片地址集合") + @TableField(exist = false) + private List imgUrlList; + + @Schema(description = "启用状态 0-启用 1-禁用") + private Integer status; + + @Schema(description = "排序") + private Integer sortNumber; + + @Schema(description = "租户ID") + @NotNull(message = "租户ID不能为空！") + private Integer tenantId; + + @Schema(description = "创建人") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新人") + private String updater; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; + + @Schema(description = "是否删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopActiveImageMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopActiveImageMapper.java new file mode 100644 index 0000000..b747c4f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopActiveImageMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.ShopActiveImage; +import com.gxwebsoft.shop.param.ShopActiveImageParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 推广码底图Mapper + * + * @author xm + * @since 2026-04-27 18:02:17 + */ +public interface ShopActiveImageMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ShopActiveImageParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ShopActiveImageParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopActiveImageMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopActiveImageMapper.xml new file mode 100644 index 0000000..7d1efd8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopActiveImageMapper.xml @@ -0,0 +1,63 @@ + + + + + + + SELECT a.* + FROM shop_active_image a + + + AND a.id = #{param.id} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.type = #{param.type} + + + AND a.img_url LIKE CONCAT('%', #{param.imgUrl}, '%') + + + AND a.status = #{param.status} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.creator LIKE CONCAT('%', #{param.creator}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.updater LIKE CONCAT('%', #{param.updater}, '%') + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java new file mode 100644 index 0000000..f1eef56 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java @@ -0,0 +1,56 @@ +package com.gxwebsoft.shop.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 推广码底图查询参数 + * + * @author xm + * @since 2026-04-27 18:02:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@Schema(name = "ShopActiveImageParam对象", description = "推广码底图查询参数") +public class ShopActiveImageParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @Schema(description = "名称") + private String name; + + @Schema(description = "类型 0-推广底图 1-其他") + @QueryField(type = QueryType.EQ) + private Integer type; + + @Schema(description = "图片地址") + private String imgUrl; + + @Schema(description = "启用状态 0-启用 1-禁用") + @QueryField(type = QueryType.EQ) + private Integer status; + + @Schema(description = "排序") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @Schema(description = "创建人") + private String creator; + + @Schema(description = "更新人") + private String updater; + + @Schema(description = "是否删除 0-未删 1-已删") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopActiveImageService.java b/src/main/java/com/gxwebsoft/shop/service/ShopActiveImageService.java new file mode 100644 index 0000000..192cb37 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/ShopActiveImageService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopActiveImage; +import com.gxwebsoft.shop.param.ShopActiveImageParam; + +import java.util.List; + +/** + * 推广码底图Service + * + * @author xm + * @since 2026-04-27 18:02:17 + */ +public interface ShopActiveImageService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ShopActiveImageParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ShopActiveImageParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return ShopActiveImage + */ + ShopActiveImage getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java new file mode 100644 index 0000000..af687e4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.shop.service.impl; + +import com.aliyuncs.utils.StringUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopActiveImage; +import com.gxwebsoft.shop.mapper.ShopActiveImageMapper; +import com.gxwebsoft.shop.param.ShopActiveImageParam; +import com.gxwebsoft.shop.service.ShopActiveImageService; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * 推广码底图Service实现 + * + * @author xm + * @since 2026-04-27 17:53:00 + */ +@Service +@AllArgsConstructor +public class ShopActiveImageServiceImpl extends ServiceImpl implements ShopActiveImageService { + + @Override + public PageResult pageRel(ShopActiveImageParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + if(CollectionUtils.isNotEmpty(list)){ + list.forEach(shopActiveImage -> { + if(!StringUtils.isEmpty(shopActiveImage.getImgUrl())){ + shopActiveImage.setImgUrlList(Arrays.asList(shopActiveImage.getImgUrl().split(","))); + } + }); + } + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(ShopActiveImageParam param) { + List list = baseMapper.selectListRel(param); + if(CollectionUtils.isNotEmpty(list)){ + list.forEach(shopActiveImage -> { + if(!StringUtils.isEmpty(shopActiveImage.getImgUrl())){ + shopActiveImage.setImgUrlList(Arrays.asList(shopActiveImage.getImgUrl().split(","))); + } + }); + } + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public ShopActiveImage getByIdRel(Integer id) { + ShopActiveImageParam param = new ShopActiveImageParam(); + param.setId(id); + ShopActiveImage activeImage = param.getOne(baseMapper.selectListRel(param)); + if(activeImage != null && !StringUtils.isEmpty(activeImage.getImgUrl())){ + activeImage.setImgUrlList(Arrays.asList(activeImage.getImgUrl().split(","))); + } + return activeImage; + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 5fdf7cf..b4922dc 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -45,7 +45,7 @@ public class ShopGenerator { private static final String DB_URL = "jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; private static final String DB_USERNAME = "modules"; - private static final String DB_PASSWORD = "tYmmMGh5wpwXR3ae2"; + private static final String DB_PASSWORD = "tYmmMGh5wpwXR3ae"; // 包名 private static final String PACKAGE_NAME = "com.gxwebsoft"; // 模块名 @@ -106,7 +106,7 @@ public class ShopGenerator { // "shop_express_template_detail", // "shop_gift" // "shop_flash_sale_activity" -// "shop_flash_sale_product" +// "shop_active_image" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{ diff --git a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl index f1de081..f30853d 100644 --- a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl +++ b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl @@ -16,6 +16,7 @@ import ${package.Entity}.${entity}; import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param; import ${cfg.packageName!}.common.core.web.PageParam; import ${cfg.packageName!}.common.core.web.PageResult; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; From 68d2a99b7736e4c0e73a258854522e2d911df0ec Mon Sep 17 00:00:00 2001 From: "1350250847@qq.com" Date: Tue, 28 Apr 2026 14:31:29 +0800 Subject: [PATCH 24/60] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87=E3=80=81?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/service/impl/ShopFlashSaleActivityServiceImpl.java | 4 ++++ .../java/com/gxwebsoft/shop/vo/ShopFlashSaleActivityVO.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java index b6f16aa..a2784fe 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java @@ -56,6 +56,8 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl Date: Wed, 29 Apr 2026 09:46:03 +0800 Subject: [PATCH 25/60] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AD=A5=E6=A2=AF?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShopSurchargeConfigController.java | 88 ++++++++++++++ .../shop/entity/ShopSurchargeConfig.java | 66 ++++++++++ .../mapper/ShopSurchargeConfigMapper.java | 37 ++++++ .../mapper/xml/ShopSurchargeConfigMapper.xml | 60 +++++++++ .../shop/param/ShopSurchargeConfigParam.java | 57 +++++++++ .../service/ShopSurchargeConfigService.java | 70 +++++++++++ .../impl/ShopSurchargeConfigServiceImpl.java | 114 ++++++++++++++++++ 7 files changed, 492 insertions(+) create mode 100644 src/main/java/com/gxwebsoft/shop/controller/ShopSurchargeConfigController.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/ShopSurchargeConfigMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/ShopSurchargeConfigMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/ShopSurchargeConfigParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/ShopSurchargeConfigService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/ShopSurchargeConfigServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopSurchargeConfigController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopSurchargeConfigController.java new file mode 100644 index 0000000..b5cf848 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopSurchargeConfigController.java @@ -0,0 +1,88 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopSurchargeConfig; +import com.gxwebsoft.shop.param.ShopSurchargeConfigParam; +import com.gxwebsoft.shop.service.ShopSurchargeConfigService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 步梯费用设置控制器 + * + * @author xm + * @since 2026-04-28 16:30:00 + */ +@Tag(name = "步梯费用设置管理") +@RestController +@RequestMapping("/api/shop/shop-surcharge-config") +public class ShopSurchargeConfigController extends BaseController { + @Resource + private ShopSurchargeConfigService shopSurchargeConfigService; + +// @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:list')") + @Operation(summary = "分页查询步梯费用设置") + @GetMapping("/page") + public ApiResult> page(ShopSurchargeConfigParam param) { + // 使用关联查询 + return success(shopSurchargeConfigService.pageRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:list')") + @Operation(summary = "根据id查询步梯费用设置") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(shopSurchargeConfigService.getByIdRel(id)); + } + +// @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:list')") + @Operation(summary = "根据类型查询步梯费用设置") + @GetMapping("/getInfoByType") + public ApiResult getInfoByType(@RequestParam Integer type) { + // 使用关联查询 + return success(shopSurchargeConfigService.getInfoByType(type)); + } + +// @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:save')") + @OperationLog + @Operation(summary = "添加步梯费用设置") + @PostMapping() + public ApiResult save(@RequestBody ShopSurchargeConfig shopSurchargeConfig) { + return success(shopSurchargeConfigService.saveInfo(shopSurchargeConfig)); + } + +// @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:update')") + @OperationLog + @Operation(summary = "修改步梯费用设置") + @PutMapping() + public ApiResult update(@RequestBody ShopSurchargeConfig shopSurchargeConfig) { + return success(shopSurchargeConfigService.updateInfo(shopSurchargeConfig)); + } + +// @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:update')") + @OperationLog + @Operation(summary = "修改步梯费用设置") + @PutMapping("/updateStatus") + public ApiResult updateStatus(@RequestParam("id") Integer id) { + return success(shopSurchargeConfigService.updateStatus(id)); + } + + // @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:remove')") + @OperationLog + @Operation(summary = "删除步梯费用设置") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (shopSurchargeConfigService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java b/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java new file mode 100644 index 0000000..79ff296 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 步梯费用设置 + * + * @author xm + * @since 2026-04-28 16:30:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(name = "ShopSurchargeConfig对象", description = "步梯费用设置") +@TableName("shop_surcharge_config") +public class ShopSurchargeConfig implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @Schema(description = "名称") + private String name; + + @Schema(description = "价格（元）") + private BigDecimal price; + + @Schema(description = "类型 0-步梯费 1-其他") + private Integer type; + + @Schema(description = "状态 0-开启 1-关闭") + private Integer status; + + @Schema(description = "排序") + private Integer sortNumber; + + @Schema(description = "租户ID") + private Integer tenantId; + + @Schema(description = "创建人") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "修改人") + private String updater; + + @Schema(description = "修改时间") + private LocalDateTime updateTime; + + @Schema(description = "是否删除 0-未删 1-已删") + @TableLogic + private Boolean deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopSurchargeConfigMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopSurchargeConfigMapper.java new file mode 100644 index 0000000..7674ee8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopSurchargeConfigMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.ShopSurchargeConfig; +import com.gxwebsoft.shop.param.ShopSurchargeConfigParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 步梯费用设置Mapper + * + * @author xm + * @since 2026-04-28 16:30:00 + */ +public interface ShopSurchargeConfigMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ShopSurchargeConfigParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ShopSurchargeConfigParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopSurchargeConfigMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopSurchargeConfigMapper.xml new file mode 100644 index 0000000..6827f44 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopSurchargeConfigMapper.xml @@ -0,0 +1,60 @@ + + + + + + + SELECT a.* + FROM shop_surcharge_config a + + + AND a.id = #{param.id} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.type = #{param.type} + + + AND a.status = #{param.status} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.creator LIKE CONCAT('%', #{param.creator}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.updater LIKE CONCAT('%', #{param.updater}, '%') + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopSurchargeConfigParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopSurchargeConfigParam.java new file mode 100644 index 0000000..ac1ea6e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/ShopSurchargeConfigParam.java @@ -0,0 +1,57 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 步梯费用设置查询参数 + * + * @author xm + * @since 2026-04-28 16:30:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@Schema(name = "ShopSurchargeConfigParam对象", description = "步梯费用设置查询参数") +public class ShopSurchargeConfigParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @Schema(description = "名称") + private String name; + + @Schema(description = "价格（元）") + private BigDecimal price; + + @Schema(description = "类型 0-步梯费 1-其他") + @QueryField(type = QueryType.EQ) + private Integer type; + + @Schema(description = "状态 0-开启 1-关闭") + @QueryField(type = QueryType.EQ) + private Integer status; + + @Schema(description = "排序") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + + @Schema(description = "是否删除 0-未删 1-已删") + @QueryField(type = QueryType.EQ) + private Boolean deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopSurchargeConfigService.java b/src/main/java/com/gxwebsoft/shop/service/ShopSurchargeConfigService.java new file mode 100644 index 0000000..f11178b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/ShopSurchargeConfigService.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopSurchargeConfig; +import com.gxwebsoft.shop.param.ShopSurchargeConfigParam; + +import java.util.List; + +/** + * 步梯费用设置Service + * + * @author xm + * @since 2026-04-28 16:30:00 + */ +public interface ShopSurchargeConfigService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ShopSurchargeConfigParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ShopSurchargeConfigParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return ShopSurchargeConfig + */ + ShopSurchargeConfig getByIdRel(Integer id); + + /** + * 通过类型获取数据 + * @param type + * @return + */ + ShopSurchargeConfig getInfoByType(Integer type); + + /** + * 保存信息 + * @param shopSurchargeConfig + * @return + */ + Integer saveInfo(ShopSurchargeConfig shopSurchargeConfig); + + /** + * 修改信息 + * @param shopSurchargeConfig + * @return + */ + Boolean updateInfo(ShopSurchargeConfig shopSurchargeConfig); + + /** + * 更新数据状态 + * @param id + * @return + */ + Boolean updateStatus(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopSurchargeConfigServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopSurchargeConfigServiceImpl.java new file mode 100644 index 0000000..78c74d0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopSurchargeConfigServiceImpl.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; +import com.gxwebsoft.common.core.utils.LoginUserUtil; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.mapper.ShopSurchargeConfigMapper; +import com.gxwebsoft.shop.service.ShopSurchargeConfigService; +import com.gxwebsoft.shop.entity.ShopSurchargeConfig; +import com.gxwebsoft.shop.param.ShopSurchargeConfigParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 步梯费用设置Service实现 + * + * @author xm + * @since 2026-04-28 16:30:00 + */ +@Service +@AllArgsConstructor +public class ShopSurchargeConfigServiceImpl extends ServiceImpl implements ShopSurchargeConfigService { + + @Override + public PageResult pageRel(ShopSurchargeConfigParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(ShopSurchargeConfigParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public ShopSurchargeConfig getByIdRel(Integer id) { + ShopSurchargeConfigParam param = new ShopSurchargeConfigParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public ShopSurchargeConfig getInfoByType(Integer type) { + List list = lambdaQuery().eq(ShopSurchargeConfig::getType, type).list(); + if(CollectionUtils.isNotEmpty(list)){ + return list.get(0); + } + return null; + } + + @Override + public Integer saveInfo(ShopSurchargeConfig entity) { + List list = lambdaQuery().eq(ShopSurchargeConfig::getType, entity.getType()).list(); + if(CollectionUtils.isNotEmpty(list)){ + throw new RuntimeException("该类型收费数据已存在！"); + } + User loginUser = LoginUserUtil.getLoginUser(); + entity.setCreator(String.valueOf(loginUser.getUserId())); + entity.setCreateTime(LocalDateTime.now()); + + baseMapper.insert(entity); + return entity.getId(); + } + + @Override + public Boolean updateInfo(ShopSurchargeConfig entity) { + List list = lambdaQuery().eq(ShopSurchargeConfig::getType, entity.getType()).list(); + if(CollectionUtils.isNotEmpty(list)){ + throw new RuntimeException("该类型收费数据已存在！"); + } + + User loginUser = LoginUserUtil.getLoginUser(); + entity.setUpdater(String.valueOf(loginUser.getUserId())); + entity.setUpdateTime(LocalDateTime.now()); + + return baseMapper.updateById(entity) > 0; + } + + @Override + public Boolean updateStatus(Integer id) { + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser == null){ + throw new RuntimeException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg()); + } + + ShopSurchargeConfig config = baseMapper.selectById(id); + if(config == null){ + throw new RuntimeException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + + if(config.getStatus() == 0){ + config.setStatus(1); + }else { + config.setStatus(0); + } + config.setUpdater(String.valueOf(loginUser.getUserId())); + config.setUpdateTime(LocalDateTime.now()); + + return baseMapper.updateById(config) > 0; + } + +} From 026824d31deac07f4362bbaf17d36f8710d20b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 29 Apr 2026 10:28:08 +0800 Subject: [PATCH 26/60] chore(config): remove obsolete test and environment configuration files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 application-glt2.yml、application-glt3.yml 和 application-test.yml 配置文件 - 移除了所有与证书路径相关的测试类，包括 CertificatePathConcatenationTest、CertificatePathFixTest、CertificatePathTest、CertificateTest 和 EnvironmentBasedCertificateTest - 删除了 CouponStatusServiceTest 测试类和 MultiSpecOrderTest 测试类 - 清理历史环境和测试遗留配置，简化项目结构，提高维护性 --- src/main/resources/application-glt2.yml | 73 ---- src/main/resources/application-glt3.yml | 86 ----- src/main/resources/application-test.yml | 85 ----- .../gxwebsoft/generator/ShopGenerator.java | 4 +- .../payment/enums/PaymentTypeTest.java | 136 -------- .../gxwebsoft/shop/CertificatePathTest.java | 79 ----- .../gxwebsoft/shop/MultiSpecOrderTest.java | 174 ---------- .../shop/OrderBusinessServiceTest.java | 170 ---------- .../com/gxwebsoft/shop/OrderTotalTest.java | 56 ---- .../gxwebsoft/shop/OrderValidationTest.java | 315 ------------------ .../shop/WechatPayDescriptionTest.java | 75 ----- .../shop/service/CouponStatusServiceTest.java | 113 ------- .../shop/service/ShopGoodsSalesTest.java | 145 -------- .../ShopOrderGoodsIgnoreTenantTest.java | 136 -------- .../ShopOrderUpdate10550ServiceTest.java | 141 -------- .../shop/util/UpstreamUserFinderTest.java | 65 ---- .../CertificatePathConcatenationTest.java | 155 --------- .../test/CertificatePathFixTest.java | 99 ------ .../com/gxwebsoft/test/CertificateTest.java | 107 ------ .../test/EnvironmentBasedCertificateTest.java | 119 ------- .../test/NotificationCertificateFixTest.java | 101 ------ .../gxwebsoft/test/WechatPayConfigTest.java | 89 ----- .../test/WechatPayConfigValidationTest.java | 134 -------- .../com/gxwebsoft/test/WechatPayPathTest.java | 158 --------- .../test/WechatPayPublicKeyTest.java | 150 --------- 25 files changed, 2 insertions(+), 2963 deletions(-) delete mode 100644 src/main/resources/application-glt2.yml delete mode 100644 src/main/resources/application-glt3.yml delete mode 100644 src/main/resources/application-test.yml delete mode 100644 src/test/java/com/gxwebsoft/payment/enums/PaymentTypeTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/CertificatePathTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/MultiSpecOrderTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/OrderBusinessServiceTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/OrderTotalTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/OrderValidationTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/WechatPayDescriptionTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/service/CouponStatusServiceTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/service/ShopGoodsSalesTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/service/ShopOrderGoodsIgnoreTenantTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/service/ShopOrderUpdate10550ServiceTest.java delete mode 100644 src/test/java/com/gxwebsoft/shop/util/UpstreamUserFinderTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/CertificatePathConcatenationTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/CertificatePathFixTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/CertificateTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/EnvironmentBasedCertificateTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/NotificationCertificateFixTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/WechatPayConfigTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/WechatPayConfigValidationTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/WechatPayPathTest.java delete mode 100644 src/test/java/com/gxwebsoft/test/WechatPayPublicKeyTest.java diff --git a/src/main/resources/application-glt2.yml b/src/main/resources/application-glt2.yml deleted file mode 100644 index b583eb8..0000000 --- a/src/main/resources/application-glt2.yml +++ /dev/null @@ -1,73 +0,0 @@ -# 开发环境配置 - -# 服务器配置 -server: - port: 9200 - -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: gltdb - password: EeD4FtzyA5ksj7Bk - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - - # redis - redis: - database: 0 - host: 1Panel-redis-GmNr - port: 6379 - password: redis_t74P8C - -# 日志配置 -logging: - level: - com.gxwebsoft: DEBUG - com.baomidou.mybatisplus: DEBUG - -socketio: - host: localhost #IP地址 - -# MQTT配置 -mqtt: - enabled: false # 添加开关来禁用MQTT服务 - host: tcp://132.232.214.96:1883 - username: swdev - password: Sw20250523 - client-id-prefix: hjm_car_ - topic: /SW_GPS/# - qos: 2 - connection-timeout: 10 - keep-alive-interval: 20 - auto-reconnect: true - -# 框架配置 -config: - # 基础模块接口 - server-url: https://glt-server.websoft.top/api - # 业务模块接口 - api-url: https://glt-api.websoft.top/api - upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) - -# 开发环境证书配置 -certificate: - load-mode: CLASSPATH # 开发环境从classpath加载 - wechat-pay: - dev: - private-key-file: "apiclient_key.pem" - apiclient-cert-file: "apiclient_cert.pem" - wechatpay-cert-file: "wechatpay_cert.pem" - -# 阿里云翻译配置 -aliyun: - translate: - access-key-id: LTAI5tEsyhW4GCKbds1qsopg - access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO - endpoint: mt.cn-hangzhou.aliyuncs.com - -# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致） -wechatpay: - transfer: - scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]' diff --git a/src/main/resources/application-glt3.yml b/src/main/resources/application-glt3.yml deleted file mode 100644 index 6bd8987..0000000 --- a/src/main/resources/application-glt3.yml +++ /dev/null @@ -1,86 +0,0 @@ -# 服务器配置 -server: - port: 9300 -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: gltdb - password: EeD4FtzyA5ksj7Bk - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - druid: - remove-abandoned: true - - # redis - redis: - database: 0 - host: 1Panel-redis-GmNr - port: 6379 - password: redis_t74P8C - -# 日志配置 -logging: - file: - name: websoft-modules.log - level: - root: WARN - com.gxwebsoft: ERROR - com.baomidou.mybatisplus: ERROR - -socketio: - host: 0.0.0.0 #IP地址 - -# MQTT配置 -mqtt: - enabled: false # 启用MQTT服务 - host: tcp://132.232.214.96:1883 - username: swdev - password: Sw20250523 - client-id-prefix: hjm_car_ - topic: /SW_GPS/# - qos: 2 - connection-timeout: 10 - keep-alive-interval: 20 - auto-reconnect: true - -# 框架配置 -config: - # 文件服务器 - file-server: https://file-s209.shoplnk.cn - # 生产环境接口 - server-url: https://glt-server.websoft.top/api - # 业务模块接口 - api-url: https://glt-api.websoft.top/api - upload-path: /www/wwwroot/file.ws - - # 阿里云OSS云存储 - endpoint: https://oss-cn-shenzhen.aliyuncs.com - accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP - accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM - bucketName: oss-gxwebsoft - bucketDomain: https://oss.wsdns.cn - aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com - -# 生产环境证书配置 -certificate: - load-mode: VOLUME # 生产环境从Docker挂载卷加载 - cert-root-path: /www/wwwroot/file.ws - -# 支付配置缓存 -payment: - cache: - # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 - key-prefix: "Payment:1" - # 缓存过期时间（小时） - expire-hours: 24 -# 阿里云翻译配置 -aliyun: - translate: - access-key-id: LTAI5tEsyhW4GCKbds1qsopg - access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO - endpoint: mt.cn-hangzhou.aliyuncs.com -wechatpay: - transfer: - scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml deleted file mode 100644 index 185951d..0000000 --- a/src/main/resources/application-test.yml +++ /dev/null @@ -1,85 +0,0 @@ -# 生产环境配置 - -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: modules - password: tYmmMGh5wpwXR3ae - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - druid: - remove-abandoned: true - - # redis - redis: - database: 0 - host: 47.107.249.41 - port: 16379 - password: redis_t74P8C - -# 日志配置 -logging: - file: - name: websoft-modules.log - level: - root: WARN - com.gxwebsoft: ERROR - com.baomidou.mybatisplus: ERROR - -socketio: - host: 0.0.0.0 #IP地址 - -# MQTT配置 -mqtt: - enabled: false # 启用MQTT服务 - host: tcp://132.232.214.96:1883 - username: swdev - password: Sw20250523 - client-id-prefix: hjm_car_ - topic: /SW_GPS/# - qos: 2 - connection-timeout: 10 - keep-alive-interval: 20 - auto-reconnect: true - -# 框架配置 -config: - # 文件服务器 - file-server: https://file-s209.shoplnk.cn - # 生产环境接口 - server-url: https://glt-server.websoft.top/api - # 业务模块接口 - api-url: https://glt-api.websoft.top/api - upload-path: /www/wwwroot/file.ws - - # 阿里云OSS云存储 - endpoint: https://oss-cn-shenzhen.aliyuncs.com - accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP - accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM - bucketName: oss-gxwebsoft - bucketDomain: https://oss.wsdns.cn - aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com - -# 生产环境证书配置 -certificate: - load-mode: VOLUME # 生产环境从Docker挂载卷加载 - cert-root-path: /www/wwwroot/file.ws - -# 支付配置缓存 -payment: - cache: - # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 - key-prefix: "Payment:1" - # 缓存过期时间（小时） - expire-hours: 24 -# 阿里云翻译配置 -aliyun: - translate: - access-key-id: LTAI5tEsyhW4GCKbds1qsopg - access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO - endpoint: mt.cn-hangzhou.aliyuncs.com -wechatpay: - transfer: - scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 9d1224c..4bd5f65 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -42,10 +42,10 @@ public class ShopGenerator { // 是否在xml中添加二级缓存配置 private static final boolean ENABLE_CACHE = false; // 数据库连接配置 - private static final String DB_URL = "jdbc:mysql://8.134.169.209:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_URL = "jdbc:mysql://8.134.55.105:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; private static final String DB_USERNAME = "modules"; - private static final String DB_PASSWORD = "8YdLnk7KsPAyDXGA"; + private static final String DB_PASSWORD = "tYmmMGh5wpwXR3ae"; // 包名 private static final String PACKAGE_NAME = "com.gxwebsoft"; // 模块名 diff --git a/src/test/java/com/gxwebsoft/payment/enums/PaymentTypeTest.java b/src/test/java/com/gxwebsoft/payment/enums/PaymentTypeTest.java deleted file mode 100644 index b1e54c7..0000000 --- a/src/test/java/com/gxwebsoft/payment/enums/PaymentTypeTest.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gxwebsoft.payment.enums; - -import com.gxwebsoft.payment.utils.PaymentTypeCompatibilityUtil; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.DisplayName; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * 支付方式枚举测试类 - * 验证支付方式优化后的功能正确性 - * - * @author 科技小王子 - * @since 2025-08-30 - */ -@DisplayName("支付方式枚举测试") -class PaymentTypeTest { - - @Test - @DisplayName("测试核心支付方式") - void testCorePaymentTypes() { - // 测试8种核心支付方式 - assertEquals(PaymentType.BALANCE, PaymentType.getByCode(0)); - assertEquals(PaymentType.WECHAT, PaymentType.getByCode(1)); - assertEquals(PaymentType.ALIPAY, PaymentType.getByCode(2)); - assertEquals(PaymentType.UNION_PAY, PaymentType.getByCode(3)); - assertEquals(PaymentType.CASH, PaymentType.getByCode(4)); - assertEquals(PaymentType.POS, PaymentType.getByCode(5)); - assertEquals(PaymentType.FREE, PaymentType.getByCode(6)); - assertEquals(PaymentType.POINTS, PaymentType.getByCode(7)); - - // 验证核心支付方式标识 - assertTrue(PaymentType.BALANCE.isCorePaymentType()); - assertTrue(PaymentType.WECHAT.isCorePaymentType()); - assertTrue(PaymentType.ALIPAY.isCorePaymentType()); - assertTrue(PaymentType.UNION_PAY.isCorePaymentType()); - assertTrue(PaymentType.CASH.isCorePaymentType()); - assertTrue(PaymentType.POS.isCorePaymentType()); - assertTrue(PaymentType.FREE.isCorePaymentType()); - assertTrue(PaymentType.POINTS.isCorePaymentType()); - } - - @Test - @DisplayName("测试废弃支付方式") - void testDeprecatedPaymentTypes() { - // 测试废弃支付方式标识 - assertTrue(PaymentType.WECHAT_NATIVE.isDeprecated()); - assertTrue(PaymentType.MEMBER_CARD_OLD.isDeprecated()); - assertTrue(PaymentType.VIP_MONTHLY.isDeprecated()); - - // 验证废弃支付方式仍然可以通过代码获取（向后兼容） - assertEquals(PaymentType.WECHAT_NATIVE, PaymentType.getByCode(102)); - assertEquals(PaymentType.FREE_OLD, PaymentType.getByCode(12)); - assertEquals(PaymentType.POINTS_OLD, PaymentType.getByCode(15)); - } - - @Test - @DisplayName("测试支付方式分类") - void testPaymentTypeCategories() { - // 测试微信支付类型 - assertTrue(PaymentType.WECHAT.isWechatPay()); - assertTrue(PaymentType.WECHAT_NATIVE.isWechatPay()); - - // 测试第三方支付 - assertTrue(PaymentType.WECHAT.isThirdPartyPay()); - assertTrue(PaymentType.ALIPAY.isThirdPartyPay()); - assertTrue(PaymentType.UNION_PAY.isThirdPartyPay()); - - // 测试在线支付 - assertTrue(PaymentType.WECHAT.isOnlinePay()); - assertTrue(PaymentType.ALIPAY.isOnlinePay()); - assertFalse(PaymentType.CASH.isOnlinePay()); - assertFalse(PaymentType.POS.isOnlinePay()); - } - - @Test - @DisplayName("测试兼容性工具类") - void testCompatibilityUtil() { - // 测试废弃支付方式转换 - assertEquals(Integer.valueOf(0), PaymentTypeCompatibilityUtil.convertToCore(2)); // 会员卡 -> 余额 - assertEquals(Integer.valueOf(1), PaymentTypeCompatibilityUtil.convertToCore(102)); // 微信Native -> 微信 - assertEquals(Integer.valueOf(2), PaymentTypeCompatibilityUtil.convertToCore(3)); // 支付宝编号调整 - assertEquals(Integer.valueOf(6), PaymentTypeCompatibilityUtil.convertToCore(12)); // 免费编号调整 - assertEquals(Integer.valueOf(7), PaymentTypeCompatibilityUtil.convertToCore(15)); // 积分编号调整 - assertEquals(Integer.valueOf(3), PaymentTypeCompatibilityUtil.convertToCore(19)); // 银联编号调整 - - // 测试核心支付方式不变 - assertEquals(Integer.valueOf(0), PaymentTypeCompatibilityUtil.convertToCore(0)); // 余额支付 - assertEquals(Integer.valueOf(1), PaymentTypeCompatibilityUtil.convertToCore(1)); // 微信支付 - assertEquals(Integer.valueOf(4), PaymentTypeCompatibilityUtil.convertToCore(4)); // 现金支付 - assertEquals(Integer.valueOf(5), PaymentTypeCompatibilityUtil.convertToCore(5)); // POS机支付 - - // 测试废弃检查 - assertTrue(PaymentTypeCompatibilityUtil.isDeprecated(102)); // 微信Native - assertTrue(PaymentTypeCompatibilityUtil.isDeprecated(12)); // 免费(旧) - assertTrue(PaymentTypeCompatibilityUtil.isDeprecated(15)); // 积分(旧) - assertFalse(PaymentTypeCompatibilityUtil.isDeprecated(0)); // 余额支付 - assertFalse(PaymentTypeCompatibilityUtil.isDeprecated(1)); // 微信支付 - - // 测试核心支付方式检查 - assertTrue(PaymentTypeCompatibilityUtil.isCorePaymentType(0)); // 余额支付 - assertTrue(PaymentTypeCompatibilityUtil.isCorePaymentType(1)); // 微信支付 - assertTrue(PaymentTypeCompatibilityUtil.isCorePaymentType(2)); // 支付宝支付 - assertTrue(PaymentTypeCompatibilityUtil.isCorePaymentType(7)); // 积分支付 - assertFalse(PaymentTypeCompatibilityUtil.isCorePaymentType(102)); // 微信Native - assertFalse(PaymentTypeCompatibilityUtil.isCorePaymentType(12)); // 免费(旧) - } - - @Test - @DisplayName("测试迁移消息") - void testMigrationMessages() { - // 测试废弃支付方式的迁移消息 - String message = PaymentTypeCompatibilityUtil.getMigrationMessage(102); - assertNotNull(message); - assertTrue(message.contains("微信Native")); - assertTrue(message.contains("微信支付")); - - // 测试核心支付方式无迁移消息 - assertNull(PaymentTypeCompatibilityUtil.getMigrationMessage(0)); - assertNull(PaymentTypeCompatibilityUtil.getMigrationMessage(1)); - } - - @Test - @DisplayName("测试迁移报告生成") - void testMigrationReport() { - String report = PaymentTypeCompatibilityUtil.generateMigrationReport(); - assertNotNull(report); - assertTrue(report.contains("核心支付方式")); - assertTrue(report.contains("废弃支付方式映射")); - assertTrue(report.contains("余额支付")); - assertTrue(report.contains("微信支付")); - - System.out.println("=== 支付方式迁移报告 ==="); - System.out.println(report); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/CertificatePathTest.java b/src/test/java/com/gxwebsoft/shop/CertificatePathTest.java deleted file mode 100644 index 4a3e39a..0000000 --- a/src/test/java/com/gxwebsoft/shop/CertificatePathTest.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.gxwebsoft.shop; - -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -/** - * 证书路径构建测试 - * - * @author 科技小王子 - * @since 2025-08-09 - */ -public class CertificatePathTest { - - @Test - public void testDevCertificatePath() { - // 模拟开发环境配置 - String uploadPath = "/Users/gxwebsoft/JAVA/mp-java/src/main/resources/"; - Integer tenantId = 10324; - String privateKeyFile = "apiclient_key.pem"; - - // 构建证书路径 - String tenantCertPath = uploadPath + "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + privateKeyFile; - - // 验证路径构建结果 - String expectedTenantPath = "/Users/gxwebsoft/JAVA/mp-java/src/main/resources/dev/wechat/10324"; - String expectedPrivateKeyPath = "/Users/gxwebsoft/JAVA/mp-java/src/main/resources/dev/wechat/10324/apiclient_key.pem"; - - assertEquals(expectedTenantPath, tenantCertPath); - assertEquals(expectedPrivateKeyPath, privateKeyPath); - - System.out.println("开发环境证书路径测试通过:"); - System.out.println("租户证书目录: " + tenantCertPath); - System.out.println("私钥文件路径: " + privateKeyPath); - } - - @Test - public void testProdCertificatePath() { - // 模拟生产环境配置 - String uploadPath = "/www/wwwroot/file.ws"; - Integer tenantId = 10324; - String privateKeyFile = "apiclient_key.pem"; - - // 构建证书路径（生产环境不使用upload-path，而是从数据库读取） - // 这里只是为了对比展示 - String tenantCertPath = uploadPath + "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + privateKeyFile; - - // 验证路径构建结果 - String expectedTenantPath = "/www/wwwroot/file.ws/dev/wechat/10324"; - String expectedPrivateKeyPath = "/www/wwwroot/file.ws/dev/wechat/10324/apiclient_key.pem"; - - assertEquals(expectedTenantPath, tenantCertPath); - assertEquals(expectedPrivateKeyPath, privateKeyPath); - - System.out.println("生产环境证书路径测试通过:"); - System.out.println("租户证书目录: " + tenantCertPath); - System.out.println("私钥文件路径: " + privateKeyPath); - } - - @Test - public void testMultipleTenants() { - String uploadPath = "/Users/gxwebsoft/JAVA/mp-java/src/main/resources/"; - String privateKeyFile = "apiclient_key.pem"; - - // 测试多个租户的路径构建 - Integer[] tenantIds = {10324, 10325, 10326}; - - for (Integer tenantId : tenantIds) { - String tenantCertPath = uploadPath + "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + privateKeyFile; - - assertTrue(tenantCertPath.contains(tenantId.toString())); - assertTrue(privateKeyPath.endsWith(privateKeyFile)); - - System.out.println("租户 " + tenantId + " 证书路径: " + privateKeyPath); - } - } -} diff --git a/src/test/java/com/gxwebsoft/shop/MultiSpecOrderTest.java b/src/test/java/com/gxwebsoft/shop/MultiSpecOrderTest.java deleted file mode 100644 index 7a47acc..0000000 --- a/src/test/java/com/gxwebsoft/shop/MultiSpecOrderTest.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.gxwebsoft.shop; - -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.dto.OrderCreateRequest; -import com.gxwebsoft.shop.entity.ShopGoods; -import com.gxwebsoft.shop.entity.ShopGoodsSku; -import com.gxwebsoft.shop.service.OrderBusinessService; -import com.gxwebsoft.shop.service.ShopGoodsService; -import com.gxwebsoft.shop.service.ShopGoodsSkuService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - -/** - * 多规格订单测试类 - * - * @author 科技小王子 - * @since 2025-07-30 - */ -@ExtendWith(MockitoExtension.class) -public class MultiSpecOrderTest { - - @Mock - private ShopGoodsService shopGoodsService; - - @Mock - private ShopGoodsSkuService shopGoodsSkuService; - - @InjectMocks - private OrderBusinessService orderBusinessService; - - private User testUser; - private ShopGoods testGoods; - private ShopGoodsSku testSku; - - @BeforeEach - void setUp() { - // 创建测试用户 - testUser = new User(); - testUser.setUserId(1); - testUser.setTenantId(1); - testUser.setOpenid("test_openid"); - testUser.setPhone("13800138000"); - - // 创建测试商品 - testGoods = new ShopGoods(); - testGoods.setGoodsId(1); - testGoods.setName("测试商品"); - testGoods.setPrice(new BigDecimal("100.00")); - testGoods.setStock(50); - testGoods.setStatus(0); // 正常状态 - testGoods.setImage("test.jpg"); - - // 创建测试SKU - testSku = new ShopGoodsSku(); - testSku.setId(1); - testSku.setGoodsId(1); - testSku.setPrice(new BigDecimal("120.00")); - testSku.setStock(20); - testSku.setStatus(0); // 正常状态 - testSku.setSku("颜色:红色|尺寸:L"); - testSku.setImage("sku_test.jpg"); - } - - @Test - void testCreateOrderWithSingleSpec() { - // 测试单规格商品下单 - when(shopGoodsService.getById(1)).thenReturn(testGoods); - - OrderCreateRequest request = createOrderRequest(false); - - // 这里需要mock其他依赖服务，实际测试中需要完整的Spring上下文 - // 此测试主要验证多规格逻辑的正确性 - - assertNotNull(request); - assertEquals(1, request.getGoodsItems().size()); - assertNull(request.getGoodsItems().get(0).getSkuId()); - } - - @Test - void testCreateOrderWithMultiSpec() { - // 测试多规格商品下单 - when(shopGoodsService.getById(1)).thenReturn(testGoods); - when(shopGoodsSkuService.getById(1)).thenReturn(testSku); - - OrderCreateRequest request = createOrderRequest(true); - - assertNotNull(request); - assertEquals(1, request.getGoodsItems().size()); - assertEquals(Integer.valueOf(1), request.getGoodsItems().get(0).getSkuId()); - assertEquals("颜色:红色|尺寸:L", request.getGoodsItems().get(0).getSpecInfo()); - } - - @Test - void testSkuValidation() { - // 测试SKU验证逻辑 - when(shopGoodsService.getById(1)).thenReturn(testGoods); - - // 测试SKU不存在的情况 - when(shopGoodsSkuService.getById(999)).thenReturn(null); - - OrderCreateRequest request = createOrderRequest(true); - request.getGoodsItems().get(0).setSkuId(999); // 不存在的SKU ID - - // 在实际测试中，这里应该抛出BusinessException - // assertThrows(BusinessException.class, () -> orderBusinessService.createOrder(request, testUser)); - } - - @Test - void testStockValidation() { - // 测试库存验证 - testSku.setStock(1); // 设置库存为1 - when(shopGoodsService.getById(1)).thenReturn(testGoods); - when(shopGoodsSkuService.getById(1)).thenReturn(testSku); - - OrderCreateRequest request = createOrderRequest(true); - request.getGoodsItems().get(0).setQuantity(5); // 购买数量超过库存 - - // 在实际测试中，这里应该抛出BusinessException - // assertThrows(BusinessException.class, () -> orderBusinessService.createOrder(request, testUser)); - } - - @Test - void testPriceCalculation() { - // 测试价格计算 - when(shopGoodsService.getById(1)).thenReturn(testGoods); - when(shopGoodsSkuService.getById(1)).thenReturn(testSku); - - // 多规格商品应该使用SKU价格（120.00），而不是商品价格（100.00） - OrderCreateRequest request = createOrderRequest(true); - request.getGoodsItems().get(0).setQuantity(2); - - // 期望总价格 = SKU价格(120.00) * 数量(2) = 240.00 - BigDecimal expectedTotal = new BigDecimal("240.00"); - request.setTotalPrice(expectedTotal); - - assertEquals(expectedTotal, request.getTotalPrice()); - } - - /** - * 创建订单请求对象 - */ - private OrderCreateRequest createOrderRequest(boolean withSku) { - OrderCreateRequest request = new OrderCreateRequest(); - request.setType(0); - request.setTotalPrice(new BigDecimal("100.00")); - request.setPayPrice(new BigDecimal("100.00")); - request.setTotalNum(1); - request.setTenantId(1); - - OrderCreateRequest.OrderGoodsItem item = new OrderCreateRequest.OrderGoodsItem(); - item.setGoodsId(1); - item.setQuantity(1); - - if (withSku) { - item.setSkuId(1); - item.setSpecInfo("颜色:红色|尺寸:L"); - } - - request.setGoodsItems(Arrays.asList(item)); - return request; - } -} diff --git a/src/test/java/com/gxwebsoft/shop/OrderBusinessServiceTest.java b/src/test/java/com/gxwebsoft/shop/OrderBusinessServiceTest.java deleted file mode 100644 index 462282c..0000000 --- a/src/test/java/com/gxwebsoft/shop/OrderBusinessServiceTest.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.gxwebsoft.shop; - -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.dto.OrderCreateRequest; -import com.gxwebsoft.shop.entity.ShopGoods; -import com.gxwebsoft.shop.entity.ShopOrder; -import com.gxwebsoft.shop.entity.ShopOrderGoods; -import com.gxwebsoft.shop.service.OrderBusinessService; -import com.gxwebsoft.shop.service.ShopGoodsService; -import com.gxwebsoft.shop.service.ShopOrderGoodsService; -import com.gxwebsoft.shop.service.ShopOrderService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; - -/** - * 订单业务服务测试类 - * - * @author 科技小王子 - * @since 2025-01-26 - */ -@ExtendWith(MockitoExtension.class) -public class OrderBusinessServiceTest { - - @Mock - private ShopOrderService shopOrderService; - - @Mock - private ShopOrderGoodsService shopOrderGoodsService; - - @Mock - private ShopGoodsService shopGoodsService; - - @InjectMocks - private OrderBusinessService orderBusinessService; - - private User testUser; - private OrderCreateRequest testRequest; - private ShopGoods testGoods; - - @BeforeEach - void setUp() { - // 准备测试用户 - testUser = new User(); - testUser.setUserId(1); - testUser.setOpenid("test_openid"); - testUser.setPhone("13800138000"); - - // 准备测试商品 - testGoods = new ShopGoods(); - testGoods.setGoodsId(10018); - testGoods.setName("科技小王子大米年卡套餐2.5kg"); - testGoods.setPrice(new BigDecimal("99.00")); - testGoods.setImage("test_image.jpg"); - - // 准备测试订单请求 - testRequest = new OrderCreateRequest(); - testRequest.setType(0); - testRequest.setTotalPrice(new BigDecimal("99.00")); - testRequest.setPayPrice(new BigDecimal("99.00")); - testRequest.setTotalNum(1); - testRequest.setPayType(1); - testRequest.setTenantId(1); - testRequest.setAddressId(10832); - testRequest.setComments("科技小王子大米年卡套餐2.5kg"); - testRequest.setDeliveryType(0); - - // 准备商品项列表 - OrderCreateRequest.OrderGoodsItem goodsItem = new OrderCreateRequest.OrderGoodsItem(); - goodsItem.setGoodsId(10018); - goodsItem.setQuantity(1); - goodsItem.setPayType(1); - - testRequest.setGoodsItems(Arrays.asList(goodsItem)); - } - - @Test - void testCreateOrderWithGoods() { - // Mock 商品查询 - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - - // Mock 订单保存 - when(shopOrderService.save(any(ShopOrder.class))).thenAnswer(invocation -> { - ShopOrder order = invocation.getArgument(0); - order.setOrderId(1); // 模拟数据库生成的ID - return true; - }); - - // Mock 订单商品批量保存 - when(shopOrderGoodsService.saveBatch(anyList())).thenReturn(true); - - // Mock 微信支付订单创建 - HashMap wxOrderInfo = new HashMap<>(); - wxOrderInfo.put("prepay_id", "test_prepay_id"); - when(shopOrderService.createWxOrder(any(ShopOrder.class))).thenReturn(wxOrderInfo); - - // 执行测试 - Map result = orderBusinessService.createOrder(testRequest, testUser); - - // 验证结果 - assert result != null; - assert result.containsKey("prepay_id"); - - // 验证方法调用 - verify(shopGoodsService, times(1)).getById(10018); - verify(shopOrderService, times(1)).save(any(ShopOrder.class)); - verify(shopOrderGoodsService, times(1)).saveBatch(anyList()); - verify(shopOrderService, times(1)).createWxOrder(any(ShopOrder.class)); - } - - @Test - void testCreateOrderWithMultipleGoods() { - // 准备多个商品项 - OrderCreateRequest.OrderGoodsItem goodsItem1 = new OrderCreateRequest.OrderGoodsItem(); - goodsItem1.setGoodsId(10018); - goodsItem1.setQuantity(1); - goodsItem1.setPayType(1); - - OrderCreateRequest.OrderGoodsItem goodsItem2 = new OrderCreateRequest.OrderGoodsItem(); - goodsItem2.setGoodsId(10019); - goodsItem2.setQuantity(2); - goodsItem2.setPayType(1); - - testRequest.setGoodsItems(Arrays.asList(goodsItem1, goodsItem2)); - testRequest.setTotalPrice(new BigDecimal("297.00")); // 99 + 99*2 - - // Mock 商品查询 - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - - ShopGoods testGoods2 = new ShopGoods(); - testGoods2.setGoodsId(10019); - testGoods2.setName("测试商品2"); - testGoods2.setPrice(new BigDecimal("99.00")); - testGoods2.setImage("test_image2.jpg"); - when(shopGoodsService.getById(10019)).thenReturn(testGoods2); - - // Mock 其他服务 - when(shopOrderService.save(any(ShopOrder.class))).thenAnswer(invocation -> { - ShopOrder order = invocation.getArgument(0); - order.setOrderId(1); - return true; - }); - when(shopOrderGoodsService.saveBatch(anyList())).thenReturn(true); - when(shopOrderService.createWxOrder(any(ShopOrder.class))).thenReturn(new HashMap<>()); - - // 执行测试 - orderBusinessService.createOrder(testRequest, testUser); - - // 验证商品查询次数 - verify(shopGoodsService, times(1)).getById(10018); - verify(shopGoodsService, times(1)).getById(10019); - - // 验证保存的商品项数量 - verify(shopOrderGoodsService, times(1)).saveBatch(argThat(list -> - ((List) list).size() == 2 - )); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/OrderTotalTest.java b/src/test/java/com/gxwebsoft/shop/OrderTotalTest.java deleted file mode 100644 index ca4d231..0000000 --- a/src/test/java/com/gxwebsoft/shop/OrderTotalTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.shop; - -import com.gxwebsoft.shop.service.ShopOrderService; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import javax.annotation.Resource; -import java.math.BigDecimal; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * 订单总金额统计测试 - * - * @author 科技小王子 - * @since 2025-07-30 - */ -@SpringBootTest -@ActiveProfiles("test") -public class OrderTotalTest { - - @Resource - private ShopOrderService shopOrderService; - - @Test - void testOrderTotal() { - // 测试订单总金额统计 - BigDecimal total = shopOrderService.total(); - - // 验证返回值不为null - assertNotNull(total, "订单总金额不应该为null"); - - // 验证返回值大于等于0 - assertTrue(total.compareTo(BigDecimal.ZERO) >= 0, "订单总金额应该大于等于0"); - - System.out.println("订单总金额统计结果：" + total); - } - - @Test - void testOrderTotalPerformance() { - // 测试性能 - long startTime = System.currentTimeMillis(); - - BigDecimal total = shopOrderService.total(); - - long endTime = System.currentTimeMillis(); - long duration = endTime - startTime; - - System.out.println("订单总金额统计耗时：" + duration + "ms"); - System.out.println("统计结果：" + total); - - // 验证查询时间在合理范围内（小于5秒） - assertTrue(duration < 5000, "查询时间应该在5秒以内"); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/OrderValidationTest.java b/src/test/java/com/gxwebsoft/shop/OrderValidationTest.java deleted file mode 100644 index a49c444..0000000 --- a/src/test/java/com/gxwebsoft/shop/OrderValidationTest.java +++ /dev/null @@ -1,315 +0,0 @@ -package com.gxwebsoft.shop; - -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.config.OrderConfigProperties; -import com.gxwebsoft.shop.dto.OrderCreateRequest; -import com.gxwebsoft.shop.entity.ShopGoods; -import com.gxwebsoft.shop.entity.ShopOrder; -import com.gxwebsoft.shop.service.OrderBusinessService; -import com.gxwebsoft.shop.service.ShopGoodsService; -import com.gxwebsoft.shop.service.ShopOrderGoodsService; -import com.gxwebsoft.shop.service.ShopOrderService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.math.BigDecimal; -import java.util.Arrays; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * 订单验证测试类 - * 测试商品信息后台验证逻辑 - */ -@ExtendWith(MockitoExtension.class) -class OrderValidationTest { - - @Mock - private ShopOrderService shopOrderService; - - @Mock - private ShopOrderGoodsService shopOrderGoodsService; - - @Mock - private ShopGoodsService shopGoodsService; - - @Mock - private OrderConfigProperties orderConfig; - - @InjectMocks - private OrderBusinessService orderBusinessService; - - private User testUser; - private OrderCreateRequest testRequest; - private ShopGoods testGoods; - - @BeforeEach - void setUp() { - // 准备测试用户 - testUser = new User(); - testUser.setUserId(1); - testUser.setNickname("测试用户"); - testUser.setPhone("13800138000"); - - // 准备测试商品 - testGoods = new ShopGoods(); - testGoods.setGoodsId(10018); - testGoods.setName("测试商品"); - testGoods.setPrice(new BigDecimal("99.00")); - testGoods.setStatus(0); // 上架状态 - testGoods.setStock(100); // 库存100 - testGoods.setCanBuyNumber(10); // 最大购买数量10 - testGoods.setCode("TEST001"); - - // 准备测试订单请求 - testRequest = new OrderCreateRequest(); - testRequest.setType(0); - testRequest.setTitle("测试订单"); - testRequest.setTotalPrice(new BigDecimal("99.00")); - testRequest.setTenantId(1); - - // 准备商品项 - OrderCreateRequest.OrderGoodsItem goodsItem = new OrderCreateRequest.OrderGoodsItem(); - goodsItem.setGoodsId(10018); - goodsItem.setQuantity(1); - testRequest.setGoodsItems(Arrays.asList(goodsItem)); - } - - @Test - void testValidateOrderRequest_Success() { - // Mock 商品查询 - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - when(orderConfig.getTenantRule(1)).thenReturn(null); - - // 执行验证 - 应该成功 - assertDoesNotThrow(() -> { - // 使用反射调用私有方法进行测试 - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 验证总金额被正确设置 - assertEquals(new BigDecimal("99.00"), testRequest.getTotalPrice()); - } - - @Test - void testValidateOrderRequest_GoodsNotFound() { - // Mock 商品不存在 - when(shopGoodsService.getById(10018)).thenReturn(null); - - // 执行验证 - 应该抛出异常 - Exception exception = assertThrows(Exception.class, () -> { - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 检查是否是 InvocationTargetException 包装的 BusinessException - assertTrue(exception instanceof java.lang.reflect.InvocationTargetException); - Throwable cause = exception.getCause(); - assertTrue(cause instanceof BusinessException); - assertTrue(cause.getMessage().contains("商品不存在")); - } - - @Test - void testValidateOrderRequest_GoodsOffShelf() { - // 设置商品为下架状态 - testGoods.setStatus(1); - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - - // 执行验证 - 应该抛出异常 - Exception exception = assertThrows(Exception.class, () -> { - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 检查是否是 InvocationTargetException 包装的 BusinessException - assertTrue(exception instanceof java.lang.reflect.InvocationTargetException); - Throwable cause = exception.getCause(); - assertTrue(cause instanceof BusinessException); - assertTrue(cause.getMessage().contains("商品已下架")); - } - - @Test - void testValidateOrderRequest_InsufficientStock() { - // 设置库存不足 - testGoods.setStock(0); - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - - // 执行验证 - 应该抛出异常 - Exception exception = assertThrows(Exception.class, () -> { - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 检查是否是 InvocationTargetException 包装的 BusinessException - assertTrue(exception instanceof java.lang.reflect.InvocationTargetException); - Throwable cause = exception.getCause(); - assertTrue(cause instanceof BusinessException); - assertTrue(cause.getMessage().contains("商品库存不足")); - } - - @Test - void testValidateOrderRequest_ExceedBuyLimit() { - // 设置购买数量超过限制 - testRequest.getGoodsItems().get(0).setQuantity(15); // 超过最大购买数量10 - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - - // 执行验证 - 应该抛出异常 - Exception exception = assertThrows(Exception.class, () -> { - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 检查是否是 InvocationTargetException 包装的 BusinessException - assertTrue(exception instanceof java.lang.reflect.InvocationTargetException); - Throwable cause = exception.getCause(); - assertTrue(cause instanceof BusinessException); - assertTrue(cause.getMessage().contains("购买数量超过限制")); - } - - @Test - void testValidateOrderRequest_PriceCalculation() { - // 设置多个商品项 - OrderCreateRequest.OrderGoodsItem goodsItem1 = new OrderCreateRequest.OrderGoodsItem(); - goodsItem1.setGoodsId(10018); - goodsItem1.setQuantity(2); - - OrderCreateRequest.OrderGoodsItem goodsItem2 = new OrderCreateRequest.OrderGoodsItem(); - goodsItem2.setGoodsId(10019); - goodsItem2.setQuantity(1); - - testRequest.setGoodsItems(Arrays.asList(goodsItem1, goodsItem2)); - testRequest.setTotalPrice(new BigDecimal("297.00")); // 99*2 + 99*1 - - // 准备第二个商品 - ShopGoods testGoods2 = new ShopGoods(); - testGoods2.setGoodsId(10019); - testGoods2.setName("测试商品2"); - testGoods2.setPrice(new BigDecimal("99.00")); - testGoods2.setStatus(0); - testGoods2.setStock(100); - - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - when(shopGoodsService.getById(10019)).thenReturn(testGoods2); - when(orderConfig.getTenantRule(1)).thenReturn(null); - - // 执行验证 - 应该成功 - assertDoesNotThrow(() -> { - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 验证总金额计算正确 - assertEquals(new BigDecimal("297.00"), testRequest.getTotalPrice()); - } - - @Test - void testValidateOrderRequest_PriceDiscrepancy() { - // 设置前端传入的金额与后台计算不一致 - testRequest.setTotalPrice(new BigDecimal("88.00")); // 错误的金额 - when(shopGoodsService.getById(10018)).thenReturn(testGoods); - - // 执行验证 - 应该抛出异常 - Exception exception = assertThrows(Exception.class, () -> { - java.lang.reflect.Method method = OrderBusinessService.class - .getDeclaredMethod("validateOrderRequest", OrderCreateRequest.class, User.class); - method.setAccessible(true); - method.invoke(orderBusinessService, testRequest, testUser); - }); - - // 检查是否是 InvocationTargetException 包装的 BusinessException - assertTrue(exception instanceof java.lang.reflect.InvocationTargetException); - Throwable cause = exception.getCause(); - assertTrue(cause instanceof BusinessException); - assertTrue(cause.getMessage().contains("订单金额计算错误")); - } - - @Test - void testBuildShopOrder_RequiredFields() throws Exception { - // Mock 配置 - OrderConfigProperties.DefaultConfig defaultConfig = new OrderConfigProperties.DefaultConfig(); - defaultConfig.setDefaultComments("默认备注"); - when(orderConfig.getDefaultConfig()).thenReturn(defaultConfig); - - // 使用反射调用 buildShopOrder 方法 - java.lang.reflect.Method buildMethod = OrderBusinessService.class - .getDeclaredMethod("buildShopOrder", OrderCreateRequest.class, User.class); - buildMethod.setAccessible(true); - - ShopOrder result = (ShopOrder) buildMethod.invoke(orderBusinessService, testRequest, testUser); - - // 验证必需字段都已设置 - assertNotNull(result.getPayPrice(), "payPrice 不能为空"); - assertNotNull(result.getPrice(), "price 不能为空"); - assertNotNull(result.getReducePrice(), "reducePrice 不能为空"); - assertNotNull(result.getMoney(), "money 不能为空"); - assertNotNull(result.getPayStatus(), "payStatus 不能为空"); - assertNotNull(result.getOrderStatus(), "orderStatus 不能为空"); - assertNotNull(result.getDeliveryStatus(), "deliveryStatus 不能为空"); - assertNotNull(result.getPayType(), "payType 不能为空"); - - // 验证默认值 - assertEquals(testRequest.getTotalPrice(), result.getPayPrice()); - assertEquals(testRequest.getTotalPrice(), result.getPrice()); - assertEquals(BigDecimal.ZERO, result.getReducePrice()); - assertEquals(testRequest.getTotalPrice(), result.getMoney()); - assertEquals(false, result.getPayStatus()); - assertEquals(Integer.valueOf(0), result.getOrderStatus()); - assertEquals(Integer.valueOf(10), result.getDeliveryStatus()); - assertEquals(Integer.valueOf(1), result.getPayType()); - - // 验证关键字段 - 租户ID（影响微信支付证书路径） - assertNotNull(result.getTenantId(), "tenantId 不能为空"); - assertEquals(testRequest.getTenantId(), result.getTenantId(), "tenantId 必须正确设置"); - } - - @Test - void testBuildShopOrder_TenantIdValidation() throws Exception { - // 创建一个新的请求对象，租户ID为空 - OrderCreateRequest requestWithoutTenant = new OrderCreateRequest(); - requestWithoutTenant.setType(0); - requestWithoutTenant.setTitle("测试订单"); - requestWithoutTenant.setTotalPrice(new BigDecimal("99.00")); - requestWithoutTenant.setTenantId(null); // 设置为空 - - // 准备商品项 - OrderCreateRequest.OrderGoodsItem goodsItem = new OrderCreateRequest.OrderGoodsItem(); - goodsItem.setGoodsId(10018); - goodsItem.setQuantity(1); - requestWithoutTenant.setGoodsItems(Arrays.asList(goodsItem)); - - // 使用反射调用 buildShopOrder 方法 - java.lang.reflect.Method buildMethod = OrderBusinessService.class - .getDeclaredMethod("buildShopOrder", OrderCreateRequest.class, User.class); - buildMethod.setAccessible(true); - - // 执行验证 - 应该抛出异常 - Exception exception = assertThrows(Exception.class, () -> { - buildMethod.invoke(orderBusinessService, requestWithoutTenant, testUser); - }); - - // 检查是否是 InvocationTargetException 包装的 BusinessException - assertTrue(exception instanceof java.lang.reflect.InvocationTargetException); - Throwable cause = exception.getCause(); - assertTrue(cause instanceof BusinessException); - assertTrue(cause.getMessage().contains("租户ID不能为空")); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/WechatPayDescriptionTest.java b/src/test/java/com/gxwebsoft/shop/WechatPayDescriptionTest.java deleted file mode 100644 index f5304e9..0000000 --- a/src/test/java/com/gxwebsoft/shop/WechatPayDescriptionTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.shop; - -import com.gxwebsoft.common.core.utils.WechatPayUtils; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -import java.nio.charset.StandardCharsets; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * 微信支付商品描述字段测试 - * 验证字节长度限制处理 - */ -@SpringBootTest -public class WechatPayDescriptionTest { - - @Test - public void testTruncateToByteLimit() { - // 测试正常情况 - 字符串长度在限制内 - String shortText = "正常商品描述"; - String result1 = WechatPayUtils.truncateToByteLimit(shortText, 127); - assertEquals(shortText, result1); - assertTrue(result1.getBytes(StandardCharsets.UTF_8).length <= 127); - - // 测试超长中文字符串 - String longText = "【湾区认证】【百千万工程帮扶产品 通过远方320项检测 湾区认证 丰江桥佛手瓜面】独特风味低脂轻食便捷速食非油炸 720g/袋"; - String result2 = WechatPayUtils.truncateToByteLimit(longText, 127); - assertNotNull(result2); - assertTrue(result2.getBytes(StandardCharsets.UTF_8).length <= 127); - System.out.println("原始文本字节数: " + longText.getBytes(StandardCharsets.UTF_8).length); - System.out.println("截断后文本: " + result2); - System.out.println("截断后字节数: " + result2.getBytes(StandardCharsets.UTF_8).length); - - // 测试null和空字符串 - assertNull(WechatPayUtils.truncateToByteLimit(null, 127)); - assertEquals("", WechatPayUtils.truncateToByteLimit("", 127)); - - // 测试英文字符串 - String englishText = "This is a very long English description that might exceed the byte limit for WeChat Pay description field"; - String result3 = WechatPayUtils.truncateToByteLimit(englishText, 127); - assertNotNull(result3); - assertTrue(result3.getBytes(StandardCharsets.UTF_8).length <= 127); - - // 测试混合字符串 - String mixedText = "Product Name 产品名称 with special characters @#$%^&*()"; - String result4 = WechatPayUtils.truncateToByteLimit(mixedText, 50); - assertNotNull(result4); - assertTrue(result4.getBytes(StandardCharsets.UTF_8).length <= 50); - } - - @Test - public void testSpecificErrorCase() { - // 测试错误信息中的具体案例 - String errorText = "【湾区认证】【百千万工程帮扶产品 通过远方320项检测 湾区认证 丰江桥佛手瓜面】独特风味低脂轻食便捷速食非油炸 720g/袋"; - - // 验证原始文本确实超过127字节 - int originalBytes = errorText.getBytes(StandardCharsets.UTF_8).length; - System.out.println("原始文本: " + errorText); - System.out.println("原始字节数: " + originalBytes); - assertTrue(originalBytes > 127, "原始文本应该超过127字节"); - - // 测试截断 - String truncated = WechatPayUtils.processDescription(errorText); - int truncatedBytes = truncated.getBytes(StandardCharsets.UTF_8).length; - - System.out.println("截断后文本: " + truncated); - System.out.println("截断后字节数: " + truncatedBytes); - - // 验证截断后的文本符合要求 - assertNotNull(truncated); - assertTrue(truncatedBytes <= 127, "截断后字节数应该不超过127"); - assertFalse(truncated.contains("\uFFFD"), "截断后的文本不应包含无效字符"); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/service/CouponStatusServiceTest.java b/src/test/java/com/gxwebsoft/shop/service/CouponStatusServiceTest.java deleted file mode 100644 index 3d68842..0000000 --- a/src/test/java/com/gxwebsoft/shop/service/CouponStatusServiceTest.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.gxwebsoft.shop.entity.ShopUserCoupon; -import com.gxwebsoft.shop.service.CouponStatusService.CouponStatusResult; -import com.gxwebsoft.shop.service.CouponStatusService.CouponValidationResult; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * 优惠券状态管理服务测试 - * - * @author WebSoft - * @since 2025-01-15 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class CouponStatusServiceTest { - - @Autowired - private CouponStatusService couponStatusService; - - @Test - public void testCouponStatusConstants() { - // 测试状态常量 - assertEquals(0, ShopUserCoupon.STATUS_UNUSED); - assertEquals(1, ShopUserCoupon.STATUS_USED); - assertEquals(2, ShopUserCoupon.STATUS_EXPIRED); - - // 测试类型常量 - assertEquals(10, ShopUserCoupon.TYPE_REDUCE); - assertEquals(20, ShopUserCoupon.TYPE_DISCOUNT); - assertEquals(30, ShopUserCoupon.TYPE_FREE); - - // 测试适用范围常量 - assertEquals(10, ShopUserCoupon.APPLY_ALL); - assertEquals(20, ShopUserCoupon.APPLY_GOODS); - assertEquals(30, ShopUserCoupon.APPLY_CATEGORY); - } - - @Test - public void testCouponStatusMethods() { - // 创建测试优惠券 - ShopUserCoupon coupon = new ShopUserCoupon(); - coupon.setStatus(ShopUserCoupon.STATUS_UNUSED); - coupon.setEndTime(LocalDateTime.now().plusDays(7)); - - // 测试可用状态 - assertTrue(coupon.isAvailable()); - assertFalse(coupon.isUsed()); - assertFalse(coupon.isExpired()); - assertEquals("可使用", coupon.getStatusDesc()); - - // 测试已使用状态 - coupon.markAsUsed(123, "ORDER123"); - assertTrue(coupon.isUsed()); - assertFalse(coupon.isAvailable()); - assertEquals("已使用", coupon.getStatusDesc()); - assertEquals(Integer.valueOf(123), coupon.getOrderId()); - assertEquals("ORDER123", coupon.getOrderNo()); - - // 测试过期状态 - coupon.setStatus(ShopUserCoupon.STATUS_UNUSED); - coupon.setEndTime(LocalDateTime.now().minusDays(1)); - assertTrue(coupon.isExpired()); - assertFalse(coupon.isAvailable()); - assertEquals("已过期", coupon.getStatusDesc()); - } - - @Test - public void testValidateCouponForOrder() { - // 这个测试需要数据库中有实际的优惠券数据 - // 这里只是演示测试结构 - - List goodsIds = Arrays.asList(1, 2, 3); - BigDecimal totalAmount = new BigDecimal("150.00"); - - // 注意：这个测试需要实际的优惠券ID，在真实环境中需要先创建测试数据 - // CouponValidationResult result = couponStatusService.validateCouponForOrder(1L, totalAmount, goodsIds); - // assertNotNull(result); - - System.out.println("优惠券验证测试需要实际的数据库数据"); - } - - @Test - public void testGetUserCouponsGroupByStatus() { - // 这个测试需要数据库中有实际的用户和优惠券数据 - // 这里只是演示测试结构 - - // 注意：这个测试需要实际的用户ID，在真实环境中需要先创建测试数据 - // CouponStatusResult result = couponStatusService.getUserCouponsGroupByStatus(1); - // assertNotNull(result); - // assertTrue(result.getTotalCount() >= 0); - - System.out.println("用户优惠券分组测试需要实际的数据库数据"); - } - - @Test - public void testUpdateExpiredCoupons() { - // 测试批量更新过期优惠券 - int updatedCount = couponStatusService.updateExpiredCoupons(); - assertTrue(updatedCount >= 0); - System.out.println("更新了 " + updatedCount + " 张过期优惠券"); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/service/ShopGoodsSalesTest.java b/src/test/java/com/gxwebsoft/shop/service/ShopGoodsSalesTest.java deleted file mode 100644 index a2aa22f..0000000 --- a/src/test/java/com/gxwebsoft/shop/service/ShopGoodsSalesTest.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.gxwebsoft.shop.entity.ShopGoods; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import javax.annotation.Resource; - -/** - * 商品销量累加功能测试 - * - * @author WebSoft - * @since 2025-08-23 - */ -@Slf4j -@SpringBootTest -@ActiveProfiles("dev") -public class ShopGoodsSalesTest { - - @Resource - private ShopGoodsService shopGoodsService; - - /** - * 测试累加商品销量功能 - */ - @Test - public void testAddSaleCount() { - // 测试商品ID（请根据实际数据库中的商品ID进行调整） - Integer testGoodsId = 1; - Integer addCount = 5; - - log.info("=== 开始测试商品销量累加功能 ==="); - - // 1. 查询商品当前销量 - ShopGoods goodsBefore = shopGoodsService.getById(testGoodsId); - if (goodsBefore == null) { - log.error("测试失败：商品不存在 - 商品ID: {}", testGoodsId); - return; - } - - Integer salesBefore = goodsBefore.getSales() != null ? goodsBefore.getSales() : 0; - log.info("累加前商品销量 - 商品ID: {}, 商品名称: {}, 当前销量: {}", - testGoodsId, goodsBefore.getName(), salesBefore); - - // 2. 执行销量累加 - boolean result = shopGoodsService.addSaleCount(testGoodsId, addCount); - log.info("销量累加操作结果: {}", result ? "成功" : "失败"); - - // 3. 查询累加后的销量 - ShopGoods goodsAfter = shopGoodsService.getById(testGoodsId); - Integer salesAfter = goodsAfter.getSales() != null ? goodsAfter.getSales() : 0; - log.info("累加后商品销量 - 商品ID: {}, 商品名称: {}, 累加后销量: {}", - testGoodsId, goodsAfter.getName(), salesAfter); - - // 4. 验证结果 - Integer expectedSales = salesBefore + addCount; - if (salesAfter.equals(expectedSales)) { - log.info("✅ 测试成功！销量正确累加 - 预期: {}, 实际: {}", expectedSales, salesAfter); - } else { - log.error("❌ 测试失败！销量累加不正确 - 预期: {}, 实际: {}", expectedSales, salesAfter); - } - - log.info("=== 商品销量累加功能测试完成 ==="); - } - - /** - * 测试参数验证 - */ - @Test - public void testAddSaleCountValidation() { - log.info("=== 开始测试参数验证 ==="); - - // 测试null商品ID - boolean result1 = shopGoodsService.addSaleCount(null, 5); - log.info("null商品ID测试结果: {}", result1 ? "失败(应该返回false)" : "成功"); - - // 测试null销量 - boolean result2 = shopGoodsService.addSaleCount(1, null); - log.info("null销量测试结果: {}", result2 ? "失败(应该返回false)" : "成功"); - - // 测试负数销量 - boolean result3 = shopGoodsService.addSaleCount(1, -1); - log.info("负数销量测试结果: {}", result3 ? "失败(应该返回false)" : "成功"); - - // 测试零销量 - boolean result4 = shopGoodsService.addSaleCount(1, 0); - log.info("零销量测试结果: {}", result4 ? "失败(应该返回false)" : "成功"); - - // 测试不存在的商品ID - boolean result5 = shopGoodsService.addSaleCount(999999, 5); - log.info("不存在商品ID测试结果: {}", result5 ? "失败(应该返回false)" : "成功"); - - log.info("=== 参数验证测试完成 ==="); - } - - /** - * 测试大批量累加 - */ - @Test - public void testBatchAddSaleCount() { - Integer testGoodsId = 1; - - log.info("=== 开始测试批量累加 ==="); - - // 查询初始销量 - ShopGoods goodsBefore = shopGoodsService.getById(testGoodsId); - if (goodsBefore == null) { - log.error("测试失败：商品不存在 - 商品ID: {}", testGoodsId); - return; - } - - Integer salesBefore = goodsBefore.getSales() != null ? goodsBefore.getSales() : 0; - log.info("批量累加前销量: {}", salesBefore); - - // 模拟多次购买 - int totalAdded = 0; - for (int i = 1; i <= 10; i++) { - boolean result = shopGoodsService.addSaleCount(testGoodsId, i); - if (result) { - totalAdded += i; - log.info("第{}次累加成功，累加数量: {}", i, i); - } else { - log.error("第{}次累加失败", i); - } - } - - // 验证最终结果 - ShopGoods goodsAfter = shopGoodsService.getById(testGoodsId); - Integer salesAfter = goodsAfter.getSales() != null ? goodsAfter.getSales() : 0; - Integer expectedSales = salesBefore + totalAdded; - - log.info("批量累加结果 - 累加前: {}, 总累加量: {}, 累加后: {}, 预期: {}", - salesBefore, totalAdded, salesAfter, expectedSales); - - if (salesAfter.equals(expectedSales)) { - log.info("✅ 批量累加测试成功！"); - } else { - log.error("❌ 批量累加测试失败！"); - } - - log.info("=== 批量累加测试完成 ==="); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/service/ShopOrderGoodsIgnoreTenantTest.java b/src/test/java/com/gxwebsoft/shop/service/ShopOrderGoodsIgnoreTenantTest.java deleted file mode 100644 index 41c7299..0000000 --- a/src/test/java/com/gxwebsoft/shop/service/ShopOrderGoodsIgnoreTenantTest.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.gxwebsoft.shop.entity.ShopOrderGoods; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 订单商品忽略租户隔离功能测试 - * - * @author WebSoft - * @since 2025-08-23 - */ -@Slf4j -@SpringBootTest -@ActiveProfiles("dev") -public class ShopOrderGoodsIgnoreTenantTest { - - @Resource - private ShopOrderGoodsService shopOrderGoodsService; - - /** - * 测试忽略租户隔离查询订单商品 - */ - @Test - public void testGetListByOrderIdIgnoreTenant() { - // 测试订单ID（请根据实际数据库中的订单ID进行调整） - Integer testOrderId = 1; - - log.info("=== 开始测试忽略租户隔离查询订单商品功能 ==="); - - // 1. 使用普通方法查询订单商品（受租户隔离影响） - List orderGoodsNormal = shopOrderGoodsService.getListByOrderId(testOrderId); - log.info("普通查询结果 - 订单ID: {}, 商品数量: {}", testOrderId, - orderGoodsNormal != null ? orderGoodsNormal.size() : 0); - - // 2. 使用忽略租户隔离方法查询订单商品 - List orderGoodsIgnoreTenant = shopOrderGoodsService.getListByOrderIdIgnoreTenant(testOrderId); - log.info("忽略租户隔离查询结果 - 订单ID: {}, 商品数量: {}", testOrderId, - orderGoodsIgnoreTenant != null ? orderGoodsIgnoreTenant.size() : 0); - - // 3. 验证结果 - if (orderGoodsIgnoreTenant != null && !orderGoodsIgnoreTenant.isEmpty()) { - log.info("✅ 忽略租户隔离查询成功！"); - for (ShopOrderGoods orderGoods : orderGoodsIgnoreTenant) { - log.info("订单商品详情 - ID: {}, 商品ID: {}, 商品名称: {}, 数量: {}, 租户ID: {}", - orderGoods.getId(), - orderGoods.getGoodsId(), - orderGoods.getGoodsName(), - orderGoods.getTotalNum(), - orderGoods.getTenantId()); - } - } else { - log.warn("⚠️ 忽略租户隔离查询结果为空，可能订单不存在或没有商品"); - } - - log.info("=== 忽略租户隔离查询订单商品功能测试完成 ==="); - } - - /** - * 测试参数验证 - */ - @Test - public void testGetListByOrderIdIgnoreTenantValidation() { - log.info("=== 开始测试参数验证 ==="); - - // 测试null订单ID - List result1 = shopOrderGoodsService.getListByOrderIdIgnoreTenant(null); - log.info("null订单ID测试结果: {}", result1.isEmpty() ? "成功(返回空列表)" : "失败"); - - // 测试不存在的订单ID - List result2 = shopOrderGoodsService.getListByOrderIdIgnoreTenant(999999); - log.info("不存在订单ID测试结果: {}", result2.isEmpty() ? "成功(返回空列表)" : "失败"); - - log.info("=== 参数验证测试完成 ==="); - } - - /** - * 测试跨租户查询 - */ - @Test - public void testCrossTenantQuery() { - log.info("=== 开始测试跨租户查询 ==="); - - // 查询不同租户的订单商品（请根据实际数据调整） - Integer[] testOrderIds = {1, 2, 3, 4, 5}; - - for (Integer orderId : testOrderIds) { - List orderGoodsList = shopOrderGoodsService.getListByOrderIdIgnoreTenant(orderId); - if (orderGoodsList != null && !orderGoodsList.isEmpty()) { - log.info("订单ID: {}, 商品数量: {}", orderId, orderGoodsList.size()); - for (ShopOrderGoods orderGoods : orderGoodsList) { - log.info(" - 商品: {} (ID: {}), 数量: {}, 租户: {}", - orderGoods.getGoodsName(), - orderGoods.getGoodsId(), - orderGoods.getTotalNum(), - orderGoods.getTenantId()); - } - } else { - log.info("订单ID: {} - 无商品或不存在", orderId); - } - } - - log.info("=== 跨租户查询测试完成 ==="); - } - - /** - * 测试批量查询性能 - */ - @Test - public void testBatchQuery() { - log.info("=== 开始测试批量查询性能 ==="); - - Integer[] testOrderIds = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - - long startTime = System.currentTimeMillis(); - - int totalGoods = 0; - for (Integer orderId : testOrderIds) { - List orderGoodsList = shopOrderGoodsService.getListByOrderIdIgnoreTenant(orderId); - totalGoods += orderGoodsList.size(); - } - - long endTime = System.currentTimeMillis(); - long duration = endTime - startTime; - - log.info("批量查询结果 - 查询订单数: {}, 总商品数: {}, 耗时: {}ms", - testOrderIds.length, totalGoods, duration); - - log.info("=== 批量查询性能测试完成 ==="); - } -} diff --git a/src/test/java/com/gxwebsoft/shop/service/ShopOrderUpdate10550ServiceTest.java b/src/test/java/com/gxwebsoft/shop/service/ShopOrderUpdate10550ServiceTest.java deleted file mode 100644 index fdeb627..0000000 --- a/src/test/java/com/gxwebsoft/shop/service/ShopOrderUpdate10550ServiceTest.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserService; -import com.gxwebsoft.shop.entity.ShopOrder; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import javax.annotation.Resource; -import java.math.BigDecimal; - -/** - * 订单更新业务测试 - * - * @author WebSoft - * @since 2025-08-23 - */ -@Slf4j -@SpringBootTest -@ActiveProfiles("dev") -public class ShopOrderUpdate10550ServiceTest { - - @Resource - private ShopOrderUpdate10550Service shopOrderUpdate10550Service; - - @Resource - private UserService userService; - - /** - * 测试用户等级升级功能 - */ - @Test - public void testUserGradeUpgrade() { - log.info("=== 开始测试用户等级升级功能 ==="); - - // 创建测试订单 - ShopOrder testOrder = createTestOrder(); - - // 查询用户升级前的信息 - User userBefore = userService.getByIdIgnoreTenant(testOrder.getUserId()); - if (userBefore != null) { - log.info("升级前用户信息 - ID: {}, 等级: {}, 消费金额: {}", - userBefore.getUserId(), userBefore.getGradeId(), userBefore.getExpendMoney()); - } - - // 执行订单更新业务 - shopOrderUpdate10550Service.update(testOrder); - - // 查询用户升级后的信息 - User userAfter = userService.getByIdIgnoreTenant(testOrder.getUserId()); - if (userAfter != null) { - log.info("升级后用户信息 - ID: {}, 等级: {}, 消费金额: {}", - userAfter.getUserId(), userAfter.getGradeId(), userAfter.getExpendMoney()); - } - - log.info("=== 用户等级升级功能测试完成 ==="); - } - - /** - * 测试合伙人条件配置获取 - */ - @Test - public void testPartnerConditionConfig() { - log.info("=== 开始测试合伙人条件配置获取 ==="); - - // 创建测试订单 - ShopOrder testOrder = createTestOrder(); - - // 执行订单更新业务（会在日志中显示合伙人条件） - shopOrderUpdate10550Service.update(testOrder); - - log.info("=== 合伙人条件配置获取测试完成 ==="); - } - - /** - * 测试异常处理 - */ - @Test - public void testExceptionHandling() { - log.info("=== 开始测试异常处理 ==="); - - // 测试null订单 - try { - shopOrderUpdate10550Service.update(null); - log.info("null订单处理：正常（应该有异常日志）"); - } catch (Exception e) { - log.info("null订单处理：捕获异常 - {}", e.getMessage()); - } - - // 测试无效用户ID的订单 - ShopOrder invalidOrder = new ShopOrder(); - invalidOrder.setOrderId(999999); - invalidOrder.setUserId(999999); - invalidOrder.setTenantId(10550); - invalidOrder.setPayPrice(new BigDecimal("100.00")); - - try { - shopOrderUpdate10550Service.update(invalidOrder); - log.info("无效用户订单处理：正常（应该有警告日志）"); - } catch (Exception e) { - log.info("无效用户订单处理：捕获异常 - {}", e.getMessage()); - } - - log.info("=== 异常处理测试完成 ==="); - } - - /** - * 测试批量订单处理 - */ - @Test - public void testBatchOrderProcessing() { - log.info("=== 开始测试批量订单处理 ==="); - - // 模拟多个订单 - for (int i = 1; i <= 5; i++) { - ShopOrder order = createTestOrder(); - order.setOrderId(1000 + i); - order.setPayPrice(new BigDecimal("50.00").multiply(BigDecimal.valueOf(i))); - - log.info("处理第{}个订单 - 订单ID: {}, 金额: {}", i, order.getOrderId(), order.getPayPrice()); - shopOrderUpdate10550Service.update(order); - } - - log.info("=== 批量订单处理测试完成 ==="); - } - - /** - * 创建测试订单 - */ - private ShopOrder createTestOrder() { - ShopOrder order = new ShopOrder(); - order.setOrderId(1001); - order.setUserId(1); // 请根据实际数据库中的用户ID调整 - order.setTenantId(10550); - order.setPayPrice(new BigDecimal("500.00")); // 测试金额 - order.setTotalPrice(new BigDecimal("500.00")); - return order; - } -} diff --git a/src/test/java/com/gxwebsoft/shop/util/UpstreamUserFinderTest.java b/src/test/java/com/gxwebsoft/shop/util/UpstreamUserFinderTest.java deleted file mode 100644 index 5147a43..0000000 --- a/src/test/java/com/gxwebsoft/shop/util/UpstreamUserFinderTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.gxwebsoft.shop.util; - -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -class UpstreamUserFinderTest { - - @Test - void findFirstNMatchingUpstreamUsers_skipsNonMatchingAndKeepsOrder() { - // 100 -> 101 -> 102 -> 103 -> null - Map parent = Map.of( - 100, 101, - 101, 102, - 102, 103 - ); - Set shopRoleUsers = Set.of(102, 103); - - Function parentResolver = parent::get; - Predicate matcher = shopRoleUsers::contains; - - List got = UpstreamUserFinder.findFirstNMatchingUpstreamUsers(100, 2, 20, parentResolver, matcher); - assertEquals(List.of(102, 103), got); - } - - @Test - void findFirstNMatchingUpstreamUsers_returnsSingleWhenOnlyOneMatchExists() { - // 200 -> 201 -> 202 -> null - Map parent = Map.of( - 200, 201, - 201, 202 - ); - Set shopRoleUsers = Set.of(201); - - List got = UpstreamUserFinder.findFirstNMatchingUpstreamUsers(200, 2, 20, parent::get, shopRoleUsers::contains); - assertEquals(List.of(201), got); - } - - @Test - void findFirstNMatchingUpstreamUsers_stopsOnCycle() { - // 300 -> 301 -> 302 -> 301 (cycle) - Map parent = Map.of( - 300, 301, - 301, 302, - 302, 301 - ); - Set shopRoleUsers = Set.of(301, 302); - - List got = UpstreamUserFinder.findFirstNMatchingUpstreamUsers(300, 2, 20, parent::get, shopRoleUsers::contains); - assertEquals(List.of(301, 302), got); - } - - @Test - void findFirstNMatchingUpstreamUsers_returnsEmptyForNullStart() { - List got = UpstreamUserFinder.findFirstNMatchingUpstreamUsers(null, 2, 20, x -> null, x -> true); - assertEquals(List.of(), got); - } -} - diff --git a/src/test/java/com/gxwebsoft/test/CertificatePathConcatenationTest.java b/src/test/java/com/gxwebsoft/test/CertificatePathConcatenationTest.java deleted file mode 100644 index 22d0834..0000000 --- a/src/test/java/com/gxwebsoft/test/CertificatePathConcatenationTest.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.gxwebsoft.test; - -import com.gxwebsoft.common.core.config.ConfigProperties; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Value; - -import javax.annotation.Resource; -import java.io.File; - -/** - * 证书路径拼接测试 - * 验证开发环境的路径拼接规则：配置文件upload-path + dev/wechat/ + 租户ID - * - * @author 科技小王子 - * @since 2025-08-09 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class CertificatePathConcatenationTest { - - @Value("${spring.profiles.active:prod}") - private String activeProfile; - - @Resource - private ConfigProperties configProperties; - - @Test - public void testCertificatePathConcatenation() { - System.out.println("=== 证书路径拼接测试 ==="); - System.out.println("当前环境: " + activeProfile); - - if ("dev".equals(activeProfile)) { - testDevEnvironmentPathConcatenation(); - } else { - testProdEnvironmentPathConcatenation(); - } - - System.out.println("=== 证书路径拼接测试完成 ==="); - } - - private void testDevEnvironmentPathConcatenation() { - System.out.println("--- 开发环境路径拼接测试 ---"); - - // 获取配置文件中的upload-path - String uploadPath = configProperties.getUploadPath(); - System.out.println("配置文件upload-path: " + uploadPath); - - // 拼接规则：配置文件upload-path + dev/wechat/ + 租户ID - String tenantId = "10550"; - String certBasePath = uploadPath + "dev/wechat/" + tenantId + "/"; - String privateKeyPath = certBasePath + "apiclient_key.pem"; - String certPath = certBasePath + "apiclient_cert.pem"; - - System.out.println("拼接规则: upload-path + dev/wechat/ + 租户ID"); - System.out.println("租户ID: " + tenantId); - System.out.println("证书基础路径: " + certBasePath); - System.out.println("私钥文件路径: " + privateKeyPath); - System.out.println("证书文件路径: " + certPath); - - // 验证路径是否正确 - File privateKeyFile = new File(privateKeyPath); - File certFile = new File(certPath); - - System.out.println("--- 文件存在性验证 ---"); - System.out.println("私钥文件存在: " + privateKeyFile.exists()); - System.out.println("证书文件存在: " + certFile.exists()); - - if (privateKeyFile.exists()) { - System.out.println("✅ 私钥文件路径拼接正确"); - System.out.println(" 文件大小: " + privateKeyFile.length() + " bytes"); - } else { - System.out.println("❌ 私钥文件路径拼接错误或文件不存在"); - } - - if (certFile.exists()) { - System.out.println("✅ 证书文件路径拼接正确"); - System.out.println(" 文件大小: " + certFile.length() + " bytes"); - } else { - System.out.println("❌ 证书文件路径拼接错误或文件不存在"); - } - - // 验证期望的路径 - String expectedPath = "/Users/gxwebsoft/JAVA/cms-java-code/src/main/resources/dev/wechat/10550/"; - System.out.println("--- 路径验证 ---"); - System.out.println("期望的证书路径: " + expectedPath); - System.out.println("实际拼接路径: " + certBasePath); - System.out.println("路径匹配: " + expectedPath.equals(certBasePath)); - - if (expectedPath.equals(certBasePath)) { - System.out.println("✅ 路径拼接规则正确"); - } else { - System.out.println("❌ 路径拼接规则需要调整"); - System.out.println(" 请检查配置文件中的upload-path设置"); - } - } - - private void testProdEnvironmentPathConcatenation() { - System.out.println("--- 生产环境路径配置测试 ---"); - System.out.println("生产环境使用数据库配置的证书路径"); - System.out.println("路径格式: {uploadPath}/file/{relativePath}"); - - String uploadPath = configProperties.getUploadPath(); - System.out.println("配置的upload-path: " + uploadPath); - - // 模拟生产环境路径拼接 - String relativePath = "wechat/10550/apiclient_key.pem"; - String prodPath = uploadPath + "file/" + relativePath; - System.out.println("生产环境示例路径: " + prodPath); - System.out.println("✅ 生产环境路径配置逻辑正确"); - } - - @Test - public void testMultipleTenantPaths() { - System.out.println("=== 多租户路径拼接测试 ==="); - - if (!"dev".equals(activeProfile)) { - System.out.println("跳过：仅在开发环境测试多租户路径"); - return; - } - - String uploadPath = configProperties.getUploadPath(); - String[] tenantIds = {"10324", "10398", "10547", "10549", "10550"}; - - System.out.println("配置文件upload-path: " + uploadPath); - System.out.println("测试多个租户的证书路径拼接:"); - - for (String tenantId : tenantIds) { - String certBasePath = uploadPath + "dev/wechat/" + tenantId + "/"; - String privateKeyPath = certBasePath + "apiclient_key.pem"; - - File privateKeyFile = new File(privateKeyPath); - System.out.println("租户 " + tenantId + ": " + (privateKeyFile.exists() ? "✅" : "❌") + " " + privateKeyPath); - } - - System.out.println("=== 多租户路径拼接测试完成 ==="); - } - - @Test - public void testConfigurationProperties() { - System.out.println("=== 配置属性测试1 ==="); - - System.out.println("当前环境: " + activeProfile); - System.out.println("ConfigProperties注入: " + (configProperties != null ? "✅" : "❌")); - - if (configProperties != null) { - System.out.println("upload-path: " + configProperties.getUploadPath()); - System.out.println("upload-location: " + configProperties.getUploadLocation()); - System.out.println("server-url: " + configProperties.getServerUrl()); - } - - System.out.println("=== 配置属性测试完成 ==="); - } -} diff --git a/src/test/java/com/gxwebsoft/test/CertificatePathFixTest.java b/src/test/java/com/gxwebsoft/test/CertificatePathFixTest.java deleted file mode 100644 index 851a844..0000000 --- a/src/test/java/com/gxwebsoft/test/CertificatePathFixTest.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gxwebsoft.test; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Paths; - -/** - * 证书路径修复验证测试 - * - * @author 科技小王子 - * @since 2025-08-09 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class CertificatePathFixTest { - - private static final String CERT_BASE_PATH = "/Users/gxwebsoft/JAVA/cms-java-code/src/main/resources/dev/wechat/10550"; - - @Test - public void testCertificatePathFix() { - System.out.println("=== 证书路径修复验证测试 ==="); - - // 验证证书目录存在 - File certDir = new File(CERT_BASE_PATH); - assert certDir.exists() && certDir.isDirectory() : "证书目录不存在: " + CERT_BASE_PATH; - System.out.println("✅ 证书目录存在: " + CERT_BASE_PATH); - - // 验证私钥文件 - String privateKeyPath = CERT_BASE_PATH + "/apiclient_key.pem"; - File privateKeyFile = new File(privateKeyPath); - assert privateKeyFile.exists() && privateKeyFile.isFile() : "私钥文件不存在: " + privateKeyPath; - System.out.println("✅ 私钥文件存在: " + privateKeyPath); - System.out.println(" 文件大小: " + privateKeyFile.length() + " bytes"); - - // 验证证书文件 - String certPath = CERT_BASE_PATH + "/apiclient_cert.pem"; - File certFile = new File(certPath); - assert certFile.exists() && certFile.isFile() : "证书文件不存在: " + certPath; - System.out.println("✅ 证书文件存在: " + certPath); - System.out.println(" 文件大小: " + certFile.length() + " bytes"); - - // 验证文件内容格式 - try { - String privateKeyContent = Files.readString(Paths.get(privateKeyPath)); - assert privateKeyContent.contains("-----BEGIN PRIVATE KEY-----") : "私钥文件格式错误"; - System.out.println("✅ 私钥文件格式正确"); - - String certContent = Files.readString(Paths.get(certPath)); - assert certContent.contains("-----BEGIN CERTIFICATE-----") : "证书文件格式错误"; - System.out.println("✅ 证书文件格式正确"); - - } catch (Exception e) { - throw new RuntimeException("读取证书文件失败: " + e.getMessage(), e); - } - - System.out.println("=== 证书路径修复验证完成 ==="); - System.out.println("🎉 所有证书文件验证通过！"); - System.out.println(); - System.out.println("📋 修复内容总结:"); - System.out.println("1. 修复了 SettingServiceImpl 中的硬编码证书路径"); - System.out.println("2. 更新了 WechatCertAutoConfig 中的默认开发环境配置"); - System.out.println("3. 证书路径已指向正确位置: " + CERT_BASE_PATH); - System.out.println(); - System.out.println("🔧 下一步建议:"); - System.out.println("1. 重启应用程序以使配置生效"); - System.out.println("2. 测试微信支付功能是否正常工作"); - System.out.println("3. 检查应用日志确认证书加载成功"); - } - - @Test - public void testCertificatePathStructure() { - System.out.println("=== 证书目录结构验证 ==="); - - File baseDir = new File("/Users/gxwebsoft/JAVA/cms-java-code/src/main/resources/dev/wechat"); - if (baseDir.exists()) { - File[] tenantDirs = baseDir.listFiles(File::isDirectory); - if (tenantDirs != null) { - System.out.println("发现租户证书目录:"); - for (File tenantDir : tenantDirs) { - System.out.println(" - 租户ID: " + tenantDir.getName()); - - File privateKey = new File(tenantDir, "apiclient_key.pem"); - File cert = new File(tenantDir, "apiclient_cert.pem"); - File p12 = new File(tenantDir, "apiclient_cert.p12"); - - System.out.println(" 私钥文件: " + (privateKey.exists() ? "✅" : "❌")); - System.out.println(" 证书文件: " + (cert.exists() ? "✅" : "❌")); - System.out.println(" P12文件: " + (p12.exists() ? "✅" : "❌")); - } - } - } - - System.out.println("=== 目录结构验证完成 ==="); - } -} diff --git a/src/test/java/com/gxwebsoft/test/CertificateTest.java b/src/test/java/com/gxwebsoft/test/CertificateTest.java deleted file mode 100644 index 4d59a67..0000000 --- a/src/test/java/com/gxwebsoft/test/CertificateTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gxwebsoft.test; - -import com.gxwebsoft.common.core.config.CertificateProperties; -import com.gxwebsoft.common.core.utils.CertificateLoader; -import com.gxwebsoft.common.core.utils.WechatCertAutoConfig; -import com.wechat.pay.java.core.Config; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -/** - * 证书测试类 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class CertificateTest { - - @Autowired - private CertificateProperties certConfig; - - @Autowired - private CertificateLoader certificateLoader; - - @Autowired - private WechatCertAutoConfig wechatCertAutoConfig; - - @Test - public void testCertificateLoading() { - try { - System.out.println("=== 证书加载测试 ==="); - - // 测试租户ID - String tenantId = "10550"; - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - - System.out.println("证书路径: " + privateKeyPath); - System.out.println("加载模式: " + certConfig.getLoadMode()); - System.out.println("开发环境证书路径前缀: " + certConfig.getDevCertPath()); - - // 检查证书文件是否存在 - boolean exists = certificateLoader.certificateExists(privateKeyPath); - System.out.println("证书文件是否存在: " + exists); - - if (!exists) { - System.err.println("❌ 证书文件不存在: " + privateKeyPath); - System.out.println("💡 请确认证书文件已放置在正确位置:"); - System.out.println(" src/main/resources/dev/wechat/10550/apiclient_key.pem"); - return; - } - - // 测试证书加载 - String privateKeyFile = certificateLoader.loadCertificatePath(privateKeyPath); - System.out.println("✅ 私钥文件加载成功: " + privateKeyFile); - - // 测试自动证书配置 - System.out.println("=== 测试自动证书配置 ==="); - Config config = wechatCertAutoConfig.createAutoConfig( - "1723321338", // 测试商户号 - privateKeyFile, - "test-serial-number", // 测试序列号 - "test-api-key" // 测试API密钥 - ); - - System.out.println("✅ 自动证书配置创建成功"); - - } catch (Exception e) { - System.err.println("❌ 证书测试失败: " + e.getMessage()); - e.printStackTrace(); - } - } - - @Test - public void testNotificationCertificateConfig() { - try { - System.out.println("=== 异步通知证书配置测试 ==="); - - // 模拟异步通知中的证书配置逻辑 - String tenantId = "10550"; - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - - System.out.println("租户ID: " + tenantId); - System.out.println("证书目录: " + tenantCertPath); - System.out.println("私钥路径: " + privateKeyPath); - - // 检查证书文件是否存在 - if (!certificateLoader.certificateExists(privateKeyPath)) { - System.err.println("❌ 证书文件不存在: " + privateKeyPath); - throw new RuntimeException("证书文件不存在: " + privateKeyPath); - } - - String privateKey = certificateLoader.loadCertificatePath(privateKeyPath); - String apiV3Key = certConfig.getWechatPay().getDev().getApiV3Key(); - - System.out.println("✅ 私钥文件加载成功: " + privateKey); - System.out.println("APIv3密钥配置: " + (apiV3Key != null ? "已配置" : "未配置")); - - System.out.println("✅ 异步通知证书配置测试通过"); - - } catch (Exception e) { - System.err.println("❌ 异步通知证书配置测试失败: " + e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/src/test/java/com/gxwebsoft/test/EnvironmentBasedCertificateTest.java b/src/test/java/com/gxwebsoft/test/EnvironmentBasedCertificateTest.java deleted file mode 100644 index ae7dfa7..0000000 --- a/src/test/java/com/gxwebsoft/test/EnvironmentBasedCertificateTest.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.gxwebsoft.test; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Value; - -import javax.annotation.Resource; -import java.io.File; - -/** - * 基于环境的证书路径配置测试 - * - * @author 科技小王子 - * @since 2025-08-09 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class EnvironmentBasedCertificateTest { - - @Value("${spring.profiles.active:prod}") - private String activeProfile; - - @Test - public void testEnvironmentBasedCertificateConfig() { - System.out.println("=== 环境基础证书配置测试 ==="); - System.out.println("当前激活的环境: " + activeProfile); - - if ("dev".equals(activeProfile)) { - System.out.println("✅ 检测到开发环境"); - testDevEnvironmentCertificates(); - } else { - System.out.println("✅ 检测到生产环境"); - testProdEnvironmentCertificates(); - } - - System.out.println("=== 环境基础证书配置测试完成 ==="); - } - - private void testDevEnvironmentCertificates() { - System.out.println("--- 开发环境证书路径测试 ---"); - - String devCertPath = "/Users/gxwebsoft/JAVA/cms-java-code/src/main/resources/dev/wechat/10550"; - String privateKeyPath = devCertPath + "/apiclient_key.pem"; - String certPath = devCertPath + "/apiclient_cert.pem"; - - System.out.println("开发环境证书目录: " + devCertPath); - System.out.println("私钥文件路径: " + privateKeyPath); - System.out.println("证书文件路径: " + certPath); - - // 验证文件存在 - File privateKeyFile = new File(privateKeyPath); - File certFile = new File(certPath); - - assert privateKeyFile.exists() : "开发环境私钥文件不存在: " + privateKeyPath; - assert certFile.exists() : "开发环境证书文件不存在: " + certPath; - - System.out.println("✅ 开发环境证书文件验证通过"); - System.out.println(" - 私钥文件大小: " + privateKeyFile.length() + " bytes"); - System.out.println(" - 证书文件大小: " + certFile.length() + " bytes"); - } - - private void testProdEnvironmentCertificates() { - System.out.println("--- 生产环境证书路径测试 ---"); - System.out.println("生产环境将使用数据库配置的证书路径"); - System.out.println("证书路径格式: {uploadPath}/file/{relativePath}"); - System.out.println("✅ 生产环境配置逻辑正确"); - } - - @Test - public void testCertificatePathLogic() { - System.out.println("=== 证书路径逻辑测试 ==="); - - // 模拟不同环境的路径构建逻辑 - String uploadPath = "/www/wwwroot/file.ws/"; - String relativePath = "wechat/10550/apiclient_key.pem"; - - if ("dev".equals(activeProfile)) { - // 开发环境：使用固定的本地路径 - String devPath = "/Users/gxwebsoft/JAVA/cms-java-code/src/main/resources/dev/wechat/10550/apiclient_key.pem"; - System.out.println("开发环境路径: " + devPath); - - File devFile = new File(devPath); - System.out.println("开发环境文件存在: " + devFile.exists()); - } else { - // 生产环境：使用数据库配置的路径 - String prodPath = uploadPath + "file/" + relativePath; - System.out.println("生产环境路径: " + prodPath); - System.out.println("生产环境路径构建逻辑正确"); - } - - System.out.println("=== 证书路径逻辑测试完成 ==="); - } - - @Test - public void testEnvironmentSwitching() { - System.out.println("=== 环境切换测试 ==="); - - // 测试环境判断逻辑 - System.out.println("当前环境: " + activeProfile); - - if ("dev".equals(activeProfile)) { - System.out.println("✅ 开发环境配置:"); - System.out.println(" - 使用本地固定证书路径"); - System.out.println(" - 路径: /Users/gxwebsoft/JAVA/cms-java-code/src/main/resources/dev/wechat/10550/"); - System.out.println(" - 优点: 开发便利，无需配置数据库路径"); - } else if ("prod".equals(activeProfile)) { - System.out.println("✅ 生产环境配置:"); - System.out.println(" - 使用数据库存储的证书路径"); - System.out.println(" - 路径格式: {uploadPath}/file/{relativePath}"); - System.out.println(" - 优点: 灵活配置，支持多租户"); - } else { - System.out.println("⚠️ 未知环境: " + activeProfile); - System.out.println(" - 默认使用生产环境配置"); - } - - System.out.println("=== 环境切换测试完成 ==="); - } -} diff --git a/src/test/java/com/gxwebsoft/test/NotificationCertificateFixTest.java b/src/test/java/com/gxwebsoft/test/NotificationCertificateFixTest.java deleted file mode 100644 index 1c6ff32..0000000 --- a/src/test/java/com/gxwebsoft/test/NotificationCertificateFixTest.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.gxwebsoft.test; - -import org.junit.jupiter.api.Test; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * 异步通知证书修复验证测试 - */ -public class NotificationCertificateFixTest { - - @Test - public void testCertificatePathFix() { - System.out.println("=== 异步通知证书路径修复验证 ==="); - - // 模拟异步通知中的证书路径构建逻辑 - String tenantId = "10550"; - String devCertPath = "dev"; - String certDir = "wechat"; - String privateKeyFile = "apiclient_key.pem"; - - // 修复后的路径构建逻辑 - String tenantCertPath = devCertPath + "/" + certDir + "/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + privateKeyFile; - - System.out.println("租户ID: " + tenantId); - System.out.println("证书目录: " + tenantCertPath); - System.out.println("私钥路径: " + privateKeyPath); - - // 测试从classpath加载证书 - try { - Resource resource = new ClassPathResource(privateKeyPath); - System.out.println("证书资源存在: " + resource.exists()); - - if (resource.exists()) { - // 模拟CertificateLoader.loadFromClasspath的逻辑 - Path tempFile = Files.createTempFile("cert_", ".pem"); - try (InputStream inputStream = resource.getInputStream()) { - Files.copy(inputStream, tempFile, java.nio.file.StandardCopyOption.REPLACE_EXISTING); - } - - String tempPath = tempFile.toAbsolutePath().toString(); - System.out.println("✅ 证书加载成功: " + tempPath); - - // 验证临时文件 - File tempCertFile = new File(tempPath); - System.out.println("临时证书文件大小: " + tempCertFile.length() + " bytes"); - - // 清理临时文件 - Files.deleteIfExists(tempFile); - - } else { - System.err.println("❌ 证书文件不存在: " + privateKeyPath); - } - - } catch (IOException e) { - System.err.println("❌ 证书加载失败: " + e.getMessage()); - e.printStackTrace(); - } - - System.out.println("=== 测试完成 ==="); - } - - @Test - public void testAllTenantCertificates() { - System.out.println("=== 测试所有租户证书 ==="); - - String[] tenantIds = {"10398", "10550"}; - String devCertPath = "dev"; - String certDir = "wechat"; - String privateKeyFile = "apiclient_key.pem"; - - for (String tenantId : tenantIds) { - System.out.println("\n--- 测试租户: " + tenantId + " ---"); - - String tenantCertPath = devCertPath + "/" + certDir + "/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + privateKeyFile; - - System.out.println("证书路径: " + privateKeyPath); - - try { - Resource resource = new ClassPathResource(privateKeyPath); - if (resource.exists()) { - System.out.println("✅ 租户 " + tenantId + " 证书存在"); - } else { - System.out.println("❌ 租户 " + tenantId + " 证书不存在"); - } - } catch (Exception e) { - System.err.println("❌ 租户 " + tenantId + " 证书检查失败: " + e.getMessage()); - } - } - - System.out.println("\n=== 所有租户证书测试完成 ==="); - } -} diff --git a/src/test/java/com/gxwebsoft/test/WechatPayConfigTest.java b/src/test/java/com/gxwebsoft/test/WechatPayConfigTest.java deleted file mode 100644 index 3304f88..0000000 --- a/src/test/java/com/gxwebsoft/test/WechatPayConfigTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.gxwebsoft.test; - -import com.gxwebsoft.common.core.config.CertificateProperties; -import com.gxwebsoft.common.core.utils.CertificateLoader; -import com.gxwebsoft.common.core.utils.WechatCertAutoConfig; -import com.gxwebsoft.common.core.service.PaymentCacheService; -import com.gxwebsoft.common.system.entity.Payment; -import com.wechat.pay.java.core.Config; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -/** - * 微信支付配置测试 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class WechatPayConfigTest { - - @Autowired - private CertificateProperties certConfig; - - @Autowired - private CertificateLoader certificateLoader; - - @Autowired - private WechatCertAutoConfig wechatCertAutoConfig; - - @Autowired - private PaymentCacheService paymentCacheService; - - @Test - public void testWechatPayConfig() { - try { - System.out.println("=== 微信支付配置测试 ==="); - - // 测试租户ID - String tenantId = "10550"; - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - - System.out.println("证书路径: " + privateKeyPath); - System.out.println("加载模式: " + certConfig.getLoadMode()); - - // 测试证书加载 - String privateKeyFile = certificateLoader.loadCertificatePath(privateKeyPath); - System.out.println("私钥文件路径: " + privateKeyFile); - - // 测试数据库支付配置 - System.out.println("=== 测试数据库支付配置 ==="); - try { - Payment payment = paymentCacheService.getPaymentConfig(0, 10550); // 微信支付，租户ID 10550 - System.out.println("数据库配置获取成功:"); - System.out.println("商户号: " + payment.getMchId()); - System.out.println("序列号: " + payment.getMerchantSerialNumber()); - System.out.println("API密钥: " + (payment.getApiKey() != null ? "已配置(长度:" + payment.getApiKey().length() + ")" : "未配置")); - System.out.println("应用ID: " + payment.getAppId()); - - // 使用数据库配置进行测试 - if (payment.getMchId() != null && payment.getMerchantSerialNumber() != null && payment.getApiKey() != null) { - Config dbConfig = wechatCertAutoConfig.createAutoConfig( - payment.getMchId(), - privateKeyFile, - payment.getMerchantSerialNumber(), - payment.getApiKey() - ); - System.out.println("使用数据库配置创建成功: " + (dbConfig != null)); - } else { - System.out.println("数据库配置不完整，无法创建微信支付配置"); - } - - } catch (Exception e) { - System.err.println("数据库配置获取失败: " + e.getMessage()); - - // 回退到配置文件参数 - System.out.println("=== 回退到配置文件参数 ==="); - String devApiKey = certConfig.getWechatPay().getDev().getApiV3Key(); - System.out.println("API密钥: " + (devApiKey != null ? "已配置(长度:" + devApiKey.length() + ")" : "未配置")); - } - - System.out.println("=== 测试完成 ==="); - - } catch (Exception e) { - System.err.println("微信支付配置测试失败: " + e.getMessage()); - e.printStackTrace(); - } - } -} diff --git a/src/test/java/com/gxwebsoft/test/WechatPayConfigValidationTest.java b/src/test/java/com/gxwebsoft/test/WechatPayConfigValidationTest.java deleted file mode 100644 index 916d98d..0000000 --- a/src/test/java/com/gxwebsoft/test/WechatPayConfigValidationTest.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.gxwebsoft.test; - -import com.gxwebsoft.common.core.config.CertificateProperties; -import com.gxwebsoft.common.core.utils.CertificateLoader; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.system.entity.Payment; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -/** - * 微信支付配置验证测试 - */ -@SpringBootTest -@ActiveProfiles("dev") -public class WechatPayConfigValidationTest { - - @Autowired - private CertificateProperties certConfig; - - @Autowired - private CertificateLoader certificateLoader; - - @Autowired - private RedisUtil redisUtil; - - @Test - public void testWechatPayConfigValidation() { - System.out.println("=== 微信支付配置验证 ==="); - - // 1. 检查配置文件中的 APIv3 密钥 - String configApiV3Key = certConfig.getWechatPay().getDev().getApiV3Key(); - System.out.println("配置文件 APIv3 密钥: " + configApiV3Key); - System.out.println("配置文件 APIv3 密钥长度: " + (configApiV3Key != null ? configApiV3Key.length() : 0)); - - // 2. 检查 Redis 中的支付配置 - String tenantId = "10550"; - String redisKey = "Payment:1:" + tenantId; - Payment payment = redisUtil.get(redisKey, Payment.class); - - if (payment != null) { - System.out.println("\n=== Redis 支付配置 ==="); - System.out.println("商户号: " + payment.getMchId()); - System.out.println("应用ID: " + payment.getAppId()); - System.out.println("数据库 APIv3 密钥: " + payment.getApiKey()); - System.out.println("数据库 APIv3 密钥长度: " + (payment.getApiKey() != null ? payment.getApiKey().length() : 0)); - System.out.println("商户证书序列号: " + payment.getMerchantSerialNumber()); - - // 3. 比较两个 APIv3 密钥 - System.out.println("\n=== APIv3 密钥比较 ==="); - boolean keysMatch = (configApiV3Key != null && configApiV3Key.equals(payment.getApiKey())); - System.out.println("配置文件与数据库密钥是否一致: " + keysMatch); - - if (!keysMatch) { - System.out.println("⚠️ 警告: 配置文件与数据库中的 APIv3 密钥不一致!"); - System.out.println("配置文件密钥: " + configApiV3Key); - System.out.println("数据库密钥: " + payment.getApiKey()); - } - - } else { - System.out.println("❌ 未找到 Redis 中的支付配置: " + redisKey); - - // 尝试其他可能的键格式 - String[] possibleKeys = { - "Payment:1:10550", - "Payment:0:10550", - "Payment:10", - "Payment:1" + "0" // Payment:10 - }; - - System.out.println("\n=== 尝试其他 Redis 键格式 ==="); - for (String key : possibleKeys) { - Payment p = redisUtil.get(key, Payment.class); - if (p != null) { - System.out.println("✅ 找到支付配置: " + key); - System.out.println(" 商户号: " + p.getMchId()); - System.out.println(" APIv3密钥: " + p.getApiKey()); - break; - } - } - } - - // 4. 验证证书文件 - System.out.println("\n=== 证书文件验证 ==="); - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - - boolean certExists = certificateLoader.certificateExists(privateKeyPath); - System.out.println("证书文件存在: " + certExists); - System.out.println("证书路径: " + privateKeyPath); - - if (certExists) { - try { - String privateKey = certificateLoader.loadCertificatePath(privateKeyPath); - System.out.println("✅ 证书加载成功: " + privateKey); - } catch (Exception e) { - System.out.println("❌ 证书加载失败: " + e.getMessage()); - } - } - - System.out.println("\n=== 验证完成 ==="); - } - - @Test - public void testApiV3KeyValidation() { - System.out.println("=== APIv3 密钥格式验证 ==="); - - String configKey = certConfig.getWechatPay().getDev().getApiV3Key(); - - if (configKey != null) { - System.out.println("APIv3 密钥: " + configKey); - System.out.println("密钥长度: " + configKey.length()); - - // APIv3 密钥应该是32位字符串 - if (configKey.length() == 32) { - System.out.println("✅ APIv3 密钥长度正确 (32位)"); - } else { - System.out.println("❌ APIv3 密钥长度错误，应为32位，实际为: " + configKey.length()); - } - - // 检查是否包含特殊字符 - boolean hasSpecialChars = !configKey.matches("^[a-zA-Z0-9]+$"); - if (hasSpecialChars) { - System.out.println("⚠️ APIv3 密钥包含特殊字符，可能导致解密失败"); - } else { - System.out.println("✅ APIv3 密钥格式正确 (仅包含字母和数字)"); - } - - } else { - System.out.println("❌ APIv3 密钥未配置"); - } - } -} diff --git a/src/test/java/com/gxwebsoft/test/WechatPayPathTest.java b/src/test/java/com/gxwebsoft/test/WechatPayPathTest.java deleted file mode 100644 index dae0d97..0000000 --- a/src/test/java/com/gxwebsoft/test/WechatPayPathTest.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.gxwebsoft.test; - -import com.gxwebsoft.common.core.config.CertificateProperties; -import com.gxwebsoft.common.core.service.PaymentCacheService; -import com.gxwebsoft.common.core.utils.CertificateLoader; -import com.gxwebsoft.common.system.entity.Payment; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * 微信支付路径处理测试 - * - * @author 科技小王子 - * @since 2025-07-29 - */ -@SpringBootTest -public class WechatPayPathTest { - - @Autowired - private PaymentCacheService paymentCacheService; - - @Autowired - private CertificateLoader certificateLoader; - - @Autowired - private CertificateProperties certConfig; - - @Test - public void testPublicKeyPathHandling() { - try { - System.out.println("=== 微信支付公钥路径处理测试 ==="); - - // 测试租户ID - Integer tenantId = 10547; - - // 获取支付配置 - Payment payment = paymentCacheService.getWechatPayConfig(tenantId); - if (payment == null) { - System.err.println("❌ 支付配置不存在"); - return; - } - - System.out.println("数据库配置信息:"); - System.out.println("租户ID: " + tenantId); - System.out.println("商户号: " + payment.getMchId()); - System.out.println("公钥文件配置: " + payment.getPubKey()); - System.out.println("公钥ID: " + payment.getPubKeyId()); - - // 测试路径处理逻辑 - if (payment.getPubKey() != null && !payment.getPubKey().isEmpty()) { - System.out.println("\n=== 路径处理测试 ==="); - - String pubKeyPath; - if (payment.getPubKey().startsWith("dev/wechat/") || payment.getPubKey().startsWith("/")) { - // 如果数据库中存储的是完整路径，直接使用 - pubKeyPath = payment.getPubKey(); - System.out.println("✅ 检测到完整路径，直接使用: " + pubKeyPath); - } else { - // 如果是相对路径，需要拼接租户目录 - String tenantCertPath = "dev/wechat/" + tenantId; - pubKeyPath = tenantCertPath + "/" + payment.getPubKey(); - System.out.println("✅ 检测到相对路径，拼接后: " + pubKeyPath); - } - - // 测试文件是否存在 - System.out.println("\n=== 文件存在性检查 ==="); - if (certificateLoader.certificateExists(pubKeyPath)) { - try { - String actualPath = certificateLoader.loadCertificatePath(pubKeyPath); - System.out.println("✅ 公钥文件存在: " + actualPath); - - // 检查文件大小 - java.io.File file = new java.io.File(actualPath); - if (file.exists()) { - System.out.println("文件大小: " + file.length() + " 字节"); - System.out.println("文件可读: " + file.canRead()); - } - } catch (Exception e) { - System.err.println("❌ 加载公钥文件失败: " + e.getMessage()); - } - } else { - System.err.println("❌ 公钥文件不存在: " + pubKeyPath); - - // 提供修复建议 - System.out.println("\n=== 修复建议 ==="); - if (payment.getPubKey().contains("/")) { - System.out.println("1. 检查数据库中的路径是否正确"); - System.out.println("2. 确认文件是否已上传到指定位置"); - System.out.println("3. 当前配置的路径: " + payment.getPubKey()); - } else { - System.out.println("1. 将公钥文件放置到: src/main/resources/dev/wechat/" + tenantId + "/"); - System.out.println("2. 或者更新数据库配置为完整路径"); - } - } - - // 测试其他证书文件 - System.out.println("\n=== 其他证书文件检查 ==="); - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - String merchantCertPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getApiclientCertFile(); - - System.out.println("私钥文件: " + privateKeyPath + " - " + - (certificateLoader.certificateExists(privateKeyPath) ? "✅ 存在" : "❌ 不存在")); - System.out.println("商户证书: " + merchantCertPath + " - " + - (certificateLoader.certificateExists(merchantCertPath) ? "✅ 存在" : "❌ 不存在")); - - } else { - System.out.println("⚠️ 未配置公钥信息"); - } - - System.out.println("\n=== 测试完成 ==="); - - } catch (Exception e) { - System.err.println("❌ 测试失败: " + e.getMessage()); - e.printStackTrace(); - } - } - - @Test - public void testCreateCorrectDirectoryStructure() { - System.out.println("=== 创建正确的目录结构建议 ==="); - - try { - Integer tenantId = 10547; - Payment payment = paymentCacheService.getWechatPayConfig(tenantId); - - if (payment != null && payment.getPubKey() != null) { - System.out.println("当前数据库配置的公钥路径: " + payment.getPubKey()); - - if (payment.getPubKey().contains("/")) { - // 包含路径分隔符，说明是完整路径 - System.out.println("\n建议的文件放置位置:"); - System.out.println("src/main/resources/" + payment.getPubKey()); - - // 创建目录的命令 - String dirPath = payment.getPubKey().substring(0, payment.getPubKey().lastIndexOf("/")); - System.out.println("\n创建目录的命令:"); - System.out.println("mkdir -p src/main/resources/" + dirPath); - - // 复制文件的命令 - System.out.println("\n如果您有公钥文件，可以这样复制:"); - System.out.println("cp your_public_key.pem src/main/resources/" + payment.getPubKey()); - } else { - // 只是文件名，需要放在租户目录下 - System.out.println("\n建议的文件放置位置:"); - System.out.println("src/main/resources/dev/wechat/" + tenantId + "/" + payment.getPubKey()); - - System.out.println("\n或者更新数据库配置为:"); - System.out.println("UPDATE sys_payment SET pub_key = 'dev/wechat/" + tenantId + "/" + payment.getPubKey() + "' WHERE tenant_id = " + tenantId + " AND type = 0;"); - } - } - - } catch (Exception e) { - System.err.println("获取配置失败: " + e.getMessage()); - } - } -} diff --git a/src/test/java/com/gxwebsoft/test/WechatPayPublicKeyTest.java b/src/test/java/com/gxwebsoft/test/WechatPayPublicKeyTest.java deleted file mode 100644 index b6bfc12..0000000 --- a/src/test/java/com/gxwebsoft/test/WechatPayPublicKeyTest.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.gxwebsoft.test; - -import com.gxwebsoft.common.core.config.CertificateProperties; -import com.gxwebsoft.common.core.service.PaymentCacheService; -import com.gxwebsoft.common.core.utils.CertificateLoader; -import com.gxwebsoft.common.core.utils.WechatCertAutoConfig; -import com.gxwebsoft.common.system.entity.Payment; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAPublicKeyConfig; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * 微信支付公钥配置测试 - * - * @author 科技小王子 - * @since 2025-07-29 - */ -@SpringBootTest -public class WechatPayPublicKeyTest { - - @Autowired - private PaymentCacheService paymentCacheService; - - @Autowired - private CertificateLoader certificateLoader; - - @Autowired - private CertificateProperties certConfig; - - @Autowired - private WechatCertAutoConfig wechatCertAutoConfig; - - @Test - public void testPublicKeyConfiguration() { - try { - System.out.println("=== 微信支付公钥配置测试 ==="); - - // 测试租户ID - Integer tenantId = 10547; - - // 获取支付配置 - Payment payment = paymentCacheService.getWechatPayConfig(tenantId); - System.out.println("支付配置获取成功:"); - System.out.println("商户号: " + payment.getMchId()); - System.out.println("应用ID: " + payment.getAppId()); - System.out.println("序列号: " + payment.getMerchantSerialNumber()); - System.out.println("API密钥: " + (payment.getApiKey() != null ? "已配置(长度:" + payment.getApiKey().length() + ")" : "未配置")); - System.out.println("公钥文件: " + payment.getPubKey()); - System.out.println("公钥ID: " + payment.getPubKeyId()); - - // 测试证书文件加载 - String tenantCertPath = "dev/wechat/" + tenantId; - String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); - - System.out.println("\n=== 证书文件检查 ==="); - System.out.println("私钥路径: " + privateKeyPath); - - if (certificateLoader.certificateExists(privateKeyPath)) { - String privateKey = certificateLoader.loadCertificatePath(privateKeyPath); - System.out.println("✅ 私钥文件加载成功: " + privateKey); - - // 检查是否配置了公钥 - if (payment.getPubKey() != null && !payment.getPubKey().isEmpty() && - payment.getPubKeyId() != null && !payment.getPubKeyId().isEmpty()) { - - System.out.println("\n=== 公钥配置测试 ==="); - String pubKeyPath = tenantCertPath + "/" + payment.getPubKey(); - System.out.println("公钥路径: " + pubKeyPath); - - if (certificateLoader.certificateExists(pubKeyPath)) { - String pubKeyFile = certificateLoader.loadCertificatePath(pubKeyPath); - System.out.println("✅ 公钥文件加载成功: " + pubKeyFile); - - // 测试RSA公钥配置 - try { - Config config = new RSAPublicKeyConfig.Builder() - .merchantId(payment.getMchId()) - .privateKeyFromPath(privateKey) - .publicKeyFromPath(pubKeyFile) - .publicKeyId(payment.getPubKeyId()) - .merchantSerialNumber(payment.getMerchantSerialNumber()) - .apiV3Key(payment.getApiKey()) - .build(); - - System.out.println("✅ RSA公钥配置创建成功"); - System.out.println("配置类型: " + config.getClass().getSimpleName()); - - } catch (Exception e) { - System.err.println("❌ RSA公钥配置失败: " + e.getMessage()); - e.printStackTrace(); - } - - } else { - System.err.println("❌ 公钥文件不存在: " + pubKeyPath); - System.out.println("💡 建议: 请将公钥文件放置到指定位置"); - } - - } else { - System.out.println("\n⚠️ 未配置公钥信息"); - System.out.println("💡 建议: 在数据库中配置 pubKey 和 pubKeyId 字段"); - - // 测试自动证书配置 - System.out.println("\n=== 自动证书配置测试 ==="); - try { - Config autoConfig = wechatCertAutoConfig.createAutoConfig( - payment.getMchId(), - privateKey, - payment.getMerchantSerialNumber(), - payment.getApiKey() - ); - System.out.println("✅ 自动证书配置创建成功"); - System.out.println("配置类型: " + autoConfig.getClass().getSimpleName()); - } catch (Exception e) { - System.err.println("❌ 自动证书配置失败: " + e.getMessage()); - System.err.println("错误类型: " + e.getClass().getName()); - - if (e.getMessage() != null && e.getMessage().contains("certificate")) { - System.err.println("🔍 这是证书相关错误，建议使用公钥模式"); - } - } - } - - } else { - System.err.println("❌ 私钥文件不存在: " + privateKeyPath); - } - - System.out.println("\n=== 测试完成 ==="); - - } catch (Exception e) { - System.err.println("❌ 测试失败: " + e.getMessage()); - e.printStackTrace(); - } - } - - @Test - public void testCreateSamplePublicKeyConfig() { - System.out.println("=== 创建示例公钥配置 ==="); - System.out.println("如果您的后台使用公钥模式，请在数据库中配置以下字段:"); - System.out.println("1. pubKey: 公钥文件名，例如 'wechatpay_public_key.pem'"); - System.out.println("2. pubKeyId: 公钥ID，例如 'PUB_KEY_ID_0112422897022025011300326200001208'"); - System.out.println("3. 将公钥文件放置到: src/main/resources/dev/wechat/{tenantId}/"); - System.out.println("\n示例SQL更新语句:"); - System.out.println("UPDATE sys_payment SET "); - System.out.println(" pub_key = 'wechatpay_public_key.pem',"); - System.out.println(" pub_key_id = 'PUB_KEY_ID_0112422897022025011300326200001208'"); - System.out.println("WHERE tenant_id = 10547 AND type = 0;"); - } -} From 53c0dc9cd7b2da02f61c19bdea91430352669b43 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 29 Apr 2026 15:34:35 +0800 Subject: [PATCH 27/60] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=90=8D=E7=A7=B0=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gxwebsoft/glt/entity/GltTicketOrder.java | 6 ++---- .../java/com/gxwebsoft/glt/entity/GltTicketTemplate.java | 3 +++ .../java/com/gxwebsoft/glt/entity/GltUserTicket.java | 6 ++---- .../java/com/gxwebsoft/glt/entity/GltUserTicketLog.java | 7 +++---- .../com/gxwebsoft/glt/entity/GltUserTicketRelease.java | 7 +++---- src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java | 9 +++++---- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index f1bdc94..c200cfc 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -1,9 +1,6 @@ package com.gxwebsoft.glt.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -22,6 +19,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "GltTicketOrder对象", description = "送水订单") +@TableName("glt_ticket_order") public class GltTicketOrder implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketTemplate.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketTemplate.java index 95338a9..7fa64b1 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketTemplate.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketTemplate.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "GltTicketTemplate对象", description = "水票") +@TableName("glt_ticket_template") public class GltTicketTemplate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java index 4a6e8a4..49d89c4 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java @@ -1,12 +1,9 @@ package com.gxwebsoft.glt.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import java.math.BigDecimal; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -22,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "GltUserTicket对象", description = "我的水票") +@TableName("glt_user_ticket") public class GltUserTicket implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketLog.java b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketLog.java index 4c83b91..9ae12b6 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketLog.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketLog.java @@ -1,10 +1,8 @@ package com.gxwebsoft.glt.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -20,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "GltUserTicketLog对象", description = "消费日志") +@TableName("glt_user_ticket_log") public class GltUserTicketLog implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java index 26131d9..18d6d92 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java @@ -1,10 +1,8 @@ package com.gxwebsoft.glt.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -20,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "GltUserTicketRelease对象", description = "水票释放") +@TableName("glt_user_ticket_release") public class GltUserTicketRelease implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index 340f7aa..fab56e5 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -1,12 +1,12 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; + +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; -import com.baomidou.mybatisplus.annotation.TableLogic; + import java.io.Serializable; import java.util.List; @@ -25,6 +25,7 @@ import javax.validation.constraints.*; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopOrder对象", description = "订单") +@TableName("shop_order") public class ShopOrder implements Serializable { private static final long serialVersionUID = 1L; From 044bb24b570c68f463a64bdb62a3d55c2c969310 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Thu, 30 Apr 2026 10:39:58 +0800 Subject: [PATCH 28/60] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=B1=9E=E6=80=A7=E4=B8=9A=E5=8A=A1=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E5=9D=80=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=85=B6=E4=BB=96=E5=9C=B0=E5=9D=80=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=9E=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopUserAddressController.java | 7 ++---- .../shop/service/ShopUserAddressService.java | 7 ++++++ .../impl/ShopUserAddressServiceImpl.java | 24 +++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java index e2290f9..9cc92fb 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java @@ -79,11 +79,8 @@ @OperationLog @Operation(summary = "修改收货地址") @PutMapping() - public ApiResult update(@RequestBody ShopUserAddress shopUserAddress) { - if (shopUserAddressService.updateById(shopUserAddress)) { - return success("修改成功"); - } - return fail("修改失败"); + public ApiResult update(@RequestBody ShopUserAddress shopUserAddress) { + return success(shopUserAddressService.updateInfo(shopUserAddress)); } @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')") diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java b/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java index 70880e4..d8ec530 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java @@ -55,4 +55,11 @@ public interface ShopUserAddressService extends IService { */ List getUserAddresses(Integer userId); + /** + * 修改用户信息 + * @param shopUserAddress + * @return + */ + Boolean updateInfo(ShopUserAddress shopUserAddress); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java index cf599c6..69ade75 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java @@ -8,8 +8,11 @@ import com.gxwebsoft.shop.entity.ShopUserAddress; import com.gxwebsoft.shop.param.ShopUserAddressParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; /** @@ -65,4 +68,25 @@ public class ShopUserAddressServiceImpl extends ServiceImpl list = lambdaQuery().eq(ShopUserAddress::getIsDefault, true).eq(ShopUserAddress::getUserId, address.getUserId()) + .ne(ShopUserAddress::getId, address.getId()).list(); + if(CollectionUtils.isNotEmpty(list)){ + list.forEach(userAddress ->{ + userAddress.setIsDefault(false); + }); + } + updateBatchById(list); + } + shopUserAddress.setUpdateTime(LocalDateTime.now()); + return baseMapper.updateById(shopUserAddress) > 0; + } + return false; + } + } From a575907623e85434b1bcedfd7a451183c104c0e4 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Tue, 5 May 2026 09:31:45 +0800 Subject: [PATCH 29/60] =?UTF-8?q?1.=E4=B8=8B=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=B0=B4?= =?UTF-8?q?=E7=A5=A8=E4=BC=98=E5=8C=96=E3=80=81=E9=BB=98=E8=AE=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=8A=9F=E8=83=BD=202.=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD=203.=E8=87=AA=E6=8F=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8D=95=E4=B8=8D=E6=A0=A1=E9=AA=8C=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E5=9B=B4=E6=A0=8F=EF=BC=9B=E9=85=8D=E9=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A6=82=E5=9C=A8=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=E5=86=85=E9=BB=98=E8=AE=A4=E8=87=AA=E9=85=8D=E9=80=81=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F=E5=A4=96=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=8F=91=E5=BF=AB=E9=80=92=204.=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=85=8D=E9=80=81=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E3=80=81=E6=B0=B4=E7=A5=A8=E6=A0=87=E8=AF=86=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=EF=BC=9B=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E3=80=81=E6=B0=B4?= =?UTF-8?q?=E7=A5=A8=E6=A0=87=E8=AF=86=E3=80=81=E6=A0=B8=E9=94=80=E7=A0=81?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/common/system/entity/User.java | 3 + .../glt/service/GltTicketIssueService.java | 2 +- .../shop/controller/ShopOrderController.java | 10 +- .../shop/dto/OrderCreateRequest.java | 3 + .../shop/dto/VerifyShopOrderDto.java | 25 +++++ .../com/gxwebsoft/shop/entity/ShopGoods.java | 12 ++ .../com/gxwebsoft/shop/entity/ShopOrder.java | 21 ++++ .../shop/service/OrderBusinessService.java | 104 +++++++++++++++++- .../shop/service/ShopOrderService.java | 8 ++ .../shop/service/ShopStoreFenceService.java | 15 +++ .../impl/ShopStoreFenceServiceImpl.java | 45 ++++++++ 11 files changed, 240 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index ca83722..f4dee75 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -262,6 +262,9 @@ public class User implements UserDetails { @Schema(description = "微信unionid") private String unionid; + @Schema(description = "核销权限是否开启 0-未开启 1-已开启") + private Integer verifyFlag; + @Schema(description = "关联用户ID") @TableField(exist = false) private Integer sysUserId; diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 75c20c8..5cd7fbb 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -131,7 +131,7 @@ public class GltTicketIssueService { } @Async -// @Scheduled(cron = "0/1 * 4-22 * * ?") 没秒钟执行一次 +// @Scheduled(cron = "0/1 * 4-22 * * ?") 每秒钟执行一次 public void paySuccessExecute(String orderNo, Integer tenantId){ suerTicketRelease(orderNo, tenantId); } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 2b241e0..32a3bc7 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -14,6 +14,7 @@ import com.gxwebsoft.common.core.utils.WechatPayConfigValidator; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.Payment; import com.gxwebsoft.glt.service.GltTicketIssueService; +import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.ShopOrderDelivery; import com.gxwebsoft.shop.entity.ShopUserAddress; import com.gxwebsoft.shop.service.*; @@ -136,14 +137,13 @@ public class ShopOrderController extends BaseController { return success(shopOrderService.getByIdRel(id)); } - @Operation(summary = "添加订单") + @Operation(summary = "添加订单【单商品添加】") @PostMapping() public ApiResult save(@RequestBody OrderCreateRequest request) { User loginUser = getLoginUser(); if (loginUser == null) { return fail("用户未登录"); } - try { Map wxOrderInfo = orderBusinessService.createOrder(request, loginUser); return success("下单成功", wxOrderInfo); @@ -961,6 +961,12 @@ public class ShopOrderController extends BaseController { return "fail"; } + @Operation(summary = "核销订单", description = "核销员扫码核销用户订单") + @PutMapping("/verifyOrder") + public ApiResult verifyOrder(@RequestBody VerifyShopOrderDto verifyDto){ + return success(shopOrderService.verifyOrder(verifyDto)); + } + @Operation(summary = "更新订单支付状态", description = "用户支付成功后主动同步订单状态") @PutMapping("/payment-status") public ApiResult updateOrderPaymentStatus(@RequestBody UpdatePaymentStatusRequest request) { diff --git a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java index 07455ef..3cef01d 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java +++ b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java @@ -27,6 +27,9 @@ public class OrderCreateRequest { @Max(value = 2, message = "订单类型值无效") private Integer type; + @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递 5-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】") + private Integer orderType; + @Size(max = 60, message = "备注长度不能超过60个字符") @Schema(description = "订单标题") private String title; diff --git a/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java b/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java new file mode 100644 index 0000000..b4d7101 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java @@ -0,0 +1,25 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * 更新订单支付状态请求DTO + * + * @author xm + * @since 2026-05-04 + */ +@Data +@Schema(name = "VerifyShopOrderDto", description = "更新订单支付状态请求") +public class VerifyShopOrderDto { + + @Schema(description = "核销码") + @NotBlank(message = "核销码不能为空") + private String verifyCode; + + @Schema(description = "核销码类型 1-普通核销【无推广佣金】 2-推广结算【有订单佣金】") + private Integer verifyType; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index 75bc1a3..51709cf 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -21,6 +23,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopGoods对象", description = "商品") +@TableName("shop_goods") public class ShopGoods implements Serializable { private static final long serialVersionUID = 1L; @@ -171,6 +174,15 @@ public class ShopGoods implements Serializable { @Schema(description = "租户id") private Integer tenantId; + @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开") + private String deliveryType; + + @Schema(description = "水票标识 0-否 1-是") + private Integer waterTicketFlag; + + @Schema(description = "水票ID") + private Integer waterTickerId; + @Schema(description = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index fab56e5..0c96f1d 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -33,6 +33,9 @@ public class ShopOrder implements Serializable { @TableId(value = "order_id", type = IdType.AUTO) private Integer orderId; + @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递") + private Integer orderType; + @Schema(description = "订单编号") private String orderNo; @@ -310,6 +313,24 @@ public class ShopOrder implements Serializable { @Schema(description = "秒杀活动ID") private Integer activityId; + @Schema(description = "水票订单标识 0-否 1-是") + private Integer waterTicketFlag; + + @Schema(description = "核销码") + private String verifyCode; + + @Schema(description = "核销状态 0-未核销 1-已核销") + private Integer verifyStatus; + + @Schema(description = "推广佣金结算核销过期时间") + private LocalDateTime verifyExpTime; + + @Schema(description = "核销时间") + private LocalDateTime verifyTime; + + @Schema(description = "核销人") + private Integer verifyUser; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java index 1e9a1b9..232bbd7 100644 --- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java +++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java @@ -1,15 +1,15 @@ package com.gxwebsoft.shop.service; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.config.OrderConfigProperties; import com.gxwebsoft.shop.dto.OrderCreateRequest; import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; -import com.gxwebsoft.shop.service.ShopStoreFenceService; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -19,6 +19,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; +import java.security.SecureRandom; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -37,9 +38,16 @@ public class OrderBusinessService { private static final int DEDUCT_STOCK_TYPE_ORDER = 10; // 下单减库存 private static final int DEDUCT_STOCK_TYPE_PAY = 20; // 付款减库存 + // 去除易混淆字符：0 O 1 I L 8 B Z + private static final String CHAR_POOL = "2345679ACDEFGHJKMNPQRSTUVWXY"; + private static final SecureRandom RANDOM = new SecureRandom(); + @Resource private ShopOrderService shopOrderService; + @Resource + private ShopOrderMapper shopOrderMapper; + @Resource private ShopOrderGoodsService shopOrderGoodsService; @@ -291,6 +299,10 @@ public class OrderBusinessService { } shopOrder.setExpirationTime(shopOrder.getCreateTime().plusMinutes(10)); + //设置核销码及过期时间 + shopOrder.setVerifyCode(getVerifyCode()); + shopOrder.setVerifyExpTime(shopOrder.getCreateTime().plusMinutes(10)); + // 确保租户ID正确设置（关键字段，影响微信支付证书路径） shopOrder.setTenantId(loginUser.getTenantId()); @@ -356,9 +368,76 @@ public class OrderBusinessService { processCoupon(shopOrder, loginUser); } + //订单类型、水票判断 TODO 目前没有购物车业务，每笔订单只下一个商品，后期加购物车多商品同时下单业务需调整 + Integer orderType = request.getOrderType(); + List goodsItems = request.getGoodsItems(); + if(!CollectionUtils.isEmpty(goodsItems)){ + OrderCreateRequest.OrderGoodsItem goodsItem = goodsItems.get(0); + ShopGoods shopGoods = shopGoodsService.getById(goodsItem.getGoodsId()); + if(shopGoods != null){ + Integer waterTicketFlag = shopGoods.getWaterTicketFlag(); + if(waterTicketFlag != null && waterTicketFlag == 1){ + shopOrder.setWaterTicketFlag(1); + }else { + shopOrder.setWaterTicketFlag(0); + } + + //单一配送方式商品如用户没选择配送方式按商品默认配送属性设定订单类型 + String deliveryType = shopGoods.getDeliveryType(); + if(orderType == null && StrUtil.isNotBlank(deliveryType) && !deliveryType.contains(",")){ + switch (deliveryType){ + case "1": + case "3":{ + orderType = 1; + break; + } + case "2":{ + orderType = 2; + break; + } + case "4":{ + orderType = 4; + break; + } + default:{ + orderType = 1; + } + } + } + } + } + shopOrder.setOrderType(orderType); + return shopOrder; } + /** + * 生成8位字母数字混合核销码（推荐） + */ + public static String generate6Mix() { + StringBuilder sb = new StringBuilder(6); + int len = CHAR_POOL.length(); + for (int i = 0; i < 6; i++) { + int idx = RANDOM.nextInt(len); + sb.append(CHAR_POOL.charAt(idx)); + } + return sb.toString(); + } + + /** + * 获取不重复的核销码 + * @return + */ + public String getVerifyCode(){ + String verifyCode = generate6Mix(); + LambdaQueryWrapper orderLambdaQueryWrapper = new LambdaQueryWrapper().select(ShopOrder::getOrderId).eq(ShopOrder::getVerifyCode, verifyCode); + List shopOrders = shopOrderMapper.selectList(orderLambdaQueryWrapper); + if(!CollectionUtils.isEmpty(shopOrders)){ + getVerifyCode(); + } + return verifyCode; + } + /** * 处理优惠券 */ @@ -556,6 +635,12 @@ public class OrderBusinessService { return; } + //自提订单类型不用校验电子围栏 + Integer orderType = shopOrder.getOrderType(); + if(orderType != null && orderType == 2){ + return; + } + // 若已配置围栏，则必须有 addressId 才能从地址表取坐标进行校验 if (shopOrder.getAddressId() == null) { if (shopStoreFenceService.hasEnabledFences(shopOrder.getTenantId())) { @@ -586,8 +671,17 @@ public class OrderBusinessService { throw new BusinessException("收货地址坐标异常，请重新选择收货地址"); } - // 只做校验；具体围栏列表/points 异常处理由围栏服务统一处理 - shopStoreFenceService.validatePointInEnabledFences(shopOrder.getTenantId(), lng, lat); + //订单类型：5-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】 + if(orderType != null && orderType == 5){ + Boolean exit = shopStoreFenceService.validatePointInEnabled(shopOrder.getTenantId(), lng, lat); + if(exit){ + shopOrder.setOrderType(1); + }else { + shopOrder.setOrderType(4); + } + }else { + shopStoreFenceService.validatePointInEnabledFences(shopOrder.getTenantId(), lng, lat); + } } /** diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java index e2ebdea..e7df2db 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java @@ -3,6 +3,7 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.shop.dto.UserOrderStats; +import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.param.ShopOrderParam; @@ -86,4 +87,11 @@ public interface ShopOrderService extends IService { * @param type 订单类型（可为空） */ UserOrderStats getUserOrderStats(Integer userId, Integer tenantId, Integer type); + + /** + * 核销订单 + * @param verifyDto 核销码 + * @return + */ + Boolean verifyOrder(VerifyShopOrderDto verifyDto); } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopStoreFenceService.java b/src/main/java/com/gxwebsoft/shop/service/ShopStoreFenceService.java index b930b30..0954bcb 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopStoreFenceService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopStoreFenceService.java @@ -59,4 +59,19 @@ public interface ShopStoreFenceService extends IService { */ void validatePointInEnabledFences(Integer tenantId, double lng, double lat); + /** + * 校验坐标是否落在任一启用围栏内。 + *

+ * 约定： + * - 围栏按 tenantId + status=0 过滤； + * - 支持多个围栏：命中任意一个即通过； + * - 无围栏配置：直接放行； + * - 围栏 points 异常：抛出异常（避免误送）。 + * + * @param tenantId 租户ID + * @param lng 经度 + * @param lat 纬度 + */ + Boolean validatePointInEnabled(Integer tenantId, double lng, double lat); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopStoreFenceServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopStoreFenceServiceImpl.java index 7d597cc..3c404b7 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopStoreFenceServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopStoreFenceServiceImpl.java @@ -106,4 +106,49 @@ public class ShopStoreFenceServiceImpl extends ServiceImpl fences = this.list(new LambdaQueryWrapper() + .eq(ShopStoreFence::getTenantId, tenantId) + .eq(ShopStoreFence::getStatus, 0) + .orderByAsc(ShopStoreFence::getSortNumber) + .orderByDesc(ShopStoreFence::getCreateTime)); + + // 无围栏配置：默认放行 + if (fences == null || fences.isEmpty()) { + return true; + } + + for (ShopStoreFence fence : fences) { + if (fence == null) { + continue; + } + List polygon; + try { + polygon = GeoFenceUtil.parsePolygonPoints(fence.getPoints()); + } catch (Exception e) { + // points 异常：直接拒单并记录日志，避免误送 + log.error("围栏 points 解析失败，tenantId={}, fenceId={}, points={}", + tenantId, fence.getId(), fence.getPoints(), e); + throw new BusinessException("配送范围配置异常，请联系商家"); + } + + if (polygon == null || polygon.size() < 3) { + log.error("围栏 points 点数不足，tenantId={}, fenceId={}, points={}", + tenantId, fence.getId(), fence.getPoints()); + throw new BusinessException("配送范围配置异常，请联系商家"); + } + + if (GeoFenceUtil.containsInclusive(polygon, lng, lat)) { + return true; // 命中任一围栏即通过 + } + } + return false; + } + } From 587caa78d771124d949c034a7af3952e2d49b151 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Tue, 5 May 2026 17:39:26 +0800 Subject: [PATCH 30/60] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=E7=94=A8=E6=88=B7=E5=BE=85=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E3=80=81=E5=BE=85=E5=8F=91=E8=B4=A7=E3=80=81=E5=BE=85=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=B7=B2=E5=AE=8C=E6=88=90=E3=80=81=E9=80=80?= =?UTF-8?q?=E8=B4=A7/=E5=94=AE=E5=90=8E=E6=80=BB=E5=8D=95=E9=87=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=8A=E5=AF=B9=E5=BA=94=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=202.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=94=80=E7=94=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=9B=A2=E9=98=9F=E6=88=90=E5=91=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E3=80=81=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E3=80=81?= =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=88=90=E5=91=98=E6=95=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShopDealerRefereeController.java | 23 ++++--- .../shop/controller/ShopOrderController.java | 1 + .../shop/entity/ShopDealerReferee.java | 14 +++++ .../shop/mapper/xml/ShopOrderMapper.xml | 30 ++++----- .../gxwebsoft/shop/param/ShopOrderParam.java | 6 +- .../service/ShopDealerRefereeService.java | 7 +++ .../impl/ShopDealerRefereeServiceImpl.java | 62 +++++++++++++++++++ 7 files changed, 115 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java index 60a363f..bd5b9b0 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java @@ -1,19 +1,19 @@ package com.gxwebsoft.shop.controller; -import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.Constants; +import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.shop.service.ShopDealerRefereeService; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.entity.ShopDealerReferee; import com.gxwebsoft.shop.param.ShopDealerRefereeParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.ShopDealerRefereeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -41,6 +41,13 @@ public class ShopDealerRefereeController extends BaseController { return success(shopDealerRefereeService.pageRel(param)); } + @PreAuthorize("hasAuthority('shop:shopDealerReferee:list')") + @Operation(summary = "分页查询分销商推荐关系表") + @GetMapping("/appPage") + public ApiResult> appPage(@ParameterObject ShopDealerRefereeParam param) { + return success(shopDealerRefereeService.appPage(param)); + } + @PreAuthorize("hasAuthority('shop:shopDealerReferee:list')") @Operation(summary = "查询全部分销商推荐关系表") @GetMapping() diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 32a3bc7..c731e78 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -43,6 +43,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.Operation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java index 24ac1f5..54d84a6 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java @@ -3,6 +3,8 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; + +import java.math.BigDecimal; import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -87,4 +89,16 @@ public class ShopDealerReferee implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @Schema(description = "团队成员") + @TableField(exist = false) + private Integer teamNum; + + @Schema(description = "订单数") + @TableField(exist = false) + private Integer orderNum; + + @Schema(description = "订单金额") + @TableField(exist = false) + private BigDecimal orderAmount; + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index fb70756..c2fd775 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -233,10 +233,6 @@ OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%') ) - - - AND a.order_status != 2 - @@ -245,27 +241,27 @@ - AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 + AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 AND a.order_type in(1, 3, 4) - AND a.pay_status = 1 AND a.order_status = 0 + AND a.pay_status = 1 AND a.order_status = 0 and order_type = 2 - AND a.delivery_status = 20 AND a.order_status != 1 + AND a.pay_status = 1 AND a.delivery_status = 20 AND a.order_status = 0 - AND a.order_status = 1 AND a.evaluate_status = 0 + AND a.pay_status = 1 AND a.order_status = 1 AND a.evaluate_status = 0 - AND a.order_status = 1 + AND a.pay_status = 1 AND a.order_status = 1 - AND (a.order_status = 4 OR a.order_status = 5 OR a.order_status = 6 OR a.order_status = 7) + AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7) @@ -301,13 +297,13 @@ SELECT -- “全部”默认也会过滤已关闭(取消)订单：statusFilter != 8 时会加 a.order_status != 2 COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 THEN 1 ELSE 0 END), 0) AS total, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.pay_status = 0 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitPay, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitDeliver, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.pay_status = 1 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitVerify, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.delivery_status = 20 AND a.order_status != 1 THEN 1 ELSE 0 END), 0) AS waitReceive, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.order_status = 1 AND a.evaluate_status = 0 THEN 1 ELSE 0 END), 0) AS waitComment, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND (a.order_status = 4 OR a.order_status = 5 OR a.order_status = 6 OR a.order_status = 7) THEN 1 ELSE 0 END), 0) AS refund, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 0 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitPay, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type in(1, 3, 4) AND a.delivery_status = 10 THEN 1 ELSE 0 END), 0) AS waitDeliver, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type = 2 THEN 1 ELSE 0 END), 0) AS waitVerify, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.delivery_status = 20 THEN 1 ELSE 0 END), 0) AS waitReceive, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 AND a.evaluate_status = 0 THEN 1 ELSE 0 END), 0) AS waitComment, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7) THEN 1 ELSE 0 END), 0) AS refund, COALESCE(SUM(CASE WHEN a.deleted = 1 THEN 1 ELSE 0 END), 0) AS deleted, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status = 2 THEN 1 ELSE 0 END), 0) AS canceled FROM shop_order a diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java index 2d61365..becee7b 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java @@ -1,15 +1,15 @@ package com.gxwebsoft.shop.param; -import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonInclude; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + /** * 订单查询参数 * diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java index 2abc0ec..cfb28cf 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java @@ -23,6 +23,13 @@ public interface ShopDealerRefereeService extends IService { */ PageResult pageRel(ShopDealerRefereeParam param); + /** + * app端查询用户层级关系 + * @param param + * @return + */ + PageResult appPage(ShopDealerRefereeParam param); + /** * 关联查询全部 * diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java index f2fa821..59ccbad 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java @@ -3,22 +3,30 @@ package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.mapper.ShopDealerRefereeMapper; import com.gxwebsoft.shop.entity.ShopDealerUser; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.service.ShopDealerUserService; import com.gxwebsoft.shop.service.ShopDealerRefereeService; import com.gxwebsoft.shop.entity.ShopDealerReferee; import com.gxwebsoft.shop.param.ShopDealerRefereeParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 分销商推荐关系表Service实现 @@ -32,6 +40,9 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl pageRel(ShopDealerRefereeParam param) { PageParam page = new PageParam<>(param); @@ -40,6 +51,57 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl(list, page.getTotal()); } + @Override + public PageResult appPage(ShopDealerRefereeParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + + if(CollectionUtils.isNotEmpty(list)){ + List userIdList = list.stream().map(ShopDealerReferee::getUserId).distinct().collect(Collectors.toList()); + + Map refereeMap = lambdaQuery().select(ShopDealerReferee::getDealerId, ShopDealerReferee::getUserId).in(ShopDealerReferee::getDealerId, userIdList).list() + .stream().collect(Collectors.groupingBy(ShopDealerReferee::getDealerId, Collectors.counting())); + + LambdaQueryWrapper orderLambdaQueryWrapper = new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getUserId, ShopOrder::getMoney).in(ShopOrder::getUserId, userIdList) + .in(ShopOrder::getOrderStatus, Arrays.asList(0, 1, 3, 4, 5, 7)); + List shopOrderList = shopOrderMapper.selectList(orderLambdaQueryWrapper); + + Map userOrderCountMap = new HashMap<>(); + Map userAmountMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(shopOrderList)){ + userOrderCountMap = shopOrderList.stream().collect(Collectors.groupingBy(ShopOrder::getUserId, Collectors.counting())); + userAmountMap = shopOrderList.stream().collect(Collectors.groupingBy(ShopOrder::getUserId, Collectors.reducing(BigDecimal.ZERO, ShopOrder::getMoney, BigDecimal::add))); + } + + Map finalUserOrderCountMap = userOrderCountMap; + Map finalUserAmountMap = userAmountMap; + list.forEach(shopDealerReferee -> { + Long teamNum = refereeMap.get(shopDealerReferee.getUserId()); + if(teamNum != null){ + shopDealerReferee.setTeamNum(teamNum.intValue()); + }else { + shopDealerReferee.setTeamNum(0); + } + + Long orderNum = finalUserOrderCountMap.get(shopDealerReferee.getUserId()); + if(orderNum != null){ + shopDealerReferee.setOrderNum(orderNum.intValue()); + }else { + shopDealerReferee.setOrderNum(0); + } + + BigDecimal orderAmount = finalUserAmountMap.get(shopDealerReferee.getUserId()); + if(orderAmount != null){ + shopDealerReferee.setOrderAmount(orderAmount); + }else { + shopDealerReferee.setOrderAmount(BigDecimal.ZERO); + } + }); + } + return new PageResult<>(list, page.getTotal()); + } + @Override public List listRel(ShopDealerRefereeParam param) { List list = baseMapper.selectListRel(param); From 1a68b70591297e362f4a31ebdfa7dbf2991f0b65 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 6 May 2026 09:52:45 +0800 Subject: [PATCH 31/60] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BB=BB=E5=8A=A1=E6=AF=8F5=E5=88=86?= =?UTF-8?q?=E9=92=9F=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gxwebsoft/shop/task/OrderAutoCancelTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/shop/task/OrderAutoCancelTask.java b/src/main/java/com/gxwebsoft/shop/task/OrderAutoCancelTask.java index 6a5e932..d1b71ff 100644 --- a/src/main/java/com/gxwebsoft/shop/task/OrderAutoCancelTask.java +++ b/src/main/java/com/gxwebsoft/shop/task/OrderAutoCancelTask.java @@ -38,7 +38,7 @@ public class OrderAutoCancelTask { * 生产环境：每5分钟执行一次 * 开发环境：每1分钟执行一次（便于测试） */ - @Scheduled(cron = "${shop.order.auto-cancel.cron:0 */1 * * * ?}") + @Scheduled(cron = "${shop.order.auto-cancel.cron:0 */5 * * * ?}") @IgnoreTenant("定时任务需要处理所有租户的超时订单") public void cancelExpiredOrders() { if (!orderConfig.getAutoCancel().isEnabled()) { From 8fca992e37d7ac05e6dc0ca1484d615d9859aa41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 6 May 2026 17:06:40 +0800 Subject: [PATCH 32/60] =?UTF-8?q?fix(shopOrder):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=92=E7=BB=9D=E9=80=80=E6=AC=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改退款操作接口，增加对拒绝退款状态（orderStatus=5）的支持 - 更新接口描述，明确支持申请、拒绝、同意及客户端申请退款四种状态 - 优化校验逻辑，确保orderStatus只能为4、5、6或7 - 完善参数非空判断并返回相应失败信息 --- .../shop/controller/ShopOrderController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index d156858..5d31c71 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -441,15 +441,16 @@ public class ShopOrderController extends BaseController { } @PreAuthorize("hasAuthority('shop:shopOrder:refund')") - @Operation(summary = "订单退款操作(申请退款/同意退款)", description = "orderStatus=4 申请退款；orderStatus=6 同意退款并发起原路退款") + @Operation(summary = "订单退款操作(申请退款/同意退款/拒绝退款)", description = "orderStatus=4 申请退款；orderStatus=5 拒绝退款；orderStatus=6 同意退款并发起原路退款；orderStatus=7 客户端申请退款") @PutMapping("/refund") public ApiResult refund(@RequestBody ShopOrder req) { - if (req == null || req.getOrderId() == null || req.getOrderStatus() == null) { - return fail("orderId 和 orderStatus 不能为空"); - } - if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 6) && !Objects.equals(req.getOrderStatus(), 7)) { - return fail("orderStatus 仅支持 4(申请退款) 或 6(同意退款) 或 7(客户端申请退款)"); - } + if (req == null || req.getOrderId() == null || req.getOrderStatus() == null) { + return fail("orderId 和 orderStatus 不能为空"); + } + if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 5) + && !Objects.equals(req.getOrderStatus(), 6) && !Objects.equals(req.getOrderStatus(), 7)) { + return fail("orderStatus 仅支持 4(申请退款)、5(拒绝退款)、6(同意退款)、7(客户端申请退款)"); + } ShopOrder current = shopOrderService.getById(req.getOrderId()); if (current == null) { From a306f533365ae10a41fc556c51b9f8f494cb0d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 6 May 2026 19:39:03 +0800 Subject: [PATCH 33/60] =?UTF-8?q?feat(cms):=20=E5=9C=A8CmsNavigation?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CmsNavigation类中新增articles字段用于存储栏目文章列表 - 在CmsNavigationServiceImpl的pageRel方法中关联查询每个栏目对应的最多5篇文章 - 调用CmsArticleService获取文章列表并设置到CmsNavigation实体中 - 优化栏目分页查询，增加文章数据支持展示 --- .../java/com/gxwebsoft/cms/entity/CmsNavigation.java | 4 ++++ .../cms/service/impl/CmsNavigationServiceImpl.java | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java b/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java index 449cf54..1170bc8 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java @@ -227,6 +227,10 @@ public class CmsNavigation implements Serializable { @TableField(exist = false) private String text; + @Schema(description = "栏目文章") + @TableField(exist = false) + private List articles; + public String getCategoryName() { return this.title; } diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsNavigationServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsNavigationServiceImpl.java index 7a541ba..8cf2af8 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsNavigationServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsNavigationServiceImpl.java @@ -4,9 +4,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.entity.CmsArticle; import com.gxwebsoft.cms.entity.CmsDesign; import com.gxwebsoft.cms.entity.CmsModel; import com.gxwebsoft.cms.mapper.CmsNavigationMapper; +import com.gxwebsoft.cms.service.CmsArticleService; import com.gxwebsoft.cms.service.CmsDesignService; import com.gxwebsoft.cms.service.CmsModelService; import com.gxwebsoft.cms.service.CmsNavigationService; @@ -38,6 +40,8 @@ public class CmsNavigationServiceImpl extends ServiceImpl pageRel(CmsNavigationParam param) { @@ -53,6 +57,11 @@ public class CmsNavigationServiceImpl extends ServiceImpl page = new PageParam<>(); page.setDefaultOrder("sort_number asc, position asc,navigation_id asc"); + list.forEach(item -> { + // 关联信息 + final List articleList = cmsArticleService.list(new LambdaQueryWrapper().eq(CmsArticle::getCategoryId, item.getNavigationId()).last("limit 5")); + item.setArticles(articleList); + }); return page.sortRecords(list); } From f3dc242b5c985d401f7ff03c4dac483a35da6cb0 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Thu, 7 May 2026 16:09:34 +0800 Subject: [PATCH 34/60] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=86=E9=94=80=E7=94=A8=E6=88=B7=E8=B5=84=E9=87=91=E5=8F=98?= =?UTF-8?q?=E6=9B=B4api=EF=BC=8C=E6=AD=A4=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E7=BB=9F=E4=B8=80=E5=88=86=E9=94=80=E8=B5=84=E9=87=91?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E3=80=81=E5=88=86=E9=94=80=E8=B5=84=E9=87=91?= =?UTF-8?q?=E8=A7=A3=E5=86=BB=E3=80=81=E6=89=AB=E7=A0=81=E7=9B=B4=E8=BF=94?= =?UTF-8?q?=E4=BD=A3=E7=AD=89=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=B4=A6=E6=88=B7=E5=90=8C=E6=97=B6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=AF=B9=E5=BA=94=E6=B5=81=E6=B0=B4=202.=E5=88=86?= =?UTF-8?q?=E9=94=80=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E5=8F=98?= =?UTF-8?q?=E5=8A=A8=E7=B1=BB=E5=9E=8B=E3=80=81=E5=8F=98=E6=9B=B4=E5=90=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E3=80=81=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AD=89=E5=AD=97=E6=AE=B5=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=203.=E5=95=86=E5=93=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=A8=E5=B9=BF=E6=A0=B8=E9=AA=8C=E4=BD=A3=E9=87=91?= =?UTF-8?q?=E6=AF=94=E7=8E=87=E4=B8=9A=E5=8A=A1=204.=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E6=A0=B8=E9=94=80=E4=BD=A3=E9=87=91=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E6=94=B6=E8=B4=A7=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=9A=E5=8A=A1=205.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=AB=E7=A0=81=E6=A0=B8=E9=94=80=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=206.=E6=96=B0=E5=A2=9E=E7=BB=9F=E4=B8=80=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=AE=A2=E5=8D=95=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ShopDealerCapitalUpdateEnum.java | 38 +++ .../common/core/enums/ShopDealerTypeEnum.java | 28 +++ .../common/system/mapper/UserMapper.java | 3 + .../common/system/mapper/xml/UserMapper.xml | 3 + .../common/system/redis/OrderNoUtils.java | 38 +++ .../controller/ShopDealerUserController.java | 27 ++- .../shop/dto/ShopDealerUserReduceDto.java | 42 ++++ .../shop/dto/VerifyShopOrderDto.java | 2 +- .../shop/entity/ShopDealerCapital.java | 36 ++- .../gxwebsoft/shop/entity/ShopDealerUser.java | 3 + .../com/gxwebsoft/shop/entity/ShopGoods.java | 3 + .../com/gxwebsoft/shop/entity/ShopOrder.java | 7 + .../shop/entity/ShopUserAddress.java | 5 +- .../shop/service/ShopDealerUserService.java | 8 + .../impl/ShopDealerUserServiceImpl.java | 225 +++++++++++++++++- .../service/impl/ShopOrderServiceImpl.java | 141 ++++++++++- 16 files changed, 586 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java create mode 100644 src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java create mode 100644 src/main/java/com/gxwebsoft/common/system/redis/OrderNoUtils.java create mode 100644 src/main/java/com/gxwebsoft/shop/dto/ShopDealerUserReduceDto.java diff --git a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java new file mode 100644 index 0000000..304ad31 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 用户分销钱包交易业务分类 + * @author xm + */ +@AllArgsConstructor +@Getter +public enum ShopDealerCapitalUpdateEnum { + + DISTRIBUTION_INCOME(10, "分销收入", true), + MANAGEMENT_INCOME(11, "团队管理津贴收入", true), + DIVIDEND_INCOME(12, "分红收入", true), + PROMOTION_INCOME(13, "现场推广收入", true), + WITHDRAW_PAYMENT(20, "提现支出", false), + TRANSFER_PAYMENT(30, "转账支出", false), + TRANSFER_INCOME(40, "转账收入", true), + FREEZE_MONEY_THAW(50, "佣金解冻", true), + DELIVERY_INCOME(60, "配送奖励", true), + ORDER_REFUND(70, "佣金退回(退单)", false), + ; + + /** + * 业务分类 + */ + private final Integer type; + /** + * 说明 + */ + private final String description; + /** + * 是否为增加余额 + */ + private final boolean add; +} diff --git a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java new file mode 100644 index 0000000..51cb3be --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java @@ -0,0 +1,28 @@ +package com.gxwebsoft.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 订单状态枚举 + */ +@AllArgsConstructor +@Getter +public enum ShopDealerTypeEnum { + + + FREEZE_ACCOUNT(1, "操作冻结账户余额"), + WITHDRAW_ACCOUNT(2, "操作提现账户余额【直接结算】"), + DEFROST(3, "解冻"); + + private final Integer code; + private final String desc; + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} \ No newline at end of file diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java index 53b114d..99a32c6 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java @@ -49,6 +49,9 @@ public interface UserMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "true") List getOne(@Param("param") UserParam param); + @InterceptorIgnore(tenantLine = "true") + User getById(@Param("userId") Integer userId); + List selectListStatisticsRel(@Param("param") UserParam param); @InterceptorIgnore(tenantLine = "true") diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml index c16fae8..4196c93 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -260,5 +260,8 @@ WHERE a.user_id = #{userId} AND a.deleted = 0 + diff --git a/src/main/java/com/gxwebsoft/common/system/redis/OrderNoUtils.java b/src/main/java/com/gxwebsoft/common/system/redis/OrderNoUtils.java new file mode 100644 index 0000000..887f1ca --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/redis/OrderNoUtils.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.common.system.redis; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.time.Duration; +import java.time.LocalDateTime; + +/** + * 支付序号的 Redis DAO + * + * @author 芋道源码 + */ +@Repository +public class OrderNoUtils { + + @Resource + private StringRedisTemplate stringRedisTemplate; + + /** + * 生成序号 + * @param prefix 前缀 + * @return 序号 + */ + public String generate(String prefix) { + // 递增序号 + String noPrefix = prefix + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN); + String key = noPrefix; + Long no = stringRedisTemplate.opsForValue().increment(key); + // 设置过期时间 + stringRedisTemplate.expire(key, Duration.ofMinutes(1L)); + return noPrefix + no; + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java index 9d5d469..9cecbd2 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java @@ -4,18 +4,18 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.ShopDealerUserService; -import com.gxwebsoft.shop.entity.ShopDealerUser; -import com.gxwebsoft.shop.param.ShopDealerUserParam; -import com.gxwebsoft.shop.param.ShopDealerUserImportParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.utils.JSONUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; +import com.gxwebsoft.shop.entity.ShopDealerUser; +import com.gxwebsoft.shop.param.ShopDealerUserImportParam; +import com.gxwebsoft.shop.param.ShopDealerUserParam; +import com.gxwebsoft.shop.service.ShopDealerUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; @@ -178,4 +178,11 @@ public class ShopDealerUserController extends BaseController { return fail("导入失败", null); } + @Operation(summary = "分销结算") + @PostMapping("/dealerCapital") + @Deprecated + public ApiResult dealerCapital(@RequestBody ShopDealerUserReduceDto reduceDto) { + return success(shopDealerUserService.reduceBalance(reduceDto)); + } + } diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerUserReduceDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerUserReduceDto.java new file mode 100644 index 0000000..cd9b53b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerUserReduceDto.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.dto; + +import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; +import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 更新分销用户资金 + * @author xm + * @since 2026-05-06 + */ +@Data +@Schema(name = "ShopDealerUserReduceDto", description = "更新分销用户资金请求") +public class ShopDealerUserReduceDto { + + @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻") + @NotNull(message = "变更类型不可为空！") + private ShopDealerTypeEnum typeEnum; + + @Schema(description = "用户ID") + private Integer userId; + + @Schema(description = "订单主体用户ID") + private Integer orderUserId; + + @Schema(description = "订单号") + @NotEmpty(message = "订单号不能为空！") + private String orderNo; + + @Schema(description = "变更金额") + private BigDecimal price; + + @Schema(description = "业务类型") + @NotEmpty(message = "业务类型不能为空！") + private ShopDealerCapitalUpdateEnum updateEnum; + +} diff --git a/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java b/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java index b4d7101..99630eb 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java +++ b/src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java @@ -19,7 +19,7 @@ public class VerifyShopOrderDto { @NotBlank(message = "核销码不能为空") private String verifyCode; - @Schema(description = "核销码类型 1-普通核销【无推广佣金】 2-推广结算【有订单佣金】") + @Schema(description = "核销码类型 1-普通核销【无推广佣金】 2-推广结算【有订单佣金】", example = "2") private Integer verifyType; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java index 0dadc24..864b842 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java @@ -1,10 +1,11 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; + +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; + import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -20,6 +21,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopDealerCapital对象", description = "分销商资金明细表") +@TableName("shop_dealer_capital") public class ShopDealerCapital implements Serializable { private static final long serialVersionUID = 1L; @@ -27,26 +29,41 @@ public class ShopDealerCapital implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; + @Schema(description = "订单编号") + private String no; + @Schema(description = "分销商用户ID") private Integer userId; + @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻") + private Integer type; + @Schema(description = "分销商昵称") @TableField(exist = false) private String nickName; - @Schema(description = "订单编号") + @Schema(description = "关联订单编号") private String orderNo; @Schema(description = "订单状态") @TableField(exist = false) private Integer orderStatus; - @Schema(description = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励)") + @Schema(description = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)") private Integer flowType; - @Schema(description = "金额") + @Schema(description = "变更金额") private BigDecimal money; + @Schema(description = "变更后金额") + private BigDecimal moneyAfter; + + @Schema(description = "变更冻结金额") + private BigDecimal freezeMoney; + + @Schema(description = "变更冻结后金额") + private BigDecimal freezeMoneyAfter; + @Schema(description = "描述") private String comments; @@ -63,6 +80,9 @@ public class ShopDealerCapital implements Serializable { @Schema(description = "商城ID") private Integer tenantId; + @Schema(description = "创建人") + private Integer creator; + @Schema(description = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @@ -71,4 +91,8 @@ public class ShopDealerCapital implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @Schema(description = "是否删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java index b067c3f..8db36da 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -20,6 +22,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopDealerUser对象", description = "分销商用户记录表") +@TableName("shop_dealer_user") public class ShopDealerUser implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index 51709cf..0b942d7 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -107,6 +107,9 @@ public class ShopGoods implements Serializable { @Schema(description = "配送奖金") private BigDecimal deliveryMoney; + @Schema(description = "推广核验佣金比率") + private BigDecimal verifyRate; + @Schema(description = "库存计算方式(10下单减库存 20付款减库存)") @JsonAlias({"cdeductStockType"}) private Integer deductStockType; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index 0c96f1d..586de72 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -331,6 +331,9 @@ public class ShopOrder implements Serializable { @Schema(description = "核销人") private Integer verifyUser; + @Schema(description = "推广核销佣金") + private BigDecimal verifyMoney; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @@ -375,4 +378,8 @@ public class ShopOrder implements Serializable { @TableField(exist = false) private ShopOrderDelivery shopOrderDelivery; + + @Schema(description = "详细地址") + @TableField(exist = false) + private String fullAddress; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java index 490e45b..8ae5544 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -20,6 +22,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopUserAddress对象", description = "收货地址") +@TableName("shop_user_address") public class ShopUserAddress implements Serializable { private static final long serialVersionUID = 1L; @@ -48,7 +51,7 @@ public class ShopUserAddress implements Serializable { @Schema(description = "收货地址") private String address; - @Schema(description = "收货地址") + @Schema(description = "详细地址") private String fullAddress; private String lat; diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index 8e86728..ef2a6d5 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -2,6 +2,7 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.ShopDealerUser; import com.gxwebsoft.shop.param.ShopDealerUserParam; @@ -42,4 +43,11 @@ public interface ShopDealerUserService extends IService { ShopDealerUser getByUserIdRel(Integer userId); boolean updateByUserId(ShopDealerUser shopDealerUser); + + /** + * 更新分销用户资金 + * @param reduceDto + * @return + */ + Boolean reduceBalance(ShopDealerUserReduceDto reduceDto); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index a5767d3..12fc4e3 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -2,15 +2,31 @@ package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.ShopDealerUserMapper; -import com.gxwebsoft.shop.service.ShopDealerUserService; -import com.gxwebsoft.shop.entity.ShopDealerUser; -import com.gxwebsoft.shop.param.ShopDealerUserParam; +import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; +import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; +import com.gxwebsoft.common.core.utils.LoginUserUtil; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.common.system.redis.OrderNoUtils; +import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; +import com.gxwebsoft.shop.entity.ShopDealerCapital; +import com.gxwebsoft.shop.entity.ShopDealerUser; +import com.gxwebsoft.shop.mapper.ShopDealerCapitalMapper; +import com.gxwebsoft.shop.mapper.ShopDealerUserMapper; +import com.gxwebsoft.shop.param.ShopDealerUserParam; +import com.gxwebsoft.shop.service.ShopDealerUserService; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 分销商用户记录表Service实现 @@ -19,8 +35,17 @@ import java.util.List; * @since 2025-08-11 23:51:41 */ @Service +@AllArgsConstructor public class ShopDealerUserServiceImpl extends ServiceImpl implements ShopDealerUserService { + private UserMapper userMapper; + + private OrderNoUtils orderNoUtils; + + private ShopDealerCapitalMapper shopDealerCapitalMapper; + + private static final int TENANT_ID = 10584; + @Override public PageResult pageRel(ShopDealerUserParam param) { PageParam page = new PageParam<>(param); @@ -58,4 +83,196 @@ public class ShopDealerUserServiceImpl extends ServiceImpl 0; } + @Override + @Transactional + public Boolean reduceBalance(ShopDealerUserReduceDto entity) { + //1.获取入参 + log.error("分销账户资金变更明细：" + entity); + ShopDealerTypeEnum typeEnum = entity.getTypeEnum(); + ShopDealerCapitalUpdateEnum updateEnum = entity.getUpdateEnum(); + + //2.变动类型为 1-操作冻结账户余额 2-操作提现账户余额【直接结算】是需判断金额值问题 + if(ShopDealerTypeEnum.FREEZE_ACCOUNT.equals(typeEnum) || ShopDealerTypeEnum.WITHDRAW_ACCOUNT.equals(typeEnum)){ + //查询分销用户信息 + ShopDealerUser dealerUser = getDealerUser(entity.getUserId()); + BigDecimal price = entity.getPrice(); + + switch (updateEnum){ + case DISTRIBUTION_INCOME: + case MANAGEMENT_INCOME: + case DIVIDEND_INCOME: + case PROMOTION_INCOME: + case TRANSFER_INCOME: + case DELIVERY_INCOME:{ + break; + } + case WITHDRAW_PAYMENT: + case TRANSFER_PAYMENT: + case ORDER_REFUND:{ + price.negate(); + break; + } + default:{ + throw new RuntimeException("暂不支持此类型！"); + } + } + + String no = orderNoUtils.generate("C"); + //3.操作冻结账户余额 + if(ShopDealerTypeEnum.FREEZE_ACCOUNT.equals(typeEnum)){ //操作冻结账户余额 + //3.1 账户变更冻结金额 + dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().add(price)); + dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(price)); + baseMapper.updateById(dealerUser); + + //3.2 生成流水 + ShopDealerCapital dealerCapital = new ShopDealerCapital(); + dealerCapital.setNo(no); + dealerCapital.setUserId(entity.getUserId()); + dealerCapital.setType(typeEnum.getCode()); + dealerCapital.setOrderNo(entity.getOrderNo()); + dealerCapital.setFlowType(updateEnum.getType()); + dealerCapital.setFreezeMoney(price); + dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + dealerCapital.setMoneyAfter(dealerUser.getMoney()); + dealerCapital.setComments(updateEnum.getDescription()); + dealerCapital.setToUserId(entity.getOrderUserId()); + dealerCapital.setTenantId(TENANT_ID); + dealerCapital.setCreateTime(LocalDateTime.now()); + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser != null){ + dealerCapital.setCreator(loginUser.getUserId()); + } + shopDealerCapitalMapper.insert(dealerCapital); + } + + //4.操作提现账户余额【直接结算】 + else if(ShopDealerTypeEnum.WITHDRAW_ACCOUNT.equals(typeEnum)){ + //4.1 账户变更冻结金额 + dealerUser.setMoney(dealerUser.getMoney().add(price)); + dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(price)); + baseMapper.updateById(dealerUser); + + + //4.2 生成流水 + ShopDealerCapital dealerCapital = new ShopDealerCapital(); + dealerCapital.setNo(no); + dealerCapital.setUserId(entity.getUserId()); + dealerCapital.setType(typeEnum.getCode()); + dealerCapital.setOrderNo(entity.getOrderNo()); + dealerCapital.setFlowType(updateEnum.getType()); + dealerCapital.setMoney(price); + dealerCapital.setMoneyAfter(dealerUser.getMoney()); + dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + dealerCapital.setComments(updateEnum.getDescription()); + dealerCapital.setToUserId(entity.getOrderUserId()); + dealerCapital.setTenantId(TENANT_ID); + dealerCapital.setCreateTime(LocalDateTime.now()); + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser != null){ + dealerCapital.setCreator(loginUser.getUserId()); + } + shopDealerCapitalMapper.insert(dealerCapital); + } + } + + //5.操作解冻业务【按订单号结算，可能一个订单号存在2笔待解冻金额】 + else if(ShopDealerTypeEnum.DEFROST.equals(typeEnum)){ + //5.1 判断是否为指定的解冻业务 + if(!ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW.equals(entity.getUpdateEnum())){ + throw new RuntimeException("暂不支持此类型！"); + } + + //5.2 查询订单结算流水 + LambdaQueryWrapper capitalLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopDealerCapital::getOrderNo, entity.getOrderNo()); + List dealerCapitalList = shopDealerCapitalMapper.selectList(capitalLambdaQueryWrapper); + + //5.3 根据用户遍历查询及执行解冻业务 + if(CollectionUtils.isNotEmpty(dealerCapitalList)){ + List userIdList = dealerCapitalList.stream().map(ShopDealerCapital::getUserId).distinct().collect(Collectors.toList()); + List shopDealerUserList = lambdaQuery().in(ShopDealerUser::getUserId, userIdList).list(); + + Map> userCapitalMap = dealerCapitalList.stream().collect(Collectors.groupingBy(ShopDealerCapital::getUserId)); + userCapitalMap.forEach((k, value) ->{ + + //5.4 查询是否存在待解冻订单数据 + ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType())).findFirst().orElse(null); + if(userCapital != null){ + + //5.5 查询此订单是否已结算 + ShopDealerCapital alreadyCapital = value.stream().filter(capital -> ShopDealerTypeEnum.DEFROST.getCode().equals(capital.getType())).findFirst().orElse(null); + if(alreadyCapital == null){ + ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null); + + //5.6 判断分销账户分销金额是否大于解冻金额 + BigDecimal freezeMoney = userCapital.getFreezeMoney(); + if(dealerUser != null && dealerUser.getFreezeMoney().compareTo(freezeMoney) >= 0){ + //5.7 账户解冻金额、可提现增加金额 + dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney)); + dealerUser.setMoney(dealerUser.getMoney().add(freezeMoney)); + baseMapper.updateById(dealerUser); + + //5.8 生成流水 + ShopDealerCapital dealerCapital = new ShopDealerCapital(); + String no = orderNoUtils.generate("C"); + dealerCapital.setNo(no); + dealerCapital.setUserId(k); + dealerCapital.setType(typeEnum.getCode()); + dealerCapital.setOrderNo(entity.getOrderNo()); + dealerCapital.setFlowType(updateEnum.getType()); + dealerCapital.setFreezeMoney(freezeMoney.negate()); + dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + dealerCapital.setMoney(freezeMoney); + dealerCapital.setMoneyAfter(dealerUser.getMoney()); + dealerCapital.setComments(updateEnum.getDescription()); + dealerCapital.setToUserId(entity.getOrderUserId()); + dealerCapital.setTenantId(TENANT_ID); + dealerCapital.setCreateTime(LocalDateTime.now()); + User loginUser = LoginUserUtil.getLoginUser(); + if (loginUser != null) { + dealerCapital.setCreator(loginUser.getUserId()); + } + shopDealerCapitalMapper.insert(dealerCapital); + } + } + } + }); + }else { + log.error("未查询到待解冻订单信息:" + entity.getOrderNo()); + } + }else { + throw new RuntimeException("暂不支持此变动类型业务！"); + } + return Boolean.TRUE; + } + + public ShopDealerUser getDealerUser(Integer userId){ + ShopDealerUser shopDealerUser = baseMapper.selectOne(new LambdaQueryWrapper().eq(ShopDealerUser::getUserId, userId)); + if(shopDealerUser == null){ + User user = userMapper.getById(userId); + if(user == null){ + throw new RuntimeException("用户信息不存在！"); + } + + ShopDealerUser dealerUser = new ShopDealerUser(); + dealerUser.setType(0); + dealerUser.setUserId(userId); + dealerUser.setAvatar(user.getAvatar()); + dealerUser.setRealName(user.getRealName()); + dealerUser.setMobile(user.getMobile()); + dealerUser.setMoney(BigDecimal.ZERO); + dealerUser.setFreezeMoney(BigDecimal.ZERO); + dealerUser.setTotalMoney(BigDecimal.ZERO); + dealerUser.setTenantId(TENANT_ID); + dealerUser.setCreateTime(LocalDateTime.now()); + dealerUser.setDealerLevel(0); + baseMapper.insert(dealerUser); + + shopDealerUser = dealerUser; + } + return shopDealerUser; + } + + + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 06a1b3a..ba64a85 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -7,12 +7,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.context.TenantContext; import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.config.CertificateProperties; +import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; +import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; import com.gxwebsoft.common.core.utils.*; import com.gxwebsoft.common.core.service.PaymentCacheService; import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService; import com.gxwebsoft.common.core.config.SpringContextUtil; import com.gxwebsoft.common.system.entity.Payment; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; +import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.*; +import com.gxwebsoft.shop.mapper.ShopGoodsMapper; +import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; import com.gxwebsoft.shop.service.*; import com.wechat.pay.java.core.RSAAutoCertificateConfig; import lombok.extern.slf4j.Slf4j; @@ -35,6 +44,7 @@ import com.wechat.pay.java.service.payments.model.Transaction; import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -44,6 +54,7 @@ import java.time.LocalDateTime; import java.time.OffsetDateTime; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -91,6 +102,14 @@ public class ShopOrderServiceImpl extends ServiceImpl().eq(ShopOrder::getVerifyCode, verifyDto.getVerifyCode())); + if(shopOrder == null){ + throw new RuntimeException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + + //4.判断当前订单状态是否允许核销 + if(Arrays.asList(2,3,4,6,7).contains(shopOrder.getOrderStatus())){ + throw new RuntimeException("订单当前状态不可核销！"); + } + + //5.判断订单是否已支付 + if(!shopOrder.getPayStatus()){ + throw new RuntimeException("订单未支付，不可核销！"); + } + + //6.判断是否已核销 + if(shopOrder.getVerifyStatus() != null && shopOrder.getVerifyStatus() == 1){ + throw new RuntimeException("此订单已核销,无需重复核销！"); + } + + shopOrder.setVerifyStatus(1); + shopOrder.setVerifyTime(LocalDateTime.now()); + shopOrder.setVerifyUser(loginUser.getUserId()); + + //7.只有推广结算才会记佣且判断是否在设定有效期内核销订单【是：计算订单核销佣金 否：不计算核销佣金】 + if(verifyType == 2 && shopOrder.getVerifyExpTime().isAfter(LocalDateTime.now())){ + List orderGoodsList = shopOrderGoodsService.getListByOrderId(shopOrder.getOrderId()); + if(!CollectionUtils.isEmpty(orderGoodsList)){ + List goodsIdList = orderGoodsList.stream().map(ShopOrderGoods::getGoodsId).distinct().collect(Collectors.toList()); + List shopGoods = shopGoodsMapper.selectBatchIds(goodsIdList); + + //计算推广佣金 + AtomicReference verifyMoney = new AtomicReference<>(BigDecimal.ZERO); + + orderGoodsList.forEach(orderGoods -> { + ShopGoods shopGood = shopGoods.stream().filter(goods -> orderGoods.getGoodsId().equals(goods.getGoodsId()) && + goods.getVerifyRate().compareTo(BigDecimal.ZERO) > 0).findFirst().orElse(null); + + if (shopGood != null) { + // 计算单商品核价金额 + BigDecimal money = orderGoods.getPrice() + .multiply(BigDecimal.valueOf(orderGoods.getTotalNum())) + .multiply(shopGood.getVerifyRate()) + .divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); // 除100，保留2位小数 + + // ✅ 原子更新（关键！） + verifyMoney.set(verifyMoney.get().add(money)); + } + }); + shopOrder.setVerifyMoney(verifyMoney.get()); + + //结算推广佣金 + if(verifyMoney.get().compareTo(BigDecimal.ZERO) > 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(loginUser.getUserId()); + reduceDto.setOrderUserId(shopOrder.getUserId()); + reduceDto.setOrderNo(shopOrder.getOrderNo()); + reduceDto.setPrice(verifyMoney.get()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.PROMOTION_INCOME); + + Boolean reduceBalance = shopDealerUserService.reduceBalance(reduceDto); + if(!reduceBalance){ + log.error("推广核销失败，结算推广佣金失败：" + reduceDto); + } + + } + } + } + + //8.判断是否自提订单，如是自提订单需调整为订单完成，用户已收货状态 + if(shopOrder.getOrderType() != null && shopOrder.getOrderType() == 2){ + shopOrder.setOrderStatus(1); + shopOrder.setDeliveryStatus(20); + + //分销佣金结算【团队长管理津贴、股东分红在订单完成后再结算】 + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST); + reduceDto.setOrderUserId(shopOrder.getUserId()); + reduceDto.setOrderNo(shopOrder.getOrderNo()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW); + + Boolean reduceBalance = shopDealerUserService.reduceBalance(reduceDto); + if(!reduceBalance){ + log.error("分销核销失败，分销结算失败：" + reduceDto); + } + } + return baseMapper.updateById(shopOrder) > 0; + }catch (Exception e){ + throw new RuntimeException("核销失败：" + e.getMessage()); + } + } + private static Long getLong(Map raw, String key) { Object value = raw.get(key); if (value == null) { From 82ce7758074dfdb5cd29f0443f0e4b7edbc57aa3 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Fri, 8 May 2026 09:36:05 +0800 Subject: [PATCH 35/60] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=AB=AF=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BF=9D=E8=AF=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E8=83=BD=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD=202.?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=81=E6=B0=B4=E8=AE=A2=E5=8D=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B7=E5=85=B7=E4=BD=93=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/glt/entity/GltTicketOrder.java | 4 +++ .../impl/GltTicketOrderServiceImpl.java | 23 ++++++++++--- .../service/impl/ShopOrderServiceImpl.java | 33 +++++++++---------- src/main/resources/application.yml | 2 +- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index c200cfc..02a60ea 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -195,6 +195,10 @@ public class GltTicketOrder implements Serializable { @Schema(description = "楼层（步梯+送上楼时有值，从2开始）") private Integer deliveryFloor; + @Schema(description = "详细地址") + @TableField(exist = false) + private String fullAddress; + @Schema(description = "配送费（步梯+送上楼时计算：数量 × (楼层-1)）") private BigDecimal deliveryFee; diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index fceae4c..3951b4c 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -18,15 +18,14 @@ import com.gxwebsoft.glt.param.GltTicketOrderParam; import com.gxwebsoft.glt.service.GltTicketOrderService; import com.gxwebsoft.glt.service.GltUserTicketLogService; import com.gxwebsoft.glt.service.GltUserTicketService; -import com.gxwebsoft.shop.entity.ShopDealerCapital; -import com.gxwebsoft.shop.entity.ShopDealerUser; -import com.gxwebsoft.shop.entity.ShopOrder; -import com.gxwebsoft.shop.entity.ShopOrderGoods; +import com.gxwebsoft.shop.entity.*; +import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.service.ShopDealerUserService; import com.gxwebsoft.shop.service.ShopOrderGoodsService; import com.gxwebsoft.shop.service.ShopOrderService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,6 +38,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.LocalDateTime; import java.util.List; +import java.util.stream.Collectors; /** * 送水订单Service实现 @@ -83,11 +83,26 @@ public class GltTicketOrderServiceImpl extends ServiceImpl pageRel(GltTicketOrderParam param) { PageParam page = new PageParam<>(param); page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); + if(CollectionUtils.isNotEmpty(list)){ + List addressIdList = list.stream().map(GltTicketOrder::getAddressId).distinct().collect(Collectors.toList()); + List userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList); + if(CollectionUtils.isNotEmpty(userAddressList)){ + list.forEach(ticketOrder ->{ + ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address)).findFirst().orElse(null); + if(shopUserAddress != null){ + ticketOrder.setFullAddress(shopUserAddress.getFullAddress()); + } + }); + } + } return new PageResult<>(list, page.getTotal()); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index ba64a85..72be190 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -1,47 +1,46 @@ package com.gxwebsoft.shop.service.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.context.TenantContext; -import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.config.CertificateProperties; +import com.gxwebsoft.common.core.config.ConfigProperties; +import com.gxwebsoft.common.core.config.SpringContextUtil; +import com.gxwebsoft.common.core.context.TenantContext; import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; -import com.gxwebsoft.common.core.utils.*; -import com.gxwebsoft.common.core.service.PaymentCacheService; import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService; -import com.gxwebsoft.common.core.config.SpringContextUtil; +import com.gxwebsoft.common.core.service.PaymentCacheService; +import com.gxwebsoft.common.core.utils.*; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.Payment; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.common.system.service.PaymentService; +import com.gxwebsoft.common.system.service.SettingService; +import com.gxwebsoft.payment.constants.WechatPayType; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.ShopGoodsMapper; -import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; -import com.gxwebsoft.shop.service.*; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import lombok.extern.slf4j.Slf4j; -import com.gxwebsoft.common.system.service.PaymentService; -import com.gxwebsoft.common.system.service.SettingService; -import com.gxwebsoft.payment.constants.WechatPayType; import com.gxwebsoft.shop.mapper.ShopOrderMapper; +import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; import com.gxwebsoft.shop.param.ShopOrderParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.service.*; import com.wechat.pay.java.core.Config; +import com.wechat.pay.java.core.RSAAutoCertificateConfig; import com.wechat.pay.java.core.RSAConfig; import com.wechat.pay.java.core.RSAPublicKeyConfig; import com.wechat.pay.java.core.exception.ServiceException; import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension; import com.wechat.pay.java.service.payments.jsapi.model.*; -import com.wechat.pay.java.service.payments.nativepay.NativePayService; -// Native支付的类将使用完全限定名避免冲突 import com.wechat.pay.java.service.payments.model.Transaction; +import com.wechat.pay.java.service.payments.nativepay.NativePayService; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ada4ffe..261f2a1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -254,7 +254,7 @@ payment: # 开发环境配置 dev: # 开发环境回调地址（本地调试用） - notify-url: "http://frps-10550.s209.websoft.top/api/shop/shop-order/notify" + notify-url: "https://glt-dev-api.websoft.top/api/shop/shop-order/notify" # 开发环境是否启用环境感知 environment-aware: true From 3c7ee5057fabf5755c086c3e0993a30941eca28a Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Fri, 8 May 2026 09:58:23 +0800 Subject: [PATCH 36/60] =?UTF-8?q?swagger=E5=A2=9E=E5=8A=A0glt=E5=8C=85?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/common/core/config/SwaggerConfig.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java b/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java index 75b99c8..cb74c29 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java @@ -87,14 +87,15 @@ public class SwaggerConfig { } /** - * OA 模块分组 + * Glt 模块分组 */ @Bean - public GroupedOpenApi oaApi() { + public GroupedOpenApi gltApi() { return GroupedOpenApi.builder() - .group("oa") - .pathsToMatch("/api/oa/**") - .packagesToScan("com.gxwebsoft.oa") + .group("glt") + // 订单等用户侧接口在 shop 包内，但路径使用 /api/user/**（前端统一 user 侧 API 前缀） + .pathsToMatch("/api/glt/**", "/api/user/**") + .packagesToScan("com.gxwebsoft.glt") .build(); } From 81a9974e64af125683c2c3ee4aa9fb5cd282b710 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Fri, 8 May 2026 15:00:06 +0800 Subject: [PATCH 37/60] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=20?= =?UTF-8?q?2.=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E5=A2=9E=E5=8A=A0=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E6=B0=B4=E7=A5=A8=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=203.=E9=80=81=E6=B0=B4=E8=AE=A2=E5=8D=95=E3=80=81?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/glt/entity/GltTicketOrder.java | 5 +- .../glt/service/GltTicketIssueService.java | 25 ++++-- .../impl/GltTicketOrderServiceImpl.java | 10 ++- .../shop/controller/ShopOrderController.java | 16 ++-- .../gxwebsoft/shop/dto/PaySuccessTaskDto.java | 25 ++++++ .../shop/service/OrderBusinessService.java | 13 ++- src/main/resources/application-dev.yml | 13 ++- src/main/resources/application-glt3.yml | 86 ------------------- ...ication-glt2.yml => application-local.yml} | 21 ++--- src/main/resources/application.yml | 2 +- 10 files changed, 89 insertions(+), 127 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/dto/PaySuccessTaskDto.java delete mode 100644 src/main/resources/application-glt3.yml rename src/main/resources/{application-glt2.yml => application-local.yml} (80%) diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index 02a60ea..9060d9c 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -26,10 +26,13 @@ public class GltTicketOrder implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; + @Schema(description = "订单编号") + private String no; + @Schema(description = "用户水票ID") private Integer userTicketId; - @Schema(description = "订单编号") + @Schema(description = "关联订单编号") @TableField(exist = false) private String orderNo; diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 5cd7fbb..985ae98 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -130,10 +130,18 @@ public class GltTicketIssueService { tenantId, uniqueGoodsIds, orders.size(), success, skipped, failed); } + /** + * 商品订单支付成功后调后需处理业务 + * @param orderNo 订单号 + * @param tenantId 租户ID + */ @Async -// @Scheduled(cron = "0/1 * 4-22 * * ?") 每秒钟执行一次 - public void paySuccessExecute(String orderNo, Integer tenantId){ + public void paySuccessTask(String orderNo, Integer tenantId){ + //1.发送水票 suerTicketRelease(orderNo, tenantId); + + //2.优惠券扣减、积分发送、消息通知 + } /** @@ -148,18 +156,23 @@ public class GltTicketIssueService { return; } - //2.跳过已完成发放套票订单 + //2.只有水票订单才需要发送水票 + if(!(shopOrder.getWaterTicketFlag() != null && shopOrder.getWaterTicketFlag() == 1)){ + return; + } + + //3.跳过已完成发放套票订单 if(shopOrder.getOrderStatus() == 1){ return; } - //3.订单商品为空跳过执行 + //4.订单商品为空跳过执行 List goodsList = shopOrderGoodsService.getListByOrderIdIgnoreTenant(shopOrder.getOrderId()); if (CollectionUtils.isEmpty(goodsList)) { return; } - //4.执行水票发放业务【】 + //5.执行水票发放业务 AtomicBoolean release = new AtomicBoolean(false); goodsList.forEach(orderGood ->{ IssueOutcome outcome = transactionTemplate.execute(status -> doIssueOne(tenantId, shopOrder, orderGood)); @@ -168,7 +181,7 @@ public class GltTicketIssueService { } }); - //5.更新商品订单为已完成、已收到赠品状态 + //6.更新商品订单为已完成、已收到赠品状态 if (release.get()) { shopOrderService.update(new LambdaUpdateWrapper() .eq(ShopOrder::getOrderId, shopOrder.getOrderId()) diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 3951b4c..519d576 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -9,6 +9,7 @@ import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; @@ -86,6 +87,9 @@ public class GltTicketOrderServiceImpl extends ServiceImpl pageRel(GltTicketOrderParam param) { PageParam page = new PageParam<>(param); @@ -96,7 +100,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList); if(CollectionUtils.isNotEmpty(userAddressList)){ list.forEach(ticketOrder ->{ - ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address)).findFirst().orElse(null); + ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address.getId())).findFirst().orElse(null); if(shopUserAddress != null){ ticketOrder.setFullAddress(shopUserAddress.getFullAddress()); } @@ -131,6 +135,10 @@ public class GltTicketOrderServiceImpl extends ServiceImpl paySuccessTask(@RequestBody PaySuccessTaskDto taskDto){ + gltTicketIssueService.paySuccessTask(taskDto.getOrderNo(), taskDto.getTenantId()); + return success(Boolean.TRUE); + } + @Operation(summary = "更新订单支付状态", description = "用户支付成功后主动同步订单状态") @PutMapping("/payment-status") public ApiResult updateOrderPaymentStatus(@RequestBody UpdatePaymentStatusRequest request) { diff --git a/src/main/java/com/gxwebsoft/shop/dto/PaySuccessTaskDto.java b/src/main/java/com/gxwebsoft/shop/dto/PaySuccessTaskDto.java new file mode 100644 index 0000000..85a4cb9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/PaySuccessTaskDto.java @@ -0,0 +1,25 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * 支付成功执行请求类 + * + * @author xm + * @since 2026-05-04 + */ +@Data +@Schema(name = "PaySuccessTaskDto", description = "支付成功执行请求类") +public class PaySuccessTaskDto { + + @Schema(description = "订单号") + @NotBlank(message = "订单号不能为空") + private String orderNo; + + @Schema(description = "租户ID", example = "10584") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java index 232bbd7..b21251c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java +++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.shop.config.OrderConfigProperties; import com.gxwebsoft.shop.dto.OrderCreateRequest; import com.gxwebsoft.shop.entity.*; @@ -72,6 +73,9 @@ public class OrderBusinessService { @Resource private ShopFlashSaleActivityMapper shopFlashSaleActivityMapper; + @Resource + private OrderNoUtils orderNoUtils; + /** * 创建订单 * @@ -319,13 +323,8 @@ public class OrderBusinessService { log.debug("构建订单对象 - 租户ID：{}，用户ID：{}", shopOrder.getTenantId(), shopOrder.getUserId()); // 生成订单号（如果请求中没有提供） - if (shopOrder.getOrderNo() == null || shopOrder.getOrderNo().trim().isEmpty()) { - String generatedOrderNo = Long.toString(IdUtil.getSnowflakeNextId()); - shopOrder.setOrderNo(generatedOrderNo); - log.info("生成新订单号: {}", generatedOrderNo); - } else { - log.info("使用请求中的订单号: {}", shopOrder.getOrderNo()); - } + String orderNo = orderNoUtils.generate("L"); + shopOrder.setOrderNo(orderNo); // 设置默认备注 if (shopOrder.getComments() == null) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7c3a897..aeccfea 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,18 +7,17 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: modules password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - # redis - redis: - database: 0 - host: 8.134.55.105 - port: 16379 - password: redis_t74P8C + redis: + database: 0 + host: 1Panel-redis-GmNr + port: 6379 + password: redis_t74P8C # 日志配置 logging: diff --git a/src/main/resources/application-glt3.yml b/src/main/resources/application-glt3.yml deleted file mode 100644 index 6bd8987..0000000 --- a/src/main/resources/application-glt3.yml +++ /dev/null @@ -1,86 +0,0 @@ -# 服务器配置 -server: - port: 9300 -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: gltdb - password: EeD4FtzyA5ksj7Bk - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - druid: - remove-abandoned: true - - # redis - redis: - database: 0 - host: 1Panel-redis-GmNr - port: 6379 - password: redis_t74P8C - -# 日志配置 -logging: - file: - name: websoft-modules.log - level: - root: WARN - com.gxwebsoft: ERROR - com.baomidou.mybatisplus: ERROR - -socketio: - host: 0.0.0.0 #IP地址 - -# MQTT配置 -mqtt: - enabled: false # 启用MQTT服务 - host: tcp://132.232.214.96:1883 - username: swdev - password: Sw20250523 - client-id-prefix: hjm_car_ - topic: /SW_GPS/# - qos: 2 - connection-timeout: 10 - keep-alive-interval: 20 - auto-reconnect: true - -# 框架配置 -config: - # 文件服务器 - file-server: https://file-s209.shoplnk.cn - # 生产环境接口 - server-url: https://glt-server.websoft.top/api - # 业务模块接口 - api-url: https://glt-api.websoft.top/api - upload-path: /www/wwwroot/file.ws - - # 阿里云OSS云存储 - endpoint: https://oss-cn-shenzhen.aliyuncs.com - accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP - accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM - bucketName: oss-gxwebsoft - bucketDomain: https://oss.wsdns.cn - aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com - -# 生产环境证书配置 -certificate: - load-mode: VOLUME # 生产环境从Docker挂载卷加载 - cert-root-path: /www/wwwroot/file.ws - -# 支付配置缓存 -payment: - cache: - # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 - key-prefix: "Payment:1" - # 缓存过期时间（小时） - expire-hours: 24 -# 阿里云翻译配置 -aliyun: - translate: - access-key-id: LTAI5tEsyhW4GCKbds1qsopg - access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO - endpoint: mt.cn-hangzhou.aliyuncs.com -wechatpay: - transfer: - scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' diff --git a/src/main/resources/application-glt2.yml b/src/main/resources/application-local.yml similarity index 80% rename from src/main/resources/application-glt2.yml rename to src/main/resources/application-local.yml index b583eb8..e1e85a2 100644 --- a/src/main/resources/application-glt2.yml +++ b/src/main/resources/application-local.yml @@ -7,18 +7,17 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: gltdb - password: EeD4FtzyA5ksj7Bk + url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: modules + password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - # redis - redis: - database: 0 - host: 1Panel-redis-GmNr - port: 6379 - password: redis_t74P8C + redis: + database: 0 + host: 47.107.249.41 + port: 16379 + password: redis_t74P8C # 日志配置 logging: @@ -44,10 +43,8 @@ mqtt: # 框架配置 config: - # 基础模块接口 + # 开发环境接口 server-url: https://glt-server.websoft.top/api - # 业务模块接口 - api-url: https://glt-api.websoft.top/api upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) # 开发环境证书配置 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 261f2a1..f61bd6f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: # 多环境配置 spring: profiles: - active: dev + active: local application: name: server From c6cec21d126304eec0a9fcdada9db9489753b34f Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Sat, 9 May 2026 14:36:40 +0800 Subject: [PATCH 38/60] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=202.=E5=85=B3=E9=97=AD=E5=A5=97=E7=A5=A8?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E4=BB=BB=E5=8A=A1=E3=80=90=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=9B=9E=E8=B0=83=E5=8F=96=E4=BB=A3=E3=80=91?= =?UTF-8?q?=203.=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E8=A7=A3=E5=86=BB?= =?UTF-8?q?=E6=B0=B4=E7=A5=A8=E4=B8=9A=E5=8A=A1=EF=BC=8C=E6=AF=8F=E6=9C=88?= =?UTF-8?q?1=E5=8F=B7=E5=8D=B3=E5=8F=AF=E9=87=8A=E6=94=BE=E6=9C=AC?= =?UTF-8?q?=E6=9C=88=E6=B0=B4=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GltUserTicketReleaseController.java | 22 +++- .../glt/entity/GltUserTicketRelease.java | 5 +- .../mapper/GltUserTicketReleaseMapper.java | 7 ++ .../mapper/xml/GltUserTicketReleaseMapper.xml | 18 +++ .../glt/service/GltTicketIssueService.java | 2 +- .../glt/service/GltTicketRevokeService.java | 2 +- .../GltUserTicketAutoReleaseService.java | 6 +- .../GltUserTicketAutoReleaseServiceImpl.java | 118 ++++++++++++++++-- .../glt/task/GltTicketIssue10584Task.java | 2 +- .../task/GltUserTicketAutoReleaseTask.java | 12 +- src/main/resources/application-dev.yml | 10 +- src/main/resources/application-local.yml | 9 +- src/main/resources/application.yml | 2 + 13 files changed, 173 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltUserTicketReleaseController.java b/src/main/java/com/gxwebsoft/glt/controller/GltUserTicketReleaseController.java index 44198ba..eae605d 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltUserTicketReleaseController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltUserTicketReleaseController.java @@ -1,15 +1,15 @@ package com.gxwebsoft.glt.controller; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.glt.service.GltUserTicketReleaseService; import com.gxwebsoft.glt.entity.GltUserTicketRelease; import com.gxwebsoft.glt.param.GltUserTicketReleaseParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.glt.service.GltUserTicketReleaseService; +import com.gxwebsoft.glt.service.impl.GltUserTicketAutoReleaseServiceImpl; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,6 +31,9 @@ public class GltUserTicketReleaseController extends BaseController { @Resource private GltUserTicketReleaseService gltUserTicketReleaseService; + @Resource + private GltUserTicketAutoReleaseServiceImpl gltUserTicketAutoReleaseService; + @PreAuthorize("hasAuthority('glt:gltUserTicketRelease:list')") @Operation(summary = "分页查询水票释放") @GetMapping("/page") @@ -126,4 +129,11 @@ public class GltUserTicketReleaseController extends BaseController { return fail("删除失败"); } + @Operation(summary = "水票释放测试") + @PostMapping("/releaseTask") + public ApiResult releaseTask() { + gltUserTicketAutoReleaseService.releaseTask(); + return success(true); + } + } diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java index 18d6d92..0c3f0b2 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java @@ -26,7 +26,7 @@ public class GltUserTicketRelease implements Serializable { private Long id; @Schema(description = "水票ID") - private Long userTicketId; + private Integer userTicketId; @Schema(description = "用户ID") private Integer userId; @@ -56,6 +56,9 @@ public class GltUserTicketRelease implements Serializable { @Schema(description = "状态") private Integer status; + @Schema(description = "备注") + private String remark; + @Schema(description = "是否删除, 0否, 1是") @TableLogic private Integer deleted; diff --git a/src/main/java/com/gxwebsoft/glt/mapper/GltUserTicketReleaseMapper.java b/src/main/java/com/gxwebsoft/glt/mapper/GltUserTicketReleaseMapper.java index baf5639..d32ecd8 100644 --- a/src/main/java/com/gxwebsoft/glt/mapper/GltUserTicketReleaseMapper.java +++ b/src/main/java/com/gxwebsoft/glt/mapper/GltUserTicketReleaseMapper.java @@ -37,6 +37,13 @@ public interface GltUserTicketReleaseMapper extends BaseMapper selectListRel(@Param("param") GltUserTicketReleaseParam param); + /** + * 查询当月待释放水票数据 + * @param limitNum 查询数量 + * @return List + */ + List getThisMonthReleaseList(@Param("limitNum") Integer limitNum); + /** * 查询待释放且到期的记录（加行锁，防止多实例重复处理） * diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketReleaseMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketReleaseMapper.xml index a8364a9..e9d774c 100644 --- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketReleaseMapper.xml +++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketReleaseMapper.xml @@ -58,5 +58,23 @@ + diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 985ae98..10f33ef 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -501,7 +501,7 @@ public class GltTicketIssueService { LocalDateTime releaseTime, LocalDateTime now) { GltUserTicketRelease r = new GltUserTicketRelease(); - r.setUserTicketId(userTicket.getId() != null ? userTicket.getId().longValue() : null); + r.setUserTicketId(userTicket.getId() != null ? userTicket.getId() : null); r.setUserId(userTicket.getUserId()); r.setPeriodNo(periodNo); r.setReleaseQty(releaseQty); diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketRevokeService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketRevokeService.java index 196be88..af77ad2 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketRevokeService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketRevokeService.java @@ -133,7 +133,7 @@ public class GltTicketRevokeService { LambdaUpdateWrapper uw = new LambdaUpdateWrapper() .eq(GltUserTicketRelease::getTenantId, tenantId) .eq(GltUserTicketRelease::getDeleted, 0) - .eq(GltUserTicketRelease::getUserTicketId, userTicketId.longValue()) + .eq(GltUserTicketRelease::getUserTicketId, userTicketId) // status 为空时也视为“未完成” .and(w -> w.ne(GltUserTicketRelease::getStatus, RELEASE_STATUS_DONE) .or().isNull(GltUserTicketRelease::getStatus)) diff --git a/src/main/java/com/gxwebsoft/glt/service/GltUserTicketAutoReleaseService.java b/src/main/java/com/gxwebsoft/glt/service/GltUserTicketAutoReleaseService.java index 83a7fb3..188709a 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltUserTicketAutoReleaseService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltUserTicketAutoReleaseService.java @@ -17,10 +17,8 @@ public interface GltUserTicketAutoReleaseService { int releaseDue(LocalDateTime now, int batchSize); /** - * 释放到期的冻结水票（使用系统当前时间） + * 释放到期的冻结水票【当次执行1000条】 */ - default int releaseDue(int batchSize) { - return releaseDue(LocalDateTime.now(), batchSize); - } + void releaseTask(); } diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketAutoReleaseServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketAutoReleaseServiceImpl.java index fb576e4..9a7d894 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketAutoReleaseServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketAutoReleaseServiceImpl.java @@ -1,5 +1,6 @@ package com.gxwebsoft.glt.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; import com.gxwebsoft.glt.entity.GltUserTicketRelease; @@ -7,13 +8,20 @@ import com.gxwebsoft.glt.mapper.GltUserTicketLogMapper; import com.gxwebsoft.glt.mapper.GltUserTicketMapper; import com.gxwebsoft.glt.mapper.GltUserTicketReleaseMapper; import com.gxwebsoft.glt.service.GltUserTicketAutoReleaseService; -import lombok.RequiredArgsConstructor; +import com.gxwebsoft.glt.service.GltUserTicketLogService; +import com.gxwebsoft.glt.service.GltUserTicketReleaseService; +import com.gxwebsoft.glt.service.GltUserTicketService; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 冻结水票自动释放实现： @@ -23,7 +31,7 @@ import java.util.List; */ @Slf4j @Service -@RequiredArgsConstructor +@AllArgsConstructor public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoReleaseService { /** @@ -44,6 +52,13 @@ public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoRel private final GltUserTicketMapper userTicketMapper; private final GltUserTicketLogMapper userTicketLogMapper; + private GltUserTicketReleaseService gltUserTicketReleaseService; + + private GltUserTicketService gltUserTicketService; + + private GltUserTicketLogService gltUserTicketLogService; + + @Override @Transactional(rollbackFor = Exception.class) public int releaseDue(LocalDateTime now, int batchSize) { @@ -71,12 +86,7 @@ public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoRel continue; } - long userTicketIdLong = rel.getUserTicketId(); - if (userTicketIdLong > Integer.MAX_VALUE || userTicketIdLong < 1) { - markFailed(rel.getId(), now, "userTicketId超范围"); - continue; - } - Integer userTicketId = (int) userTicketIdLong; + Integer userTicketId = rel.getUserTicketId(); // 先释放冻结数量（条件更新，确保 frozen_qty >= qty） int updated = userTicketMapper.releaseFrozenQty( @@ -129,4 +139,96 @@ public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoRel releaseMapper.updateStatus(releaseId, RELEASE_STATUS_FAILED, now); log.warn("冻结水票释放标记失败 - releaseId={}, reason={}", releaseId, reason); } + + @Transactional + public void releaseTask() { + LocalDateTime now = LocalDateTime.now(); + log.info("***执行水票释放任务***-执行时间：{}", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + long start = System.currentTimeMillis(); + List releaseList = releaseMapper.getThisMonthReleaseList(1000); + if(CollectionUtils.isEmpty(releaseList)){ + log.info("***本轮任务无待释放水票数据***"); + return; + } + + //查询用户水票信息 + List userTickIdList = releaseList.stream().map(GltUserTicketRelease::getUserTicketId).distinct().collect(Collectors.toList()); + LambdaQueryWrapper userTicketLambdaQueryWrapper = new LambdaQueryWrapper().select(GltUserTicket::getId, GltUserTicket::getAvailableQty, + GltUserTicket::getFrozenQty, GltUserTicket::getReleasedQty).in(GltUserTicket::getId, userTickIdList); + List userTicketList = userTicketMapper.selectList(userTicketLambdaQueryWrapper); + + //创建修改用户水票集合、水票释放计划记录集合 + List updateUserTicketList = new ArrayList<>(); + List userTicketLogList = new ArrayList<>(); + + //遍历水票释放数据执行释放任务 + releaseList.forEach(release ->{ + //1.缺少水票ID、用户ID、租户ID记录错误记录 + if(release.getUserTicketId() == null || release.getUserId() == null || release.getTenantId() == null){ + release.setRemark("缺少userTicketId/userId/tenantId"); + release.setStatus(2); + release.setUpdateTime(now); + } + + GltUserTicket userTicket = userTicketList.stream().filter(gltUserTicket -> release.getUserTicketId().equals(gltUserTicket.getId())).findFirst().orElse(null); + if(userTicket != null){ + Integer releaseQty = release.getReleaseQty(); + if(userTicket.getFrozenQty() > releaseQty){ + //更改用户水票可用数量、冻结数量、已释放数量 + userTicket.setAvailableQty(userTicket.getAvailableQty() + releaseQty); + userTicket.setFrozenQty(userTicket.getFrozenQty() - releaseQty); + userTicket.setReleasedQty(userTicket.getReleasedQty() + releaseQty); + userTicket.setUpdateTime(now); + updateUserTicketList.add(userTicket); + + //记录水票释放计划为成功释放状态 + release.setStatus(1); + release.setRemark("success"); + release.setUpdateTime(now); + + //生成水票释放记录 + GltUserTicketLog ticketLog = new GltUserTicketLog(); + ticketLog.setUserTicketId(release.getUserTicketId()); + ticketLog.setChangeType(CHANGE_TYPE_RELEASE); + ticketLog.setChangeAvailable(releaseQty); + ticketLog.setChangeFrozen(-releaseQty); + ticketLog.setChangeUsed(0); + ticketLog.setAvailableAfter(userTicket.getAvailableQty()); + ticketLog.setFrozenAfter(userTicket.getFrozenQty()); + ticketLog.setUsedAfter(userTicket.getUsedQty()); + ticketLog.setOrderId(Integer.valueOf(String.valueOf(release.getId()))); + ticketLog.setUserId(release.getUserId()); + ticketLog.setComments("冻结水票到期释放"); + ticketLog.setTenantId(release.getTenantId()); + ticketLog.setCreateTime(now); + ticketLog.setUpdateTime(now); + userTicketLogList.add(ticketLog); + }else { + release.setRemark("释放数量大于冻结数量,释放:" + releaseQty + "，冻结:" + userTicket.getFrozenQty()); + release.setStatus(2); + release.setUpdateTime(LocalDateTime.now()); + } + }else { + release.setRemark("查询不到水票数据"); + release.setStatus(2); + release.setUpdateTime(LocalDateTime.now()); + } + }); + + if(CollectionUtils.isNotEmpty(releaseList)){ + gltUserTicketReleaseService.updateBatchById(releaseList); + } + + if(CollectionUtils.isNotEmpty(updateUserTicketList)){ + gltUserTicketService.updateBatchById(updateUserTicketList); + } + + if(CollectionUtils.isNotEmpty(userTicketLogList)){ + gltUserTicketLogService.saveBatch(userTicketLogList); + } + + long end = System.currentTimeMillis(); + long costMs = end - start; + log.info("***执行水票释放任务完成*** 执行耗时：{} ms", costMs); + } } diff --git a/src/main/java/com/gxwebsoft/glt/task/GltTicketIssue10584Task.java b/src/main/java/com/gxwebsoft/glt/task/GltTicketIssue10584Task.java index 8d0d103..a4f8ce6 100644 --- a/src/main/java/com/gxwebsoft/glt/task/GltTicketIssue10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/GltTicketIssue10584Task.java @@ -33,7 +33,7 @@ public class GltTicketIssue10584Task { private final AtomicBoolean running = new AtomicBoolean(false); - @Scheduled(cron = "${glt.ticket.issue10584.cron:0/15 * * * * ?}") +// @Scheduled(cron = "${glt.ticket.issue10584.cron:0/15 * * * * ?}") @IgnoreTenant("定时任务无登录态，需忽略租户隔离；内部使用 tenantId=10584 精确过滤") public void run() { if (!running.compareAndSet(false, true)) { diff --git a/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java b/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java index 91855db..261a8c6 100644 --- a/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java +++ b/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java @@ -25,25 +25,17 @@ public class GltUserTicketAutoReleaseTask { private final GltUserTicketAutoReleaseService autoReleaseService; - @Value("${glt.ticket.auto-release.batch-size:200}") - private int batchSize; - private final AtomicBoolean running = new AtomicBoolean(false); - @Scheduled(cron = "${glt.ticket.auto-release.cron:0 */10 * * * ?}") + @Scheduled(cron = "${glt.ticket.auto-release.cron:0 */2 1-3 1 * ?}") @IgnoreTenant("定时任务无登录态，需忽略租户隔离；释放记录自带 tenantId，更新时会校验 tenantId") public void run() { if (!running.compareAndSet(false, true)) { log.warn("冻结水票自动释放任务仍在执行中，本轮跳过"); return; } - try { - LocalDateTime now = LocalDateTime.now(); - int released = autoReleaseService.releaseDue(now, Math.max(batchSize, 1)); - if (released > 0) { - log.info("冻结水票自动释放完成 - released={}, now={}", released, now); - } + autoReleaseService.releaseTask(); } finally { running.set(false); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index aeccfea..00df5b5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -13,11 +13,11 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - redis: - database: 0 - host: 1Panel-redis-GmNr - port: 6379 - password: redis_t74P8C + redis: + database: 0 + host: 127.0.0.1 + port: 6379 + password: redis_t74P8C # 日志配置 logging: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index e1e85a2..c22fd88 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -13,11 +13,10 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - redis: - database: 0 - host: 47.107.249.41 - port: 16379 - password: redis_t74P8C + redis: + database: 0 + host: localhost + port: 6379 # 日志配置 logging: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f61bd6f..910449c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,6 +5,8 @@ server: spring: profiles: active: local +# active: dev +# active: prod application: name: server From bc88f54c248f5bd53fbf5def31dbe10d5093a433 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Sat, 9 May 2026 14:56:53 +0800 Subject: [PATCH 39/60] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E4=B8=9A=E5=8A=A1=E3=80=81=E6=B0=B4=E7=A5=A8?= =?UTF-8?q?=E8=A7=A3=E5=86=BB=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/GltUserTicketAutoReleaseTask.java | 11 +++--- .../shop/controller/ShopOrderController.java | 37 +++++++++---------- .../shop/service/OrderBusinessService.java | 21 +++++------ 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java b/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java index 261a8c6..0aaabe5 100644 --- a/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java +++ b/src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java @@ -4,18 +4,19 @@ import com.gxwebsoft.common.core.annotation.IgnoreTenant; import com.gxwebsoft.glt.service.GltUserTicketAutoReleaseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; import java.util.concurrent.atomic.AtomicBoolean; /** - * 冻结水票自动释放任务： - * - 扫描 glt_user_ticket_release 中到期且待释放（status=0）的记录 - * - 释放成功：frozen -> available，并将 release.status 置为 1 + * 冻结水票自动释放任务：每月1日凌晨1-3点每2分钟执行一次任务 + * - 扫描 glt_user_ticket_release 中本月到期且待释放（status=0）的记录 + * - 释放成功： + * 1.修改水票释放任务为已释放状态 glt_user_ticket_release + * 2.修改个人水票中：可用数量、冻结数量、已释放数量 glt_user_ticket + * 3.同步生产水票释放记录数据 glt_user_ticket_log */ @Slf4j @Component diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 0b30c59..efba38e 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -5,42 +5,41 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.config.CertificateProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; +import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.utils.CertificateLoader; +import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.utils.WechatCertAutoConfig; import com.gxwebsoft.common.core.utils.WechatPayConfigValidator; +import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.Payment; +import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.glt.service.GltTicketIssueService; -import com.gxwebsoft.shop.dto.*; -import com.gxwebsoft.shop.entity.ShopOrderDelivery; -import com.gxwebsoft.shop.entity.ShopUserAddress; -import com.gxwebsoft.shop.service.*; import com.gxwebsoft.glt.service.GltTicketRevokeService; -import com.gxwebsoft.shop.service.impl.KuaiDi100Impl; -import com.gxwebsoft.shop.task.OrderAutoCancelTask; -import com.gxwebsoft.shop.entity.ShopOrder; -import com.gxwebsoft.shop.param.ShopOrderParam; -import com.gxwebsoft.payment.service.PaymentService; import com.gxwebsoft.payment.dto.PaymentResponse; import com.gxwebsoft.payment.enums.PaymentType; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.payment.service.PaymentService; +import com.gxwebsoft.shop.dto.*; +import com.gxwebsoft.shop.entity.ShopOrder; +import com.gxwebsoft.shop.entity.ShopOrderDelivery; +import com.gxwebsoft.shop.entity.ShopUserAddress; +import com.gxwebsoft.shop.param.ShopOrderParam; +import com.gxwebsoft.shop.service.*; +import com.gxwebsoft.shop.service.impl.KuaiDi100Impl; +import com.gxwebsoft.shop.task.OrderAutoCancelTask; +import com.wechat.pay.java.core.RSAAutoCertificateConfig; import com.wechat.pay.java.core.notification.NotificationConfig; import com.wechat.pay.java.core.notification.NotificationParser; import com.wechat.pay.java.core.notification.RequestParam; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; import com.wechat.pay.java.service.payments.model.Transaction; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java index b21251c..7ac1629 100644 --- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java +++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java @@ -86,41 +86,38 @@ public class OrderBusinessService { @Transactional(rollbackFor = Exception.class) public Map createOrder(OrderCreateRequest request, User loginUser) { - // 1. 参数校验 + //1. 参数校验 validateOrderRequest(request, loginUser); - // 2. 构建订单对象 + //2. 构建订单对象 ShopOrder shopOrder = buildShopOrder(request, loginUser); - // 3. 处理收货地址信息 + //3. 处理收货地址信息 processDeliveryAddress(shopOrder, request, loginUser); - // 3.1 下单时校验配送范围（电子围栏） + //4. 下单时校验配送范围（电子围栏） validateDeliveryFenceIfNeeded(shopOrder, loginUser); - // 4. 应用业务规则 - applyBusinessRules(shopOrder, loginUser); - - // 如果商品仅有一个则更新formId + //5.如果商品仅有一个则更新formId if (request.getGoodsItems().size() == 1) { shopOrder.setFormId(request.getGoodsItems().get(0).getGoodsId()); } - // 5. 保存订单 + //6.保存订单 boolean saved = shopOrderService.save(shopOrder); if (!saved) { throw new BusinessException("订单保存失败"); } - // 6. 保存订单商品 + //7.保存订单商品 saveOrderGoods(request, shopOrder); - // 7. 标记优惠券为已使用 + //8.标记优惠券为已使用 if (shopOrder.getCouponId() != null && shopOrder.getCouponId() > 0) { markCouponAsUsed(shopOrder.getCouponId(), shopOrder.getOrderId()); } - // 8. 创建微信支付订单 + //9.创建微信支付订单 try { return shopOrderService.createWxOrder(shopOrder); } catch (Exception e) { From 991b6fe52988466fd905fddecdc4300b9e686471 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Mon, 11 May 2026 17:55:48 +0800 Subject: [PATCH 40/60] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=94=80=E3=80=81=E5=88=86=E6=B6=A6=E3=80=81=E5=88=86?= =?UTF-8?q?=E7=BA=A2=E7=BB=93=E7=AE=97=E7=AE=97=E6=B3=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=202.=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A2=9E=E5=8A=A0=E6=89=A7=E8=A1=8C=E5=88=86?= =?UTF-8?q?=E9=94=80=E5=91=98=E5=88=86=E9=94=80=E3=80=81=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=97=A8=E5=BA=97/=E6=9C=8D=E5=8A=A1=E5=95=86=E5=88=86?= =?UTF-8?q?=E9=94=80=E4=B8=9A=E5=8A=A1=E3=80=81=E6=89=A7=E8=A1=8C=E6=80=BB?= =?UTF-8?q?=E5=88=86=E7=BA=A2=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD=203.?= =?UTF-8?q?=E9=85=8D=E9=80=81=E5=91=98=E5=AE=8C=E6=88=90=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=A3=E5=86=BB=E5=95=86=E5=93=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD=204.=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BB=93=E7=AE=97=E5=8D=95=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E9=97=A8=E5=BA=97/=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E5=81=9A=E8=AE=A1=E7=AE=97=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/WxLoginController.java | 1700 ++++++++--------- .../glt/service/GltTicketIssueService.java | 10 +- .../impl/GltTicketOrderServiceImpl.java | 23 +- .../task/DealerOrderSettlement10584Task.java | 467 ++++- .../shop/entity/ShopDealerOrder.java | 55 +- .../shop/mapper/ShopDealerRefereeMapper.java | 7 + .../shop/mapper/ShopOrderMapper.java | 9 +- .../mapper/xml/ShopDealerRefereeMapper.xml | 11 + .../shop/mapper/xml/ShopOrderMapper.xml | 22 + .../gxwebsoft/shop/vo/ShopOrderGoodsVO.java | 47 + 10 files changed, 1457 insertions(+), 894 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsVO.java diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java index 533bb03..3c3942d 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -1,851 +1,851 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.gxwebsoft.cms.entity.CmsWebsite; -import com.gxwebsoft.cms.service.CmsWebsiteService; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.security.JwtSubject; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.UserParam; -import com.gxwebsoft.common.system.result.LoginResult; -import com.gxwebsoft.common.system.service.*; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import okhttp3.*; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RequestBody; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.time.Instant; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeUnit; - -import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN; -import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; -import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY; - -@RestController -@RequestMapping("/api/wx-login") -@Tag(name = "微信小程序登录API") -public class WxLoginController extends BaseController { - private final StringRedisTemplate redisTemplate; - private final OkHttpClient http = new OkHttpClient(); - private final ObjectMapper om; - private volatile long tokenExpireEpoch = 0L; // 过期的 epoch 秒 - @Resource - private SettingService settingService; - @Resource - private UserService userService; - @Resource - private ConfigProperties configProperties; - @Resource - private UserRoleService userRoleService; - @Resource - private LoginRecordService loginRecordService; - @Resource - private RoleService roleService; - @Resource - private RedisUtil redisUtil; - @Resource - private RequestUtil requestUtil; - @Resource - private ConfigProperties config; - @Resource - private UserRefereeService userRefereeService; - @Resource - private CmsWebsiteService cmsWebsiteService; - - - public WxLoginController(StringRedisTemplate redisTemplate, ObjectMapper objectMapper) { - this.redisTemplate = redisTemplate; - this.om = objectMapper; - } - - @Operation(summary = "获取微信AccessToken") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/getAccessToken") - public ApiResult getMpAccessToken() { - return success("操作成功", getAccessToken()); - } - - @Operation(summary = "获取微信openId") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/getOpenId") - public ApiResult getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) { - // 1.获取openid - JSONObject result = getOpenIdByCode(userParam); - String openid = result.getString("openid"); - String unionid = result.getString("unionid"); - if (openid == null) { - return fail("获取openid失败", null); - } - // 2.通过openid查询用户是否已存在 - User user = userService.getByOauthId(userParam); - // 3.存在则签发token并返回登录成功,不存在则注册新用户 - if (user == null) { - user = addUser(userParam); - } - // 4.签发token - loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request); - String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), - configProperties.getTokenExpireTime(), configProperties.getTokenKey()); - return success("登录成功", new LoginResult(access_token, user)); - } - - @Operation(summary = "微信授权手机号码并登录") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/loginByMpWxPhone") - public ApiResult loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) { - // 获取手机号码 - String phone = getPhoneByCode(userParam); - if (phone == null) { - String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); - redisTemplate.delete(key); - throw new BusinessException("授权失败，请重试"); - } - // 查询是否存在 - User user = userService.getByPhone(phone); - // 不存在则注册 - if (user == null) { - if ((userParam.getOpenid() == null || userParam.getOpenid().isEmpty()) && userParam.getAuthCode() != null) { - UserParam userParam2 = new UserParam(); - userParam2.setCode(userParam.getAuthCode()); - JSONObject result = getOpenIdByCode(userParam2); - String openid = result.getString("openid"); -// String unionid = result.getString("unionid"); - userParam.setOpenid(openid); - } - userParam.setPhone(phone); - user = addUser(userParam); - user.setRecommend(1); - } else { - // 存在则检查绑定上级 - if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { - UserReferee check = userRefereeService.check(user.getUserId(), userParam.getRefereeId()); - if (check == null) { - UserReferee userReferee = new UserReferee(); - userReferee.setDealerId(userParam.getRefereeId()); - userReferee.setUserId(user.getUserId()); - userRefereeService.save(userReferee); - } - } - } - // 签发token - String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), - configProperties.getTokenExpireTime(), configProperties.getTokenKey()); - loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request); - // 附加体育中心项目用户信息 -// user.setBookingUser(); - return success("登录成功", new LoginResult(access_token, user)); - } - - @Operation(summary = "微信授权手机号码并更新") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/updatePhoneByMpWx") - public ApiResult updatePhoneByMpWx(@RequestBody UserParam userParam) { - // 获取微信授权手机号 - String phone = getPhoneByCode(userParam); - // 查询当前用户 - User user = userService.getById(userParam.getUserId()); - if (user != null && phone != null) { - user.setPhone(phone); - userService.updateUser(user); - return success("更新成功", phone); - } - return fail("更新失败"); - } - - /** - * 新用户注册 - */ - private User addUser(UserParam userParam) { - User addUser = new User(); - // 注册用户 - addUser.setStatus(0); - addUser.setUsername(createUsername("wx_")); - addUser.setNickname("微信用户"); - addUser.setPlatform(MP_WEIXIN); - addUser.setGradeId(2); - if (userParam.getGradeId() != null) { - addUser.setGradeId(userParam.getGradeId()); - } - if (userParam.getPhone() != null) { - addUser.setPhone(userParam.getPhone()); - } - if (StrUtil.isNotBlank(userParam.getOpenid())) { - addUser.setOpenid(userParam.getOpenid()); - } - if (StrUtil.isNotBlank(userParam.getUnionid())) { - addUser.setUnionid(userParam.getUnionid()); - } - addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); - addUser.setTenantId(getTenantId()); - addUser.setRecommend(1); - Role role = roleService.getOne(new QueryWrapper().eq("role_code", "user"), false); - addUser.setRoleId(role.getRoleId()); - if (userService.saveUser(addUser)) { - // 添加用户角色 - final UserRole userRole = new UserRole(); - userRole.setUserId(addUser.getUserId()); - userRole.setTenantId(addUser.getTenantId()); - userRole.setRoleId(addUser.getRoleId()); - userRoleService.save(userRole); - } - // 绑定关系 - if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { - UserReferee check = userRefereeService.check(addUser.getUserId(), userParam.getRefereeId()); - if (check == null) { - UserReferee userReferee = new UserReferee(); - userReferee.setDealerId(userParam.getRefereeId()); - userReferee.setUserId(addUser.getUserId()); - userRefereeService.save(userReferee); - } - } - return addUser; - } - - // 获取openid - private JSONObject getOpenIdByCode(UserParam userParam) { - // 从缓存获取微信小程序配置信息 - JSONObject setting = getWxConfigFromCache(getTenantId()); - // 获取openId - String apiUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + setting.getString("appId") + "&secret=" + setting.getString("appSecret") + "&js_code=" + userParam.getCode() + "&grant_type=authorization_code"; - // 执行get请求 - String result = HttpUtil.get(apiUrl); - // 解析access_token - return JSON.parseObject(result); - } - - /** - * 获取微信手机号码 - * - * @param userParam 需要传微信凭证code - */ - private String getPhoneByCode(UserParam userParam) { - // 获取手机号码 - String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken(); - HashMap paramMap = new HashMap<>(); - if (StrUtil.isBlank(userParam.getCode())) { - throw new BusinessException("code不能为空"); - } - paramMap.put("code", userParam.getCode()); - // 执行post请求 - String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap)); - JSONObject json = JSON.parseObject(post); - if (json.get("errcode").equals(0)) { - JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info")); - // 微信用户的手机号码 - final String phoneNumber = phoneInfo.getString("phoneNumber"); - // 验证手机号码 -// if (userParam.getNotVerifyPhone() == null && !Validator.isMobile(phoneNumber)) { -// String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); -// redisTemplate.delete(key); -// throw new BusinessException("手机号码格式不正确"); +//package com.gxwebsoft.common.system.controller; +// +//import cn.hutool.core.io.FileUtil; +//import cn.hutool.core.util.RandomUtil; +//import cn.hutool.core.util.StrUtil; +//import cn.hutool.http.HttpRequest; +//import cn.hutool.http.HttpUtil; +//import com.alibaba.fastjson.JSON; +//import com.alibaba.fastjson.JSONObject; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.fasterxml.jackson.databind.JsonNode; +//import com.fasterxml.jackson.databind.ObjectMapper; +//import com.gxwebsoft.cms.entity.CmsWebsite; +//import com.gxwebsoft.cms.service.CmsWebsiteService; +//import com.gxwebsoft.common.core.config.ConfigProperties; +//import com.gxwebsoft.common.core.exception.BusinessException; +//import com.gxwebsoft.common.core.security.JwtSubject; +//import com.gxwebsoft.common.core.security.JwtUtil; +//import com.gxwebsoft.common.core.utils.CommonUtil; +//import com.gxwebsoft.common.core.utils.RedisUtil; +//import com.gxwebsoft.common.core.utils.RequestUtil; +//import com.gxwebsoft.common.core.web.ApiResult; +//import com.gxwebsoft.common.core.web.BaseController; +//import com.gxwebsoft.common.system.entity.*; +//import com.gxwebsoft.common.system.param.UserParam; +//import com.gxwebsoft.common.system.result.LoginResult; +//import com.gxwebsoft.common.system.service.*; +//import io.swagger.v3.oas.annotations.tags.Tag; +//import io.swagger.v3.oas.annotations.Operation; +//import okhttp3.*; +//import org.springframework.data.redis.core.StringRedisTemplate; +//import org.springframework.transaction.annotation.Transactional; +//import org.springframework.web.bind.annotation.*; +//import org.springframework.web.bind.annotation.RequestBody; +// +//import javax.annotation.Resource; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +//import java.io.File; +//import java.io.IOException; +//import java.time.Instant; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +//import java.util.concurrent.TimeUnit; +//import java.util.concurrent.TimeUnit; +// +//import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN; +//import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; +//import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY; +// +//@RestController +//@RequestMapping("/api/wx-login") +//@Tag(name = "微信小程序登录API") +//public class WxLoginController extends BaseController { +// private final StringRedisTemplate redisTemplate; +// private final OkHttpClient http = new OkHttpClient(); +// private final ObjectMapper om; +// private volatile long tokenExpireEpoch = 0L; // 过期的 epoch 秒 +// @Resource +// private SettingService settingService; +// @Resource +// private UserService userService; +// @Resource +// private ConfigProperties configProperties; +// @Resource +// private UserRoleService userRoleService; +// @Resource +// private LoginRecordService loginRecordService; +// @Resource +// private RoleService roleService; +// @Resource +// private RedisUtil redisUtil; +// @Resource +// private RequestUtil requestUtil; +// @Resource +// private ConfigProperties config; +// @Resource +// private UserRefereeService userRefereeService; +// @Resource +// private CmsWebsiteService cmsWebsiteService; +// +// +// public WxLoginController(StringRedisTemplate redisTemplate, ObjectMapper objectMapper) { +// this.redisTemplate = redisTemplate; +// this.om = objectMapper; +// } +// +// @Operation(summary = "获取微信AccessToken") +// @Transactional(rollbackFor = {Exception.class}) +// @PostMapping("/getAccessToken") +// public ApiResult getMpAccessToken() { +// return success("操作成功", getAccessToken()); +// } +// +// @Operation(summary = "获取微信openId") +// @Transactional(rollbackFor = {Exception.class}) +// @PostMapping("/getOpenId") +// public ApiResult getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) { +// // 1.获取openid +// JSONObject result = getOpenIdByCode(userParam); +// String openid = result.getString("openid"); +// String unionid = result.getString("unionid"); +// if (openid == null) { +// return fail("获取openid失败", null); +// } +// // 2.通过openid查询用户是否已存在 +// User user = userService.getByOauthId(userParam); +// // 3.存在则签发token并返回登录成功,不存在则注册新用户 +// if (user == null) { +// user = addUser(userParam); +// } +// // 4.签发token +// loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request); +// String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), +// configProperties.getTokenExpireTime(), configProperties.getTokenKey()); +// return success("登录成功", new LoginResult(access_token, user)); +// } +// +// @Operation(summary = "微信授权手机号码并登录") +// @Transactional(rollbackFor = {Exception.class}) +// @PostMapping("/loginByMpWxPhone") +// public ApiResult loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) { +// // 获取手机号码 +// String phone = getPhoneByCode(userParam); +// if (phone == null) { +// String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); +// redisTemplate.delete(key); +// throw new BusinessException("授权失败，请重试"); +// } +// // 查询是否存在 +// User user = userService.getByPhone(phone); +// // 不存在则注册 +// if (user == null) { +// if ((userParam.getOpenid() == null || userParam.getOpenid().isEmpty()) && userParam.getAuthCode() != null) { +// UserParam userParam2 = new UserParam(); +// userParam2.setCode(userParam.getAuthCode()); +// JSONObject result = getOpenIdByCode(userParam2); +// String openid = result.getString("openid"); +//// String unionid = result.getString("unionid"); +// userParam.setOpenid(openid); +// } +// userParam.setPhone(phone); +// user = addUser(userParam); +// user.setRecommend(1); +// } else { +// // 存在则检查绑定上级 +// if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { +// UserReferee check = userRefereeService.check(user.getUserId(), userParam.getRefereeId()); +// if (check == null) { +// UserReferee userReferee = new UserReferee(); +// userReferee.setDealerId(userParam.getRefereeId()); +// userReferee.setUserId(user.getUserId()); +// userRefereeService.save(userReferee); +// } +// } +// } +// // 签发token +// String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), +// configProperties.getTokenExpireTime(), configProperties.getTokenKey()); +// loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request); +// // 附加体育中心项目用户信息 +//// user.setBookingUser(); +// return success("登录成功", new LoginResult(access_token, user)); +// } +// +// @Operation(summary = "微信授权手机号码并更新") +// @Transactional(rollbackFor = {Exception.class}) +// @PostMapping("/updatePhoneByMpWx") +// public ApiResult updatePhoneByMpWx(@RequestBody UserParam userParam) { +// // 获取微信授权手机号 +// String phone = getPhoneByCode(userParam); +// // 查询当前用户 +// User user = userService.getById(userParam.getUserId()); +// if (user != null && phone != null) { +// user.setPhone(phone); +// userService.updateUser(user); +// return success("更新成功", phone); +// } +// return fail("更新失败"); +// } +// +// /** +// * 新用户注册 +// */ +// private User addUser(UserParam userParam) { +// User addUser = new User(); +// // 注册用户 +// addUser.setStatus(0); +// addUser.setUsername(createUsername("wx_")); +// addUser.setNickname("微信用户"); +// addUser.setPlatform(MP_WEIXIN); +// addUser.setGradeId(2); +// if (userParam.getGradeId() != null) { +// addUser.setGradeId(userParam.getGradeId()); +// } +// if (userParam.getPhone() != null) { +// addUser.setPhone(userParam.getPhone()); +// } +// if (StrUtil.isNotBlank(userParam.getOpenid())) { +// addUser.setOpenid(userParam.getOpenid()); +// } +// if (StrUtil.isNotBlank(userParam.getUnionid())) { +// addUser.setUnionid(userParam.getUnionid()); +// } +// addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); +// addUser.setTenantId(getTenantId()); +// addUser.setRecommend(1); +// Role role = roleService.getOne(new QueryWrapper().eq("role_code", "user"), false); +// addUser.setRoleId(role.getRoleId()); +// if (userService.saveUser(addUser)) { +// // 添加用户角色 +// final UserRole userRole = new UserRole(); +// userRole.setUserId(addUser.getUserId()); +// userRole.setTenantId(addUser.getTenantId()); +// userRole.setRoleId(addUser.getRoleId()); +// userRoleService.save(userRole); +// } +// // 绑定关系 +// if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { +// UserReferee check = userRefereeService.check(addUser.getUserId(), userParam.getRefereeId()); +// if (check == null) { +// UserReferee userReferee = new UserReferee(); +// userReferee.setDealerId(userParam.getRefereeId()); +// userReferee.setUserId(addUser.getUserId()); +// userRefereeService.save(userReferee); +// } +// } +// return addUser; +// } +// +// // 获取openid +// private JSONObject getOpenIdByCode(UserParam userParam) { +// // 从缓存获取微信小程序配置信息 +// JSONObject setting = getWxConfigFromCache(getTenantId()); +// // 获取openId +// String apiUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + setting.getString("appId") + "&secret=" + setting.getString("appSecret") + "&js_code=" + userParam.getCode() + "&grant_type=authorization_code"; +// // 执行get请求 +// String result = HttpUtil.get(apiUrl); +// // 解析access_token +// return JSON.parseObject(result); +// } +// +// /** +// * 获取微信手机号码 +// * +// * @param userParam 需要传微信凭证code +// */ +// private String getPhoneByCode(UserParam userParam) { +// // 获取手机号码 +// String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken(); +// HashMap paramMap = new HashMap<>(); +// if (StrUtil.isBlank(userParam.getCode())) { +// throw new BusinessException("code不能为空"); +// } +// paramMap.put("code", userParam.getCode()); +// // 执行post请求 +// String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap)); +// JSONObject json = JSON.parseObject(post); +// if (json.get("errcode").equals(0)) { +// JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info")); +// // 微信用户的手机号码 +// final String phoneNumber = phoneInfo.getString("phoneNumber"); +// // 验证手机号码 +//// if (userParam.getNotVerifyPhone() == null && !Validator.isMobile(phoneNumber)) { +//// String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); +//// redisTemplate.delete(key); +//// throw new BusinessException("手机号码格式不正确"); +//// } +// return phoneNumber; +// } +// return null; +// } +// +// /** +// * 生成随机账号 +// * +// * @return username +// */ +// private String createUsername(String type) { +// return type.concat(RandomUtil.randomString(12)); +// } +// +// /** +// * 获取接口调用凭据AccessToken +// * ... +// */ +// public String getAccessToken() { +// Integer tenantId = getTenantId(); +// String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); +// +// // 从缓存获取微信小程序配置信息 +// JSONObject setting = getWxConfigFromCache(tenantId); +// if (setting == null) { +// throw new BusinessException("请先配置小程序"); +// } +// +// // 从缓存获取access_token +// String value = redisTemplate.opsForValue().get(key); +// if (value != null) { +// // 解析access_token +// JSONObject response = JSON.parseObject(value); +// String accessToken = response.getString("access_token"); +// if (accessToken != null) { +// return accessToken; +// } +// } +// +// // 微信获取凭证接口 +// String apiUrl = "https://api.weixin.qq.com/cgi-bin/token"; +// // 组装url参数 +// String url = apiUrl.concat("?grant_type=client_credential") +// .concat("&appid=").concat(setting.getString("appId")) +// .concat("&secret=").concat(setting.getString("appSecret")); +// +// // 执行get请求 +// String result = HttpUtil.get(url); +// // 解析access_token +// JSONObject response = JSON.parseObject(result); +// if (response.getString("access_token") != null) { +// // 存入缓存 +// redisTemplate.opsForValue().set(key, result, 7000L, TimeUnit.SECONDS); +// return response.getString("access_token"); +// } +// throw new BusinessException("小程序配置不正确"); +// } +// +// @Operation(summary = "获取微信openId并更新") +// @PostMapping("/getWxOpenId") +// public ApiResult getWxOpenId(@RequestBody UserParam userParam) { +// final User loginUser = getLoginUser(); +// if (loginUser == null) { +// return fail("请先登录"); +// } +// // 已存在直接返回 +// if (StrUtil.isNotBlank(loginUser.getOpenid())) { +// return success(loginUser); +// } +// // 请求微信接口获取openid +// String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; +// final HashMap map = new HashMap<>(); +// final JSONObject setting = getWxConfigFromCache(getTenantId()); +// final String appId = setting.getString("appId"); +// final String appSecret = setting.getString("appSecret"); +// map.put("appid", appId); +// map.put("secret", appSecret); +// map.put("js_code", userParam.getCode()); +// map.put("grant_type", "authorization_code"); +// final String response = HttpUtil.get(apiUrl, map); +// final JSONObject jsonObject = JSONObject.parseObject(response); +// String openid = jsonObject.getString("openid"); +// String sessionKey = jsonObject.getString("session_key"); +// String unionid = jsonObject.getString("unionid"); +// // 保存openID +// if (loginUser.getOpenid() == null || StrUtil.isBlank(loginUser.getOpenid())) { +// loginUser.setOpenid(openid); +// loginUser.setUnionid(unionid); +// requestUtil.updateUser(loginUser); +//// userService.updateById(loginUser); +// } +// return success("获取成功", jsonObject); +// } +// +// @Operation(summary = "仅获取微信openId") +// @PostMapping("/getWxOpenIdOnly") +// public ApiResult getWxOpenIdOnly(@RequestBody UserParam userParam) { +// +// String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; +// final HashMap map = new HashMap<>(); +// final JSONObject setting = getWxConfigFromCache(getTenantId()); +// final String appId = setting.getString("appId"); +// final String appSecret = setting.getString("appSecret"); +// map.put("appid", appId); +// map.put("secret", appSecret); +// map.put("js_code", userParam.getCode()); +// map.put("grant_type", "authorization_code"); +// final String response = HttpUtil.get(apiUrl, map); +// final JSONObject jsonObject = JSONObject.parseObject(response); +// return success("获取成功", jsonObject); +// } +// +// @Operation(summary = "获取微信小程序码-用户ID") +// @GetMapping("/getUserQRCode") +// public ApiResult getQRCode() { +// String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); +// final HashMap map = new HashMap<>(); +// map.put("path", "/package/user/qrcode?user_id=" + getLoginUserId()); +//// map.put("env_version","trial"); +// // 获取图片 Buffer +// byte[] qrCode = HttpRequest.post(apiUrl) +// .body(JSON.toJSONString(map)) +// .execute().bodyBytes(); +// +// // 保存的文件名称 +// final String fileName = CommonUtil.randomUUID8().concat(".png"); +// // 保存路径 +// String filePath = getUploadDir().concat("qrcode/") + fileName; +// File file = FileUtil.writeBytes(qrCode, filePath); +// if (file != null) { +// return success(config.getFileServer().concat("/qrcode/").concat(fileName)); +// } +// return fail("获取失败", null); +// } +// +// @Operation(summary = "获取微信小程序码-订单核销码") +// @GetMapping("/getOrderQRCode/{orderNo}") +// public ApiResult getOrderQRCode(@PathVariable("orderNo") String orderNo) { +// String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); +// final HashMap map = new HashMap<>(); +// map.put("path", "/package/admin/order-scan?orderNo=".concat(orderNo)); +// map.put("env_version", "release"); +// // 获取图片 Buffer +// byte[] qrCode = HttpRequest.post(apiUrl) +// .body(JSON.toJSONString(map)) +// .execute().bodyBytes(); +// +// // 保存的文件名称 +// final String fileName = CommonUtil.randomUUID8().concat(".png"); +// // 保存路径 +// String filePath = getUploadDir().concat("qrcode/") + fileName; +// File file = FileUtil.writeBytes(qrCode, filePath); +// if (file != null) { +// return success(config.getFileServer().concat("/qrcode/").concat(fileName)); +// } +// return fail("获取失败", null); +// } +// +// @Operation(summary = "获取微信小程序码-订单核销码-数量极多的业务场景") +// @GetMapping("/getOrderQRCodeUnlimited/{scene}") +// public void getOrderQRCodeUnlimited(@PathVariable("scene") String scene, HttpServletResponse response) throws IOException { +// try { +// // 从scene参数中解析租户ID +// System.out.println("scene = " + scene); +// Integer tenantId = extractTenantIdFromScene(scene); +// System.out.println("从scene参数中解析租户ID = " + tenantId); +// if (tenantId == null) { +// response.setStatus(HttpServletResponse.SC_BAD_REQUEST); +// response.getWriter().write("{\"error\":\"无法从scene参数中获取租户信息\"}"); +// return; +// } +// +// // 使用指定租户ID获取 access_token +// String accessToken = getAccessTokenForTenant(tenantId); +// String apiUrl = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken; +// +// final HashMap map = new HashMap<>(); +// map.put("scene", scene); +// map.put("page", "pages/index/index"); +// map.put("env_version", "release"); +// +// // 判断应用运行状态 +// final CmsWebsite website = cmsWebsiteService.getByTenantId(tenantId); +// if(website != null && Integer.valueOf(2).equals(website.getRunning())){ +// map.put("check_path",false); +// map.put("env_version","trial"); +// } +// +// String jsonBody = JSON.toJSONString(map); +// System.out.println("请求的 JSON body = " + jsonBody); +// +// // 获取微信 API 响应 +// cn.hutool.http.HttpResponse httpResponse = HttpRequest.post(apiUrl) +// .body(jsonBody) +// .execute(); +// +// byte[] responseBytes = httpResponse.bodyBytes(); +// String contentType = httpResponse.header("Content-Type"); +// +// // 检查响应内容类型，判断是否为错误响应 +// if (contentType != null && contentType.contains("application/json")) { +// // 微信返回了错误信息（JSON格式） +// String errorResponse = new String(responseBytes, "UTF-8"); +// System.err.println("微信 API 错误响应: " + errorResponse); +// +// // 返回错误信息给前端 +// response.setContentType("application/json;charset=UTF-8"); +// response.setStatus(HttpServletResponse.SC_BAD_REQUEST); +// response.getWriter().write(errorResponse); +// return; +// } +// +// // 成功获取二维码图片 +// response.setContentType("image/png"); +// response.setHeader("Cache-Control", "no-cache"); +// response.setHeader("Content-Disposition", "inline; filename=qrcode.png"); +// +// // 输出图片 +// response.getOutputStream().write(responseBytes); +// System.out.println("二维码生成成功，大小: " + responseBytes.length + " bytes"); +// +// } catch (Exception e) { +// System.err.println("生成二维码失败: " + e.getMessage()); +// e.printStackTrace(); +// +// // 返回错误信息 +// response.setContentType("application/json;charset=UTF-8"); +// response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); +// response.getWriter().write("{\"error\":\"生成二维码失败: " + e.getMessage() + "\"}"); +// } +// } +// +// @Operation(summary = "获取微信小程序码-用户ID") +// @GetMapping("/getQRCodeText") +// public byte[] getQRCodeText(String scene, String page, Integer width, +// Boolean isHyaline, String envVersion) throws IOException { +// HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/wxa/getwxacodeunlimit") +// .newBuilder() +// .addQueryParameter("access_token", getLocalAccessToken()) +// .build(); +// +// System.out.println("page = " + page); +// // 构造请求 JSON +// // 注意：scene 仅支持可见字符，长度上限 32，尽量 URL-safe（字母数字下划线等） +// // page 必须是已发布小程序内的路径（不带开头斜杠也可） +// var root = om.createObjectNode(); +// root.put("scene", scene); +// if (page != null) root.put("page", page); +// if (width != null) root.put("width", width); // 默认 430，建议 280~1280 +// if (isHyaline != null) root.put("is_hyaline", isHyaline); +// if (envVersion != null) root.put("env_version", envVersion); // release/trial/develop +// +// okhttp3.RequestBody reqBody = okhttp3.RequestBody.create( +// root.toString(), MediaType.parse("application/json; charset=utf-8")); +// Request req = new Request.Builder().url(url).post(reqBody).build(); +// +// try (Response resp = http.newCall(req).execute()) { +// if (!resp.isSuccessful()) { +// throw new IOException("HTTP " + resp.code() + " calling getwxacodeunlimit"); +// } +// MediaType ct = resp.body().contentType(); +// byte[] bytes = resp.body().bytes(); +// // 微信出错时返回 JSON，需要识别一下 +// if (ct != null && ct.subtype() != null && ct.subtype().contains("json")) { +// String err = new String(bytes); +// throw new IOException("WeChat error: " + err); +// } +// return bytes; // 成功就是图片二进制（PNG） +// } +// } +// +// /** +// * 获取/刷新 access_token +// */ +// public String getLocalAccessToken() throws IOException { +// long now = Instant.now().getEpochSecond(); +// String key = "AccessToken:Local:" + getTenantId(); +// +// // 从缓存获取access_token，使用JSON格式 +// String value = redisUtil.get(key); +// if (value != null && now < tokenExpireEpoch - 60) { +// try { +// // 尝试解析为JSON格式 +// JSONObject response = JSON.parseObject(value); +// String accessToken = response.getString("access_token"); +// if (accessToken != null) { +// System.out.println("从缓存获取到access_token(Local): " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); +// return accessToken; +// } +// } catch (Exception e) { +// // 如果解析失败，可能是旧格式的纯字符串token +// System.out.println("本地缓存token格式异常，使用原值: " + e.getMessage()); +// return value; +// } +// } +// +// // 从缓存获取微信小程序配置信息 +// Integer tenantId = getTenantId(); +// JSONObject setting = getWxConfigFromCache(tenantId); +// if (setting == null) { +// throw new IOException("请先配置小程序"); +// } +// +// String appId = setting.getString("appId"); +// String appSecret = setting.getString("appSecret"); +// +// if (appId == null || appSecret == null) { +// throw new IOException("小程序配置不完整，缺少 appId 或 appSecret"); +// } +// +// HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/cgi-bin/token") +// .newBuilder() +// .addQueryParameter("grant_type", "client_credential") +// .addQueryParameter("appid", appId) +// .addQueryParameter("secret", appSecret) +// .build(); +// +// Request req = new Request.Builder().url(url).get().build(); +// try (Response resp = http.newCall(req).execute()) { +// String body = resp.body().string(); +// JsonNode json = om.readTree(body); +// if (json.has("access_token")) { +// String token = json.get("access_token").asText(); +// long expiresIn = json.get("expires_in").asInt(7200); +// +// // 缓存完整的JSON响应，与其他方法保持一致 +// redisUtil.set(key, body, expiresIn, TimeUnit.SECONDS); +// tokenExpireEpoch = now + expiresIn; +// System.out.println("获取新的access_token成功(Local)，租户ID: " + tenantId); +// return token; +// } else { +// throw new IOException("Get access_token failed: " + body); +// } +// } +// } +// +// /** +// * 文件上传位置(服务器) +// */ +// private String getUploadDir() { +// return config.getUploadPath(); +// } +// +// @Operation(summary = "调试：检查微信小程序配置") +// @GetMapping("/debug/checkWxConfig") +// public ApiResult debugCheckWxConfig() { +// Integer tenantId = getTenantId(); +// Map result = new HashMap<>(); +// result.put("tenantId", tenantId); +// +// try { +// // 尝试从缓存获取配置 +// JSONObject setting = getWxConfigFromCache(tenantId); +// result.put("hasConfig", true); +// result.put("config", setting); +// result.put("cacheKey", MP_WX_KEY + tenantId); +// } catch (Exception e) { +// result.put("hasConfig", false); +// result.put("error", e.getMessage()); +// result.put("cacheKey", MP_WX_KEY + tenantId); +// +// // 提供创建配置的建议 +// Map suggestion = new HashMap<>(); +// suggestion.put("message", "请在Redis中创建微信小程序配置"); +// suggestion.put("cacheKey", MP_WX_KEY + tenantId); +// suggestion.put("tenantId", tenantId); +// suggestion.put("sampleConfig", createSampleWxConfig()); +// result.put("suggestion", suggestion); +// } +// +// return success("配置检查完成", result); +// } +// +// @Operation(summary = "调试：创建示例微信小程序配置") +// @PostMapping("/debug/createSampleWxConfig") +// public ApiResult debugCreateSampleWxConfig(@RequestBody Map params) { +// Integer tenantId = getTenantId(); +// +// String appId = params.get("appId"); +// String appSecret = params.get("appSecret"); +// +// if (appId == null || appSecret == null) { +// return fail("请提供 appId 和 appSecret", null); +// } +// +// try { +// // 直接在Redis中创建配置 +// String key = MP_WX_KEY + tenantId; +// +// // 创建配置内容 +// Map config = new HashMap<>(); +// config.put("appId", appId); +// config.put("appSecret", appSecret); +// config.put("tenantId", tenantId.toString()); +// config.put("settingKey", "mp-weixin"); +// config.put("settingId", "301"); +// +// // 保存到Redis缓存 +// redisUtil.set(key, JSON.toJSONString(config)); +// +// return success("微信小程序配置创建成功", config); +// } catch (Exception e) { +// return fail("创建配置失败: " + e.getMessage(), null); +// } +// } +// +// private Map createSampleWxConfig() { +// Map sample = new HashMap<>(); +// sample.put("appId", "wx_your_app_id_here"); +// sample.put("appSecret", "your_app_secret_here"); +// return sample; +// } +// +// @Operation(summary = "调试：获取AccessToken") +// @GetMapping("/debug/getAccessToken") +// public ApiResult debugGetAccessToken() { +// try { +// // 获取当前线程的租户ID +// Integer tenantId = getTenantId(); +// if (tenantId == null) { +// tenantId = 10550; // 默认租户 +// } +// +// System.out.println("=== 开始调试获取AccessToken，租户ID: " + tenantId + " ==="); +// +// // 手动调用获取AccessToken +// String accessToken = getAccessTokenForTenant(tenantId); +// +// String result = "获取AccessToken成功: " + (accessToken != null ? accessToken.substring(0, Math.min(10, accessToken.length())) + "..." : "null"); +// System.out.println("调试结果: " + result); +// +// return success(result); +// } catch (Exception e) { +// System.err.println("调试获取AccessToken异常: " + e.getMessage()); +// e.printStackTrace(); +// return fail("获取AccessToken失败: " + e.getMessage()); +// } +// } +// +// /** +// * 从Redis缓存中获取微信小程序配置 +// * @param tenantId 租户ID +// * @return 微信配置信息 +// */ +// private JSONObject getWxConfigFromCache(Integer tenantId) { +// String key = MP_WX_KEY + tenantId; +// String cacheValue = redisUtil.get(key); +// if (StrUtil.isBlank(cacheValue)) { +// throw new BusinessException("未找到微信小程序配置，请检查缓存key: " + key); +// } +// try { +// return JSON.parseObject(cacheValue); +// } catch (Exception e) { +// throw new BusinessException("微信小程序配置格式错误: " + e.getMessage()); +// } +// } +// +// /** +// * 从scene参数中提取租户ID +// * scene格式: uid_userId_tenantId（优先）或 uid_userId（兼容旧格式） +// */ +// private Integer extractTenantIdFromScene(String scene) { +// try { +// System.out.println("解析scene参数: " + scene); +// +// if (scene != null && scene.startsWith("uid_")) { +// String content = scene.substring(4); // 去掉"uid_"前缀 +// +// // 优先解析 uid_userId_tenantId 格式 +// String[] parts = content.split("_"); +// if (parts.length >= 2) { +// try { +// Integer tenantId = Integer.parseInt(parts[1]); +// System.out.println("从scene直接解析到tenantId = " + tenantId); +// return tenantId; +// } catch (NumberFormatException e) { +// System.err.println("scene中tenantId格式异常: " + parts[1]); +// } +// } +// +// // 兼容旧格式 uid_userId：根据用户ID查询租户ID +// if (parts.length == 1) { +// Integer userId = Integer.parseInt(parts[0]); +// System.out.println("userId = " + userId); +// try { +// List users = userService.listByIdIgnoreTenant(userId); +// System.out.println("查询到用户数量 = " + (users != null ? users.size() : 0)); +// if (users != null && !users.isEmpty()) { +// System.out.println("从用户ID " + userId + " 获取到租户ID: " + users.get(0).getTenantId()); +// return users.get(0).getTenantId(); +// } else { +// System.err.println("未找到用户ID: " + userId); // } - return phoneNumber; - } - return null; - } - - /** - * 生成随机账号 - * - * @return username - */ - private String createUsername(String type) { - return type.concat(RandomUtil.randomString(12)); - } - - /** - * 获取接口调用凭据AccessToken - * ... - */ - public String getAccessToken() { - Integer tenantId = getTenantId(); - String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); - - // 从缓存获取微信小程序配置信息 - JSONObject setting = getWxConfigFromCache(tenantId); - if (setting == null) { - throw new BusinessException("请先配置小程序"); - } - - // 从缓存获取access_token - String value = redisTemplate.opsForValue().get(key); - if (value != null) { - // 解析access_token - JSONObject response = JSON.parseObject(value); - String accessToken = response.getString("access_token"); - if (accessToken != null) { - return accessToken; - } - } - - // 微信获取凭证接口 - String apiUrl = "https://api.weixin.qq.com/cgi-bin/token"; - // 组装url参数 - String url = apiUrl.concat("?grant_type=client_credential") - .concat("&appid=").concat(setting.getString("appId")) - .concat("&secret=").concat(setting.getString("appSecret")); - - // 执行get请求 - String result = HttpUtil.get(url); - // 解析access_token - JSONObject response = JSON.parseObject(result); - if (response.getString("access_token") != null) { - // 存入缓存 - redisTemplate.opsForValue().set(key, result, 7000L, TimeUnit.SECONDS); - return response.getString("access_token"); - } - throw new BusinessException("小程序配置不正确"); - } - - @Operation(summary = "获取微信openId并更新") - @PostMapping("/getWxOpenId") - public ApiResult getWxOpenId(@RequestBody UserParam userParam) { - final User loginUser = getLoginUser(); - if (loginUser == null) { - return fail("请先登录"); - } - // 已存在直接返回 - if (StrUtil.isNotBlank(loginUser.getOpenid())) { - return success(loginUser); - } - // 请求微信接口获取openid - String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; - final HashMap map = new HashMap<>(); - final JSONObject setting = getWxConfigFromCache(getTenantId()); - final String appId = setting.getString("appId"); - final String appSecret = setting.getString("appSecret"); - map.put("appid", appId); - map.put("secret", appSecret); - map.put("js_code", userParam.getCode()); - map.put("grant_type", "authorization_code"); - final String response = HttpUtil.get(apiUrl, map); - final JSONObject jsonObject = JSONObject.parseObject(response); - String openid = jsonObject.getString("openid"); - String sessionKey = jsonObject.getString("session_key"); - String unionid = jsonObject.getString("unionid"); - // 保存openID - if (loginUser.getOpenid() == null || StrUtil.isBlank(loginUser.getOpenid())) { - loginUser.setOpenid(openid); - loginUser.setUnionid(unionid); - requestUtil.updateUser(loginUser); -// userService.updateById(loginUser); - } - return success("获取成功", jsonObject); - } - - @Operation(summary = "仅获取微信openId") - @PostMapping("/getWxOpenIdOnly") - public ApiResult getWxOpenIdOnly(@RequestBody UserParam userParam) { - - String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; - final HashMap map = new HashMap<>(); - final JSONObject setting = getWxConfigFromCache(getTenantId()); - final String appId = setting.getString("appId"); - final String appSecret = setting.getString("appSecret"); - map.put("appid", appId); - map.put("secret", appSecret); - map.put("js_code", userParam.getCode()); - map.put("grant_type", "authorization_code"); - final String response = HttpUtil.get(apiUrl, map); - final JSONObject jsonObject = JSONObject.parseObject(response); - return success("获取成功", jsonObject); - } - - @Operation(summary = "获取微信小程序码-用户ID") - @GetMapping("/getUserQRCode") - public ApiResult getQRCode() { - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); - final HashMap map = new HashMap<>(); - map.put("path", "/package/user/qrcode?user_id=" + getLoginUserId()); -// map.put("env_version","trial"); - // 获取图片 Buffer - byte[] qrCode = HttpRequest.post(apiUrl) - .body(JSON.toJSONString(map)) - .execute().bodyBytes(); - - // 保存的文件名称 - final String fileName = CommonUtil.randomUUID8().concat(".png"); - // 保存路径 - String filePath = getUploadDir().concat("qrcode/") + fileName; - File file = FileUtil.writeBytes(qrCode, filePath); - if (file != null) { - return success(config.getFileServer().concat("/qrcode/").concat(fileName)); - } - return fail("获取失败", null); - } - - @Operation(summary = "获取微信小程序码-订单核销码") - @GetMapping("/getOrderQRCode/{orderNo}") - public ApiResult getOrderQRCode(@PathVariable("orderNo") String orderNo) { - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); - final HashMap map = new HashMap<>(); - map.put("path", "/package/admin/order-scan?orderNo=".concat(orderNo)); - map.put("env_version", "release"); - // 获取图片 Buffer - byte[] qrCode = HttpRequest.post(apiUrl) - .body(JSON.toJSONString(map)) - .execute().bodyBytes(); - - // 保存的文件名称 - final String fileName = CommonUtil.randomUUID8().concat(".png"); - // 保存路径 - String filePath = getUploadDir().concat("qrcode/") + fileName; - File file = FileUtil.writeBytes(qrCode, filePath); - if (file != null) { - return success(config.getFileServer().concat("/qrcode/").concat(fileName)); - } - return fail("获取失败", null); - } - - @Operation(summary = "获取微信小程序码-订单核销码-数量极多的业务场景") - @GetMapping("/getOrderQRCodeUnlimited/{scene}") - public void getOrderQRCodeUnlimited(@PathVariable("scene") String scene, HttpServletResponse response) throws IOException { - try { - // 从scene参数中解析租户ID - System.out.println("scene = " + scene); - Integer tenantId = extractTenantIdFromScene(scene); - System.out.println("从scene参数中解析租户ID = " + tenantId); - if (tenantId == null) { - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.getWriter().write("{\"error\":\"无法从scene参数中获取租户信息\"}"); - return; - } - - // 使用指定租户ID获取 access_token - String accessToken = getAccessTokenForTenant(tenantId); - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken; - - final HashMap map = new HashMap<>(); - map.put("scene", scene); - map.put("page", "pages/index/index"); - map.put("env_version", "release"); - - // 判断应用运行状态 - final CmsWebsite website = cmsWebsiteService.getByTenantId(tenantId); - if(website != null && Integer.valueOf(2).equals(website.getRunning())){ - map.put("check_path",false); - map.put("env_version","trial"); - } - - String jsonBody = JSON.toJSONString(map); - System.out.println("请求的 JSON body = " + jsonBody); - - // 获取微信 API 响应 - cn.hutool.http.HttpResponse httpResponse = HttpRequest.post(apiUrl) - .body(jsonBody) - .execute(); - - byte[] responseBytes = httpResponse.bodyBytes(); - String contentType = httpResponse.header("Content-Type"); - - // 检查响应内容类型，判断是否为错误响应 - if (contentType != null && contentType.contains("application/json")) { - // 微信返回了错误信息（JSON格式） - String errorResponse = new String(responseBytes, "UTF-8"); - System.err.println("微信 API 错误响应: " + errorResponse); - - // 返回错误信息给前端 - response.setContentType("application/json;charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.getWriter().write(errorResponse); - return; - } - - // 成功获取二维码图片 - response.setContentType("image/png"); - response.setHeader("Cache-Control", "no-cache"); - response.setHeader("Content-Disposition", "inline; filename=qrcode.png"); - - // 输出图片 - response.getOutputStream().write(responseBytes); - System.out.println("二维码生成成功，大小: " + responseBytes.length + " bytes"); - - } catch (Exception e) { - System.err.println("生成二维码失败: " + e.getMessage()); - e.printStackTrace(); - - // 返回错误信息 - response.setContentType("application/json;charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - response.getWriter().write("{\"error\":\"生成二维码失败: " + e.getMessage() + "\"}"); - } - } - - @Operation(summary = "获取微信小程序码-用户ID") - @GetMapping("/getQRCodeText") - public byte[] getQRCodeText(String scene, String page, Integer width, - Boolean isHyaline, String envVersion) throws IOException { - HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/wxa/getwxacodeunlimit") - .newBuilder() - .addQueryParameter("access_token", getLocalAccessToken()) - .build(); - - System.out.println("page = " + page); - // 构造请求 JSON - // 注意：scene 仅支持可见字符，长度上限 32，尽量 URL-safe（字母数字下划线等） - // page 必须是已发布小程序内的路径（不带开头斜杠也可） - var root = om.createObjectNode(); - root.put("scene", scene); - if (page != null) root.put("page", page); - if (width != null) root.put("width", width); // 默认 430，建议 280~1280 - if (isHyaline != null) root.put("is_hyaline", isHyaline); - if (envVersion != null) root.put("env_version", envVersion); // release/trial/develop - - okhttp3.RequestBody reqBody = okhttp3.RequestBody.create( - root.toString(), MediaType.parse("application/json; charset=utf-8")); - Request req = new Request.Builder().url(url).post(reqBody).build(); - - try (Response resp = http.newCall(req).execute()) { - if (!resp.isSuccessful()) { - throw new IOException("HTTP " + resp.code() + " calling getwxacodeunlimit"); - } - MediaType ct = resp.body().contentType(); - byte[] bytes = resp.body().bytes(); - // 微信出错时返回 JSON，需要识别一下 - if (ct != null && ct.subtype() != null && ct.subtype().contains("json")) { - String err = new String(bytes); - throw new IOException("WeChat error: " + err); - } - return bytes; // 成功就是图片二进制（PNG） - } - } - - /** - * 获取/刷新 access_token - */ - public String getLocalAccessToken() throws IOException { - long now = Instant.now().getEpochSecond(); - String key = "AccessToken:Local:" + getTenantId(); - - // 从缓存获取access_token，使用JSON格式 - String value = redisUtil.get(key); - if (value != null && now < tokenExpireEpoch - 60) { - try { - // 尝试解析为JSON格式 - JSONObject response = JSON.parseObject(value); - String accessToken = response.getString("access_token"); - if (accessToken != null) { - System.out.println("从缓存获取到access_token(Local): " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); - return accessToken; - } - } catch (Exception e) { - // 如果解析失败，可能是旧格式的纯字符串token - System.out.println("本地缓存token格式异常，使用原值: " + e.getMessage()); - return value; - } - } - - // 从缓存获取微信小程序配置信息 - Integer tenantId = getTenantId(); - JSONObject setting = getWxConfigFromCache(tenantId); - if (setting == null) { - throw new IOException("请先配置小程序"); - } - - String appId = setting.getString("appId"); - String appSecret = setting.getString("appSecret"); - - if (appId == null || appSecret == null) { - throw new IOException("小程序配置不完整，缺少 appId 或 appSecret"); - } - - HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/cgi-bin/token") - .newBuilder() - .addQueryParameter("grant_type", "client_credential") - .addQueryParameter("appid", appId) - .addQueryParameter("secret", appSecret) - .build(); - - Request req = new Request.Builder().url(url).get().build(); - try (Response resp = http.newCall(req).execute()) { - String body = resp.body().string(); - JsonNode json = om.readTree(body); - if (json.has("access_token")) { - String token = json.get("access_token").asText(); - long expiresIn = json.get("expires_in").asInt(7200); - - // 缓存完整的JSON响应，与其他方法保持一致 - redisUtil.set(key, body, expiresIn, TimeUnit.SECONDS); - tokenExpireEpoch = now + expiresIn; - System.out.println("获取新的access_token成功(Local)，租户ID: " + tenantId); - return token; - } else { - throw new IOException("Get access_token failed: " + body); - } - } - } - - /** - * 文件上传位置(服务器) - */ - private String getUploadDir() { - return config.getUploadPath(); - } - - @Operation(summary = "调试：检查微信小程序配置") - @GetMapping("/debug/checkWxConfig") - public ApiResult debugCheckWxConfig() { - Integer tenantId = getTenantId(); - Map result = new HashMap<>(); - result.put("tenantId", tenantId); - - try { - // 尝试从缓存获取配置 - JSONObject setting = getWxConfigFromCache(tenantId); - result.put("hasConfig", true); - result.put("config", setting); - result.put("cacheKey", MP_WX_KEY + tenantId); - } catch (Exception e) { - result.put("hasConfig", false); - result.put("error", e.getMessage()); - result.put("cacheKey", MP_WX_KEY + tenantId); - - // 提供创建配置的建议 - Map suggestion = new HashMap<>(); - suggestion.put("message", "请在Redis中创建微信小程序配置"); - suggestion.put("cacheKey", MP_WX_KEY + tenantId); - suggestion.put("tenantId", tenantId); - suggestion.put("sampleConfig", createSampleWxConfig()); - result.put("suggestion", suggestion); - } - - return success("配置检查完成", result); - } - - @Operation(summary = "调试：创建示例微信小程序配置") - @PostMapping("/debug/createSampleWxConfig") - public ApiResult debugCreateSampleWxConfig(@RequestBody Map params) { - Integer tenantId = getTenantId(); - - String appId = params.get("appId"); - String appSecret = params.get("appSecret"); - - if (appId == null || appSecret == null) { - return fail("请提供 appId 和 appSecret", null); - } - - try { - // 直接在Redis中创建配置 - String key = MP_WX_KEY + tenantId; - - // 创建配置内容 - Map config = new HashMap<>(); - config.put("appId", appId); - config.put("appSecret", appSecret); - config.put("tenantId", tenantId.toString()); - config.put("settingKey", "mp-weixin"); - config.put("settingId", "301"); - - // 保存到Redis缓存 - redisUtil.set(key, JSON.toJSONString(config)); - - return success("微信小程序配置创建成功", config); - } catch (Exception e) { - return fail("创建配置失败: " + e.getMessage(), null); - } - } - - private Map createSampleWxConfig() { - Map sample = new HashMap<>(); - sample.put("appId", "wx_your_app_id_here"); - sample.put("appSecret", "your_app_secret_here"); - return sample; - } - - @Operation(summary = "调试：获取AccessToken") - @GetMapping("/debug/getAccessToken") - public ApiResult debugGetAccessToken() { - try { - // 获取当前线程的租户ID - Integer tenantId = getTenantId(); - if (tenantId == null) { - tenantId = 10550; // 默认租户 - } - - System.out.println("=== 开始调试获取AccessToken，租户ID: " + tenantId + " ==="); - - // 手动调用获取AccessToken - String accessToken = getAccessTokenForTenant(tenantId); - - String result = "获取AccessToken成功: " + (accessToken != null ? accessToken.substring(0, Math.min(10, accessToken.length())) + "..." : "null"); - System.out.println("调试结果: " + result); - - return success(result); - } catch (Exception e) { - System.err.println("调试获取AccessToken异常: " + e.getMessage()); - e.printStackTrace(); - return fail("获取AccessToken失败: " + e.getMessage()); - } - } - - /** - * 从Redis缓存中获取微信小程序配置 - * @param tenantId 租户ID - * @return 微信配置信息 - */ - private JSONObject getWxConfigFromCache(Integer tenantId) { - String key = MP_WX_KEY + tenantId; - String cacheValue = redisUtil.get(key); - if (StrUtil.isBlank(cacheValue)) { - throw new BusinessException("未找到微信小程序配置，请检查缓存key: " + key); - } - try { - return JSON.parseObject(cacheValue); - } catch (Exception e) { - throw new BusinessException("微信小程序配置格式错误: " + e.getMessage()); - } - } - - /** - * 从scene参数中提取租户ID - * scene格式: uid_userId_tenantId（优先）或 uid_userId（兼容旧格式） - */ - private Integer extractTenantIdFromScene(String scene) { - try { - System.out.println("解析scene参数: " + scene); - - if (scene != null && scene.startsWith("uid_")) { - String content = scene.substring(4); // 去掉"uid_"前缀 - - // 优先解析 uid_userId_tenantId 格式 - String[] parts = content.split("_"); - if (parts.length >= 2) { - try { - Integer tenantId = Integer.parseInt(parts[1]); - System.out.println("从scene直接解析到tenantId = " + tenantId); - return tenantId; - } catch (NumberFormatException e) { - System.err.println("scene中tenantId格式异常: " + parts[1]); - } - } - - // 兼容旧格式 uid_userId：根据用户ID查询租户ID - if (parts.length == 1) { - Integer userId = Integer.parseInt(parts[0]); - System.out.println("userId = " + userId); - try { - List users = userService.listByIdIgnoreTenant(userId); - System.out.println("查询到用户数量 = " + (users != null ? users.size() : 0)); - if (users != null && !users.isEmpty()) { - System.out.println("从用户ID " + userId + " 获取到租户ID: " + users.get(0).getTenantId()); - return users.get(0).getTenantId(); - } else { - System.err.println("未找到用户ID: " + userId); - } - } catch (Exception ex) { - System.err.println("查询用户异常: " + ex.getMessage()); - } - } - } - - // 如果无法解析，默认使用租户10550 - System.out.println("无法解析scene参数，使用默认租户ID: 10550"); - return 10550; - - } catch (Exception e) { - System.err.println("解析scene参数异常: " + e.getMessage()); - // 出现异常时，默认使用租户10550 - return 10550; - } - } - - /** - * 为指定租户获取AccessToken - */ - private String getAccessTokenForTenant(Integer tenantId) { - try { - String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); - - // 从缓存获取access_token - String value = redisUtil.get(key); - if (value != null) { - try { - // 尝试解析为JSON格式（与getAccessToken方法保持一致） - JSONObject response = JSON.parseObject(value); - String accessToken = response.getString("access_token"); - if (accessToken != null) { - System.out.println("从缓存获取到access_token: " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); - return accessToken; - } - } catch (Exception e) { - // 如果解析失败，可能是旧格式的纯字符串token，直接返回 - System.out.println("缓存token格式异常，使用原值: " + e.getMessage()); - return value; - } - } - - // 缓存中没有，重新获取 - JSONObject wxConfig = getWxConfigFromCache(tenantId); - String appId = wxConfig.getString("appId"); - String appSecret = wxConfig.getString("appSecret"); - - String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appId + "&secret=" + appSecret; - System.out.println("调用微信API获取token - 租户ID: " + tenantId + ", AppID: " + (appId != null ? appId.substring(0, Math.min(8, appId.length())) + "..." : "null")); - System.out.println("微信API请求URL: " + apiUrl.replaceAll("secret=[^&]*", "secret=***")); - String result = HttpUtil.get(apiUrl); - System.out.println("微信API响应: " + result); - JSONObject json = JSON.parseObject(result); - - // 检查是否有错误 - if (json.containsKey("errcode")) { - Integer errcode = json.getInteger("errcode"); - String errmsg = json.getString("errmsg"); - System.err.println("微信API错误 - errcode: " + errcode + ", errmsg: " + errmsg); - - if (errcode == 40125) { - throw new RuntimeException("微信AppSecret配置错误，请检查并更新正确的AppSecret"); - } else if (errcode == 40013) { - throw new RuntimeException("微信AppID配置错误，请检查并更新正确的AppID"); - } else { - throw new RuntimeException("微信API调用失败: " + errmsg + " (errcode: " + errcode + ")"); - } - } - - if (json.containsKey("access_token")) { - String accessToken = json.getString("access_token"); - Integer expiresIn = json.getInteger("expires_in"); - - // 缓存access_token，存储完整JSON响应（与getAccessToken方法保持一致） - redisUtil.set(key, result, (long) (expiresIn - 300), TimeUnit.SECONDS); - - System.out.println("获取新的access_token成功，租户ID: " + tenantId); - return accessToken; - } else { - throw new RuntimeException("获取access_token失败: " + result); - } - - } catch (Exception e) { - System.err.println("获取access_token异常，租户ID: " + tenantId + ", 错误: " + e.getMessage()); - throw new RuntimeException("获取access_token失败: " + e.getMessage()); - } - } - -} +// } catch (Exception ex) { +// System.err.println("查询用户异常: " + ex.getMessage()); +// } +// } +// } +// +// // 如果无法解析，默认使用租户10550 +// System.out.println("无法解析scene参数，使用默认租户ID: 10550"); +// return 10550; +// +// } catch (Exception e) { +// System.err.println("解析scene参数异常: " + e.getMessage()); +// // 出现异常时，默认使用租户10550 +// return 10550; +// } +// } +// +// /** +// * 为指定租户获取AccessToken +// */ +// private String getAccessTokenForTenant(Integer tenantId) { +// try { +// String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); +// +// // 从缓存获取access_token +// String value = redisUtil.get(key); +// if (value != null) { +// try { +// // 尝试解析为JSON格式（与getAccessToken方法保持一致） +// JSONObject response = JSON.parseObject(value); +// String accessToken = response.getString("access_token"); +// if (accessToken != null) { +// System.out.println("从缓存获取到access_token: " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); +// return accessToken; +// } +// } catch (Exception e) { +// // 如果解析失败，可能是旧格式的纯字符串token，直接返回 +// System.out.println("缓存token格式异常，使用原值: " + e.getMessage()); +// return value; +// } +// } +// +// // 缓存中没有，重新获取 +// JSONObject wxConfig = getWxConfigFromCache(tenantId); +// String appId = wxConfig.getString("appId"); +// String appSecret = wxConfig.getString("appSecret"); +// +// String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appId + "&secret=" + appSecret; +// System.out.println("调用微信API获取token - 租户ID: " + tenantId + ", AppID: " + (appId != null ? appId.substring(0, Math.min(8, appId.length())) + "..." : "null")); +// System.out.println("微信API请求URL: " + apiUrl.replaceAll("secret=[^&]*", "secret=***")); +// String result = HttpUtil.get(apiUrl); +// System.out.println("微信API响应: " + result); +// JSONObject json = JSON.parseObject(result); +// +// // 检查是否有错误 +// if (json.containsKey("errcode")) { +// Integer errcode = json.getInteger("errcode"); +// String errmsg = json.getString("errmsg"); +// System.err.println("微信API错误 - errcode: " + errcode + ", errmsg: " + errmsg); +// +// if (errcode == 40125) { +// throw new RuntimeException("微信AppSecret配置错误，请检查并更新正确的AppSecret"); +// } else if (errcode == 40013) { +// throw new RuntimeException("微信AppID配置错误，请检查并更新正确的AppID"); +// } else { +// throw new RuntimeException("微信API调用失败: " + errmsg + " (errcode: " + errcode + ")"); +// } +// } +// +// if (json.containsKey("access_token")) { +// String accessToken = json.getString("access_token"); +// Integer expiresIn = json.getInteger("expires_in"); +// +// // 缓存access_token，存储完整JSON响应（与getAccessToken方法保持一致） +// redisUtil.set(key, result, (long) (expiresIn - 300), TimeUnit.SECONDS); +// +// System.out.println("获取新的access_token成功，租户ID: " + tenantId); +// return accessToken; +// } else { +// throw new RuntimeException("获取access_token失败: " + result); +// } +// +// } catch (Exception e) { +// System.err.println("获取access_token异常，租户ID: " + tenantId + ", 错误: " + e.getMessage()); +// throw new RuntimeException("获取access_token失败: " + e.getMessage()); +// } +// } +// +//} diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 10f33ef..0b5091c 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -2,11 +2,11 @@ package com.gxwebsoft.glt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.annotation.IgnoreTenant; import com.gxwebsoft.glt.entity.GltTicketTemplate; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; import com.gxwebsoft.glt.entity.GltUserTicketRelease; +import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.service.ShopOrderGoodsService; @@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; @@ -56,6 +55,7 @@ public class GltTicketIssueService { private final GltUserTicketReleaseService gltUserTicketReleaseService; private final GltUserTicketLogService gltUserTicketLogService; private final TransactionTemplate transactionTemplate; + private final DealerOrderSettlement10584Task dealerOrderSettlement; /** * 扫描“今日订单”，执行套票发放。 @@ -140,7 +140,10 @@ public class GltTicketIssueService { //1.发送水票 suerTicketRelease(orderNo, tenantId); - //2.优惠券扣减、积分发送、消息通知 + //2.执行分销员分销、统计门店/服务商分销业务 + dealerOrderSettlement.orderSettlement(orderNo); + + //3.执行平台分红业务 TODO 待开发 } @@ -149,6 +152,7 @@ public class GltTicketIssueService { * @param orderNo 订单号 * @param tenantId 租户ID */ + @Transactional public void suerTicketRelease(String orderNo, Integer tenantId){ //1.订单为空跳过执行 ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId); diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 519d576..d6e24cb 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; +import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; @@ -19,6 +21,7 @@ import com.gxwebsoft.glt.param.GltTicketOrderParam; import com.gxwebsoft.glt.service.GltTicketOrderService; import com.gxwebsoft.glt.service.GltUserTicketLogService; import com.gxwebsoft.glt.service.GltUserTicketService; +import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; import com.gxwebsoft.shop.service.ShopDealerCapitalService; @@ -765,6 +768,25 @@ public class GltTicketOrderServiceImpl extends ServiceImpl orderLambdaQueryWrapper; + if(shopOrderId != null){ + orderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getOrderId, shopOrderId).eq(ShopOrder::getOrderStatus, 0); + }else{ + orderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getOrderId, shopOrderNo).eq(ShopOrder::getOrderStatus, 0); + } + ShopOrder order = shopOrderService.getOne(orderLambdaQueryWrapper); + if(order != null){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST); + reduceDto.setOrderUserId(order.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW); + + //按订单号资金解冻 + shopDealerUserService.reduceBalance(reduceDto); + } + LambdaUpdateWrapper uw = new LambdaUpdateWrapper() .eq(ShopOrder::getTenantId, tenantId) .eq(ShopOrder::getDeleted, 0) @@ -776,7 +798,6 @@ public class GltTicketOrderServiceImpl extends ServiceImpl waterFormIds = loadWaterFormIds(); + + //查询商品列表存在已支付未核销订单数据 List orders = findUnsettledPaidOrders(waterFormIds); if (orders.isEmpty()) { return; @@ -108,7 +112,11 @@ public class DealerOrderSettlement10584Task { // Per-run caches to reduce DB chatter across orders. Map level1ParentCache = new HashMap<>(); Map shopRoleCache = new HashMap<>(); + + //获取系统设置分销等级 DealerBasicSetting dealerBasicSetting = findDealerBasicSetting(); + + //获取分销员type=2第一个分销人作为平台总分红人 ShopDealerUser totalDealerUser = findTotalDealerUser(); if (totalDealerUser == null || totalDealerUser.getUserId() == null) { log.warn("未找到分红账号，订单仍可结算但不会发放分红 - tenantId={}", TENANT_ID); @@ -124,6 +132,7 @@ public class DealerOrderSettlement10584Task { try { transactionTemplate.executeWithoutResult(status -> { // 先“认领”订单：并发/多实例下避免重复结算（update=0 表示被其他线程/实例处理） + //更新商品订单为已结算状态 if (!claimOrderToSettle(order.getOrderId(), waterFormIds)) { return; } @@ -138,6 +147,88 @@ public class DealerOrderSettlement10584Task { } } + /** + * 每10分钟执行一次。 + */ + @Scheduled(cron = "0 0/10 * * * ?") + @IgnoreTenant("该定时任务仅处理租户10584，但需要显式按tenantId过滤，避免定时任务线程无租户上下文导致查询异常") + public void settleTenant10584OrdersV2() { + try { + //获取水票模板对应的商品信息列表 + Set waterFormIds = loadWaterFormIds(); + + //查询商品列表存在已支付未核销订单数据【isSettled = 0， payStatus= 1， orderStatus 不在列表（2, 3, 4, 5, 6, 7）】 + List orders = findUnsettledPaidOrders(waterFormIds); + if (orders.isEmpty()) { + return; + } + + // Per-run caches to reduce DB chatter across orders. + Map level1ParentCache = new HashMap<>(); + Map shopRoleCache = new HashMap<>(); + + //获取系统设置分销等级 + DealerBasicSetting dealerBasicSetting = findDealerBasicSetting(); + + //获取分销员type=2第一个分销人作为平台总分红人 + ShopDealerUser totalDealerUser = findTotalDealerUser(); + if (totalDealerUser == null || totalDealerUser.getUserId() == null) { + log.warn("未找到分红账号，订单仍可结算但不会发放分红 - tenantId={}", TENANT_ID); + } + log.debug("租户{}分销设置 - level={}", TENANT_ID, dealerBasicSetting.level); + + log.info("租户{}待结算订单数: {}, orderNos(sample)={}", + TENANT_ID, + orders.size(), + orders.stream().limit(10).map(ShopOrder::getOrderNo).toList()); + + for (ShopOrder order : orders) { + try { + transactionTemplate.executeWithoutResult(status -> { + // 先“认领”订单：并发/多实例下避免重复结算（update=0 表示被其他线程/实例处理） + //更新商品订单为已结算状态 + if (!claimOrderToSettle(order.getOrderId(), waterFormIds)) { + return; + } + settleOneOrderV2(order, level1ParentCache, shopRoleCache, totalDealerUser, dealerBasicSetting.level); + }); + } catch (Exception e) { + log.error("订单结算失败，将回滚本订单并在下次任务重试 - orderId={}, orderNo={}", order.getOrderId(), order.getOrderNo(), e); + } + } + } catch (Exception e) { + log.error("租户{}分销订单结算任务执行失败", TENANT_ID, e); + } + } + + /** + * 订单分销金、分润金结算 + */ + @Transactional + public void orderSettlement(String orderNo){ + LambdaQueryWrapper orderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getOrderNo, orderNo).eq(ShopOrder::getIsSettled, 0).eq(ShopOrder::getPayStatus, 1); + ShopOrder order = shopOrderService.getOne(orderLambdaQueryWrapper); + if(order != null){ + //获取系统设置分销等级 + DealerBasicSetting dealerBasicSetting = findDealerBasicSetting(); + + //获取分销员type=2第一个分销人作为平台总分红人 + ShopDealerUser totalDealerUser = findTotalDealerUser(); + + Map level1ParentCache = new HashMap<>(); + Map shopRoleCache = new HashMap<>(); + + transactionTemplate.executeWithoutResult(status -> { + // 先“认领”订单：并发/多实例下避免重复结算（update=0 表示被其他线程/实例处理） + //更新商品订单为已结算状态 + if (!claimOrderToSettleV2(order.getOrderId())) { + return; + } + settleOneOrderV2(order, level1ParentCache, shopRoleCache, totalDealerUser, dealerBasicSetting.level); + }); + } + } + private List findUnsettledPaidOrders(Set waterFormIds) { // 租户10584约定： // - 普通订单：以发货为准（deliveryStatus=20）才结算； @@ -148,7 +239,7 @@ public class DealerOrderSettlement10584Task { .eq(ShopOrder::getPayStatus, true) .eq(ShopOrder::getIsSettled, 0) // 退款/取消订单不结算，避免“退款后仍发放分红/分润/佣金” - .and(w -> w.notIn(ShopOrder::getOrderStatus, 2, 4, 5, 6, 7).or().isNull(ShopOrder::getOrderStatus)); + .and(w -> w.notIn(ShopOrder::getOrderStatus, 2, 3, 4, 5, 6, 7).or().isNull(ShopOrder::getOrderStatus)); if (waterFormIds != null && !waterFormIds.isEmpty()) { qw.and(w -> w.eq(ShopOrder::getDeliveryStatus, 20).or().in(ShopOrder::getFormId, waterFormIds)); @@ -178,6 +269,17 @@ public class DealerOrderSettlement10584Task { return shopOrderService.update(uw); } + private boolean claimOrderToSettleV2(Integer orderId) { + LambdaUpdateWrapper uw = new LambdaUpdateWrapper() + .eq(ShopOrder::getOrderId, orderId) + .eq(ShopOrder::getTenantId, TENANT_ID) + .eq(ShopOrder::getIsSettled, 0) + // 二次防御：退款/取消订单不允许被“认领结算” + .and(w -> w.notIn(ShopOrder::getOrderStatus, 2, 3, 4, 5, 6, 7).or().isNull(ShopOrder::getOrderStatus)); + uw.set(ShopOrder::getIsSettled, 1); + return shopOrderService.update(uw); + } + private Set loadWaterFormIds() { try { return gltTicketTemplateService.list( @@ -252,6 +354,45 @@ public class DealerOrderSettlement10584Task { log.info("订单结算完成 - orderId={}, orderNo={}, baseAmount={}", order.getOrderId(), order.getOrderNo(), baseAmount); } + private void settleOneOrderV2(ShopOrder order, Map level1ParentCache, Map shopRoleCache, + ShopDealerUser totalDealerUser, int dealerLevel) { + if (order.getUserId() == null || order.getOrderNo() == null) { + throw new IllegalStateException("订单关键信息缺失，无法结算 - orderId=" + order.getOrderId()); + } + + BigDecimal totalPrice = order.getTotalPrice(); + BigDecimal payPrice = order.getPayPrice(); + BigDecimal rate = payPrice.divide(totalPrice, 2, RoundingMode.HALF_UP); + + if(payPrice.compareTo(BigDecimal.ZERO) <= 0){ + log.info("订单号：{}，实付金额为0，无需执行分销逻辑" + order.getOrderNo()); + return; + } + + //查询订单号订单所有已开启分销的商品分润信息 + List orderGoodsVOList = shopOrderMapper.getOrderGoodsInfo(order.getOrderNo()); + if(CollectionUtils.isNotEmpty(orderGoodsVOList)){ + // 1) 直推/间推（直接增加冻结账户余额） + DealerRefereeCommissionV2 dealerRefereeCommission = settleDealerRefereeCommissionV2(order, rate, orderGoodsVOList, dealerLevel); + + // 2) 门店分润上级：从下单用户开始逐级向上找，命中 ShopDealerUser.type=1 的最近两级（直推门店/间推门店）【只统计数据，不对分销账户进行处理， + // 已日结形式，统计分销记录表：shop_dealer_order 做对应一级二级管理津贴结算】 + ShopRoleCommission shopRoleCommission = settleShopRoleRefereeCommissionV2(order, rate, orderGoodsVOList, level1ParentCache, shopRoleCache); + + // 3) 分红：固定比率，每个订单都分 TODO 总分红未开发，还按原逻辑走 + int goodsQty = orderGoodsVOList.stream().mapToInt(ShopOrderGoodsVO::getTotalNum).sum(); + TotalDealerCommission totalDealerCommission = settleTotalDealerCommissionV2(order, goodsQty, totalDealerUser); + + // 4) 写入分销订单记录（用于排查/统计；详细分佣以 ShopDealerCapital 为准） + createDealerOrderRecordV2(order, dealerRefereeCommission, shopRoleCommission, totalDealerCommission); + + log.info("订单结算完成 - orderId={}, orderNo={}, baseAmount={}", order.getOrderId(), order.getOrderNo(), payPrice); + }else { + log.error("订单号：{}，未找到下单分销商品数据！", order.getOrderNo()); + return; + } + } + private DealerRefereeCommission settleDealerRefereeCommission( ShopOrder order, BigDecimal baseAmount, @@ -329,6 +470,85 @@ public class DealerOrderSettlement10584Task { return new DealerRefereeCommission(directDealerId, directMoney, simpleDealerId, simpleMoney, thirdDealerId, thirdMoney); } + /** + * 获取分销员分销霍金数据 + * @param order + * @param orderGoodsVOList + * @param dealerLevel + * @return + */ + private DealerRefereeCommissionV2 settleDealerRefereeCommissionV2(ShopOrder order, BigDecimal rate, List orderGoodsVOList, int dealerLevel) { + Integer directDealerId = null; + Integer simpleDealerId = null; + AtomicReference directMoney = new AtomicReference<>(BigDecimal.ZERO); + AtomicReference simpleMoney = new AtomicReference<>(BigDecimal.ZERO); + + + if (dealerLevel >= 1) { + Integer dealerId = shopDealerRefereeMapper.getDealerIdByUserId(order.getUserId()); + if(dealerId != null){ + directDealerId = dealerId; + } + } + if (dealerLevel >= 2 && directDealerId != null) { + Integer dealerId = shopDealerRefereeMapper.getDealerIdByUserId(directDealerId); + if(dealerId != null){ + simpleDealerId = dealerId; + } + } + + if(directDealerId != null || simpleDealerId != null){ + Integer finalDirectDealerId = directDealerId; + Integer finalSimpleDealerId = simpleDealerId; + orderGoodsVOList.forEach(orderGoodsVO -> { + //获取商品分润比例/金额 + BigDecimal firstMoney = orderGoodsVO.getFirstMoney(); + BigDecimal secondMoney = orderGoodsVO.getSecondMoney(); + + //按实付比例计算单项应参与分润金额 + BigDecimal itemRatePrice = orderGoodsVO.getPrice().multiply(BigDecimal.valueOf(orderGoodsVO.getTotalNum())).multiply(rate); + + //一级分销员存在(type = 0)且单项实付金额大于0及商品设置了一级分销比例/金额 + if(finalDirectDealerId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0 && firstMoney.compareTo(BigDecimal.ZERO) > 0){ + BigDecimal one = calcMoneyByCommissionType(itemRatePrice, firstMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType()); + directMoney.accumulateAndGet(one, BigDecimal::add); + } + + //一级分销员存在(type = 0)且单项实付金额大于0及商品设置了一级分销比例/金额 + if(finalSimpleDealerId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0 && secondMoney.compareTo(BigDecimal.ZERO) > 0 ){ + BigDecimal two = calcMoneyByCommissionType(itemRatePrice, secondMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType()); + simpleMoney.accumulateAndGet(two, BigDecimal::add); + } + }); + + //一级分销员账户增加冻结金额 + if (directDealerId != null && directMoney.get().compareTo(BigDecimal.ZERO) > 0) { + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.FREEZE_ACCOUNT); + reduceDto.setUserId(directDealerId); + reduceDto.setOrderUserId(order.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setPrice(directMoney.get()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DISTRIBUTION_INCOME); + shopDealerUserService.reduceBalance(reduceDto); + } + + //二级分销员账户增加冻结金额 + if (simpleDealerId != null && simpleMoney.get().compareTo(BigDecimal.ZERO) > 0) { + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.FREEZE_ACCOUNT); + reduceDto.setUserId(simpleDealerId); + reduceDto.setOrderUserId(order.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setPrice(simpleMoney.get()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DISTRIBUTION_INCOME); + shopDealerUserService.reduceBalance(reduceDto); + } + return new DealerRefereeCommissionV2(directDealerId, directMoney.get(), simpleDealerId, simpleMoney.get()); + } + return null; + } + private Integer getDealerRefereeId(Integer userId) { return getDealerRefereeId(userId, 1); } @@ -412,6 +632,54 @@ public class DealerOrderSettlement10584Task { return new ShopRoleCommission(shopRoleReferees.get(0), storeDirectMoney, shopRoleReferees.get(1), storeSimpleMoney); } + private ShopRoleCommission settleShopRoleRefereeCommissionV2(ShopOrder order, BigDecimal rate, List orderGoodsVOList, Map level1ParentCache, Map shopRoleCache) { + List shopRoleReferees = findFirstTwoShopRoleReferees(order.getUserId(), level1ParentCache, shopRoleCache); + log.info("门店分润命中结果(type=1门店角色取前两级) - orderNo={}, buyerUserId={}, shopRoleReferees={}", + order.getOrderNo(), order.getUserId(), shopRoleReferees); + if (shopRoleReferees.isEmpty()) { + return ShopRoleCommission.empty(); + } + + if(CollectionUtils.isNotEmpty(shopRoleReferees)){ + Integer storeDirectUserId; + Integer storeSimpleUserId = null; + AtomicReference storeDirectMoney = new AtomicReference<>(BigDecimal.ZERO); + AtomicReference storeSimpleMoney = new AtomicReference<>(BigDecimal.ZERO); + + if(shopRoleReferees.size() == 1){ + storeDirectUserId = shopRoleReferees.get(0); + }else { + storeDirectUserId = shopRoleReferees.get(0); + storeSimpleUserId = shopRoleReferees.get(1); + } + + + Integer finalStoreDirectUserId = storeDirectUserId; + Integer finalStoreSimpleUserId = storeSimpleUserId; + orderGoodsVOList.forEach(orderGoodsVO ->{ + //获取商品对应服务商管理费分润比例/金额 + BigDecimal firstMoney = orderGoodsVO.getFirstDividend(); + BigDecimal secondMoney = orderGoodsVO.getSecondDividend(); + + //按实付比例计算单项应参与分润金额 + BigDecimal itemRatePrice = orderGoodsVO.getPrice().multiply(BigDecimal.valueOf(orderGoodsVO.getTotalNum())).multiply(rate); + + if(finalStoreDirectUserId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0){ + BigDecimal one = calcMoneyByCommissionType(itemRatePrice, firstMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType()); + storeDirectMoney.accumulateAndGet(one, BigDecimal::add); + } + + if(finalStoreSimpleUserId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0){ + BigDecimal two = calcMoneyByCommissionType(itemRatePrice, secondMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType()); + storeSimpleMoney.accumulateAndGet(two, BigDecimal::add); + } + }); + return new ShopRoleCommission(storeDirectUserId, storeDirectMoney.get(), storeSimpleUserId, storeSimpleMoney.get()); + }else { + return null; + } + } + private TotalDealerCommission settleTotalDealerCommission( ShopOrder order, BigDecimal baseAmount, @@ -438,6 +706,32 @@ public class DealerOrderSettlement10584Task { return new TotalDealerCommission(totalDealerUser.getUserId(), money); } + private TotalDealerCommission settleTotalDealerCommissionV2(ShopOrder order, int goodsQty, ShopDealerUser totalDealerUser) { + if (totalDealerUser == null || totalDealerUser.getUserId() == null) { + return TotalDealerCommission.empty(); + } + BigDecimal rate = safePositive(totalDealerUser.getRate()); + if (rate.signum() <= 0) { + rate = TOTAL_DEALER_DIVIDEND_RATE; + } + BigDecimal money = calcMoneyByCommissionType(order.getPayPrice(), rate, goodsQty, DIVIDEND_SCALE, 20); + + //一级分销员账户增加冻结金额 + if (money.compareTo(BigDecimal.ZERO) > 0) { + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.FREEZE_ACCOUNT); + reduceDto.setUserId(totalDealerUser.getUserId()); + reduceDto.setOrderUserId(order.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setPrice(money); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DIVIDEND_INCOME); + shopDealerUserService.reduceBalance(reduceDto); + + return new TotalDealerCommission(totalDealerUser.getUserId(), money); + } + return TotalDealerCommission.empty(); + } + private ShopDealerUser findTotalDealerUser() { return shopDealerUserService.getOne( new LambdaQueryWrapper() @@ -756,6 +1050,92 @@ public class DealerOrderSettlement10584Task { order.getOrderNo(), dealerOrder.getFirstUserId(), dealerOrder.getSecondUserId(), dealerOrder.getFirstDividendUser(), dealerOrder.getSecondDividendUser()); } + /** + * 记录订单分销业务 + * @param order 商品订单 + * @param dealerRefereeCommission 一级、二级分销员分销数据 + * @param shopRoleCommission 门店/服务商一级、二级管理津贴数据 + */ + private void createDealerOrderRecordV2(ShopOrder order, DealerRefereeCommissionV2 dealerRefereeCommission, ShopRoleCommission shopRoleCommission, TotalDealerCommission totalDealerCommission) { + // 幂等：同一订单只写一条（依赖 order_no + tenant_id 作为业务唯一） + ShopDealerOrder existed = shopDealerOrderService.getOne( + new LambdaQueryWrapper() + .eq(ShopDealerOrder::getTenantId, TENANT_ID) + .eq(ShopDealerOrder::getOrderNo, order.getOrderNo()) + .last("limit 1") + ); + if (existed != null) { + // 允许“补发”门店分润时回填分润字段，避免订单已结算但分润字段一直为空，影响排查/对账。 + LambdaUpdateWrapper uw = new LambdaUpdateWrapper() + .eq(ShopDealerOrder::getTenantId, TENANT_ID) + .eq(ShopDealerOrder::getOrderNo, order.getOrderNo()); + boolean needUpdate = false; + if (shopRoleCommission != null && shopRoleCommission.storeDirectUserId != null) { + Integer existedUser = existed.getFirstDividendUser(); + boolean needSetUser = existedUser == null; + boolean needSetMoney = existed.getFirstDividend() == null || existed.getFirstDividend().signum() == 0; + if (needSetUser) { + uw.set(ShopDealerOrder::getFirstDividendUser, shopRoleCommission.storeDirectUserId); + needUpdate = true; + } + boolean sameUser = existedUser == null || Objects.equals(existedUser, shopRoleCommission.storeDirectUserId); + if (sameUser && needSetMoney && shopRoleCommission.storeDirectMoney != null && shopRoleCommission.storeDirectMoney.signum() > 0) { + uw.set(ShopDealerOrder::getFirstDividend, shopRoleCommission.storeDirectMoney); + needUpdate = true; + } + } + if (shopRoleCommission != null && shopRoleCommission.storeSimpleUserId != null) { + Integer existedUser = existed.getSecondDividendUser(); + boolean needSetUser = existedUser == null; + boolean needSetMoney = existed.getSecondDividend() == null || existed.getSecondDividend().signum() == 0; + if (needSetUser) { + uw.set(ShopDealerOrder::getSecondDividendUser, shopRoleCommission.storeSimpleUserId); + needUpdate = true; + } + boolean sameUser = existedUser == null || Objects.equals(existedUser, shopRoleCommission.storeSimpleUserId); + if (sameUser && needSetMoney && shopRoleCommission.storeSimpleMoney != null && shopRoleCommission.storeSimpleMoney.signum() > 0) { + uw.set(ShopDealerOrder::getSecondDividend, shopRoleCommission.storeSimpleMoney); + needUpdate = true; + } + } + if (needUpdate) { + shopDealerOrderService.update(uw); + log.info("ShopDealerOrder已存在，回填门店分润字段 - orderNo={}, firstDividendUser={}, secondDividendUser={}", + order.getOrderNo(), shopRoleCommission.storeDirectUserId, shopRoleCommission.storeSimpleUserId); + } else { + log.info("ShopDealerOrder已存在，跳过写入 - orderNo={}", order.getOrderNo()); + } + return; + }else { + + ShopDealerOrder dealerOrder = new ShopDealerOrder(); + dealerOrder.setUserId(order.getUserId()); // 买家用户ID + dealerOrder.setOrderNo(order.getOrderNo()); + dealerOrder.setOrderPrice(order.getTotalPrice()); + dealerOrder.setPayPrice(order.getPayPrice()); + + //一级、二级分销员分销佣金统计 + dealerOrder.setFirstUserId(dealerRefereeCommission != null ? dealerRefereeCommission.directDealerId : null); + dealerOrder.setFirstMoney(dealerRefereeCommission != null ? dealerRefereeCommission.directMoney : BigDecimal.ZERO); + dealerOrder.setSecondUserId(dealerRefereeCommission != null ? dealerRefereeCommission.simpleDealerId : null); + dealerOrder.setSecondMoney(dealerRefereeCommission != null ? dealerRefereeCommission.simpleMoney : BigDecimal.ZERO); + + //门店(角色shop)两级分润单独落字段（详细以 ShopDealerCapital 为准） + dealerOrder.setFirstDividendUser(shopRoleCommission != null ? shopRoleCommission.storeDirectUserId : null); + dealerOrder.setFirstDividend(shopRoleCommission != null ? shopRoleCommission.storeDirectMoney : BigDecimal.ZERO); + dealerOrder.setSecondDividendUser(shopRoleCommission != null ? shopRoleCommission.storeSimpleUserId : null); + dealerOrder.setSecondDividend(shopRoleCommission != null ? shopRoleCommission.storeSimpleMoney : BigDecimal.ZERO); + + dealerOrder.setIsSettled(1); + dealerOrder.setSettleTime(LocalDateTime.now()); + dealerOrder.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); + dealerOrder.setTenantId(TENANT_ID); + dealerOrder.setComments(buildCommissionTraceCommentV2(dealerRefereeCommission, shopRoleCommission, totalDealerCommission)); + + shopDealerOrderService.save(dealerOrder); + } + } + private String buildCommissionTraceComment( DealerRefereeCommission dealerRefereeCommission, ShopRoleCommission shopRoleCommission, @@ -770,6 +1150,30 @@ public class DealerOrderSettlement10584Task { + ",totalDealer=" + totalDealerCommission.userId + ":" + totalDealerCommission.money; } + private String buildCommissionTraceCommentV2( + DealerRefereeCommissionV2 dealerRefereeCommission, + ShopRoleCommission shopRoleCommission, + TotalDealerCommission totalDealerCommission + ) { + // 轻量“过程”留痕，方便排查；详细分佣以 ShopDealerCapital 为准。 + Integer direct = dealerRefereeCommission != null ? dealerRefereeCommission.directDealerId : null; + BigDecimal directMoney = dealerRefereeCommission != null ? dealerRefereeCommission.directMoney : BigDecimal.ZERO; + Integer simpleDealerId = dealerRefereeCommission != null ? dealerRefereeCommission.simpleDealerId : null; + BigDecimal simpleMoney = dealerRefereeCommission != null ? dealerRefereeCommission.simpleMoney : BigDecimal.ZERO; + Integer storeDirectUserId = shopRoleCommission != null ? shopRoleCommission.storeDirectUserId : null; + BigDecimal storeDirectMoney = shopRoleCommission != null ? shopRoleCommission.storeDirectMoney : BigDecimal.ZERO; + Integer storeSimpleUserId = shopRoleCommission != null ? shopRoleCommission.storeSimpleUserId : null; + BigDecimal storeSimpleMoney = shopRoleCommission != null ? shopRoleCommission.storeSimpleMoney : BigDecimal.ZERO; + Integer userId = totalDealerCommission != null ? totalDealerCommission.userId : null; + BigDecimal money = totalDealerCommission != null ? totalDealerCommission.money : BigDecimal.ZERO; + + return "direct=" + direct + ":" + directMoney + + ",simple=" + simpleDealerId + ":" + simpleMoney + + ",dividend1=" + storeDirectUserId + ":" + storeDirectMoney + + ",dividend2=" + storeSimpleUserId + ":" + storeSimpleMoney + + ",totalDealer=" + userId + ":" + money; + } + private BigDecimal getOrderBaseAmount(ShopOrder order) { if (order == null) { return null; @@ -962,6 +1366,25 @@ public class DealerOrderSettlement10584Task { } } + private static class DealerRefereeCommissionV2 { + private final Integer directDealerId; + private final BigDecimal directMoney; + private final Integer simpleDealerId; + private final BigDecimal simpleMoney; + + private DealerRefereeCommissionV2( + Integer directDealerId, + BigDecimal directMoney, + Integer simpleDealerId, + BigDecimal simpleMoney + ) { + this.directDealerId = directDealerId; + this.directMoney = directMoney != null ? directMoney : BigDecimal.ZERO; + this.simpleDealerId = simpleDealerId; + this.simpleMoney = simpleMoney != null ? simpleMoney : BigDecimal.ZERO; + } + } + private static class ShopRoleCommission { private final Integer storeDirectUserId; private final BigDecimal storeDirectMoney; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index 43bbff8..52cf35a 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,6 +25,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopDealerOrder对象", description = "分销商订单记录表") +@TableName("shop_dealer_order") public class ShopDealerOrder implements Serializable { private static final long serialVersionUID = 1L; @@ -66,6 +69,9 @@ public class ShopDealerOrder implements Serializable { @TableField(exist = false) private String firstNickname; + @Schema(description = "分销佣金(一级)") + private BigDecimal firstMoney; + @Schema(description = "分销商用户id(二级)") private Integer secondUserId; @@ -73,42 +79,57 @@ public class ShopDealerOrder implements Serializable { @TableField(exist = false) private String secondNickname; - @Schema(description = "分销商用户id(三级)") - private Integer thirdUserId; - - @Schema(description = "分销商用户昵称(三级)") - @TableField(exist = false) - private String thirdNickname; - - @Schema(description = "分销佣金(一级)") - private BigDecimal firstMoney; - @Schema(description = "分销佣金(二级)") private BigDecimal secondMoney; - @Schema(description = "分销佣金(三级)") + @Schema(description = "分销商用户id(弃用)") + private Integer thirdUserId; + + @Schema(description = "分销商用户昵称(弃用)") + @TableField(exist = false) + private String thirdNickname; + + @Schema(description = "分销佣金(弃用)") private BigDecimal thirdMoney; - @Schema(description = "门店(一级)") + @Schema(description = "一级服务商/门店") private Integer firstDividendUser; - @Schema(description = "门店名称(一级)") + @Schema(description = "一级服务商/门店名称") @TableField(exist = false) private String firstDividendUserName; - @Schema(description = "分红(一级)") + @Schema(description = "一级服务商/门店管理津贴") private BigDecimal firstDividend; - @Schema(description = "门店(二级)") + @Schema(description = "一级服务商/门店结算标识 0-否 1-是") + private Integer firstDividendFlag; + + @Schema(description = "一级服务商/门店结算单号") + private String firstDividendNo; + + @Schema(description = "一级服务商/门店结算时间") + private LocalDateTime firstDividendTime; + + @Schema(description = "二级服务商/门店") private Integer secondDividendUser; - @Schema(description = "门店名称(二级)") + @Schema(description = "二级服务商/门店名称") @TableField(exist = false) private String secondDividendUserName; - @Schema(description = "分红(二级)") + @Schema(description = "二级服务商/门店管理津贴") private BigDecimal secondDividend; + @Schema(description = "二级服务商/门店结算标识 0-否 1-是") + private Integer secondDividendFlag; + + @Schema(description = "二级服务商/门店结算单号") + private String secondDividendNo; + + @Schema(description = "二级服务商/门店结算时间") + private LocalDateTime secondDividendTime; + @Schema(description = "佣金比例") private BigDecimal rate; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java index 70ddf37..7c9c491 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java @@ -34,4 +34,11 @@ public interface ShopDealerRefereeMapper extends BaseMapper { */ List selectListRel(@Param("param") ShopDealerRefereeParam param); + /** + * 通过用户ID查询上一级分销人信息【type = 0】 + * @param userId 用户ID + * @return + */ + Integer getDealerIdByUserId(@Param("userId") Integer userId); + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java index e36a492..b905d29 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.param.ShopOrderParam; +import com.gxwebsoft.shop.vo.ShopOrderGoodsVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; @@ -60,4 +60,11 @@ public interface ShopOrderMapper extends BaseMapper { Map selectUserOrderStats(@Param("userId") Integer userId, @Param("tenantId") Integer tenantId, @Param("type") Integer type); + + /** + * 通过订单号查询订单所有商品分润信息 + * @param orderNo 订单号 + * @return + */ + List getOrderGoodsInfo(@Param("orderNo") String orderNo); } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml index a8635f1..ac748e2 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml @@ -57,5 +57,16 @@ + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index c2fd775..6a239e5 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -320,6 +320,28 @@ + diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsVO.java new file mode 100644 index 0000000..1446162 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsVO.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 订单商品信息 + * @author xm + * @since 2025-01-12 + */ +@Data +@Schema(description = "订单商品信息") +public class ShopOrderGoodsVO { + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "商品ID") + private Integer goodsId; + + @Schema(description = "品名") + private String name; + + @Schema(description = "购买数量") + private Integer totalNum; + + @Schema(description = "单价") + private BigDecimal price; + + @Schema(description = "结算方式 10按金额 20按比率") + private Integer commissionType; + + @Schema(description = "一级分销员佣金比例/金额") + private BigDecimal firstMoney; + + @Schema(description = "二级分销员佣金比例/金额") + private BigDecimal secondMoney; + + @Schema(description = "一级服务商管理津贴比例/金额") + private BigDecimal firstDividend; + + @Schema(description = "二级服务商管理津贴比例/金额") + private BigDecimal secondDividend; + +} From 92ca45a5c18f1dae7e69ed72cbe824cec66d51d0 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Tue, 12 May 2026 16:47:41 +0800 Subject: [PATCH 41/60] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=88=86=E4=BD=A3?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=B8=9A=E5=8A=A1=202.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/MybatisPlusConfig.java | 14 +++- .../glt/service/GltTicketIssueService.java | 38 ++++------ src/main/resources/application-dev.yml | 7 +- src/main/resources/application-glt.yml | 2 +- src/main/resources/application-local.yml | 69 ------------------- src/main/resources/application.yml | 4 +- 6 files changed, 32 insertions(+), 102 deletions(-) delete mode 100644 src/main/resources/application-local.yml diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index b3655bc..9018256 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -91,18 +91,26 @@ public class MybatisPlusConfig { "sys_dictionary", "sys_dictionary_data", "apps_test_data", - "cms_lang" + "cms_lang", // "hjm_car", // "hjm_fence" // "cms_website" // "sys_user" // "cms_domain" // "shop_order_goods", -// "shop_goods" + "shop_goods", // "shop_users", -// "shop_order" // 移除shop_order，改为通过注解控制 + "shop_order" , // 移除shop_order，改为通过注解控制 // "shop_order_info", // "booking_user_invoice" + "shop_order_goods", + "glt_ticket_template", + "glt_user_ticket", + "glt_user_ticket_release", + "glt_user_ticket_log", + "shop_dealer_user", + "shop_dealer_order", + "shop_dealer_referee" ).contains(tableName); } }; diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 0b5091c..049898a 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -1,7 +1,6 @@ package com.gxwebsoft.glt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.gxwebsoft.glt.entity.GltTicketTemplate; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; @@ -9,8 +8,8 @@ import com.gxwebsoft.glt.entity.GltUserTicketRelease; import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.entity.ShopOrderGoods; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.service.ShopOrderGoodsService; -import com.gxwebsoft.shop.service.ShopOrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -47,7 +46,7 @@ public class GltTicketIssueService { NO_TEMPLATE } - private final ShopOrderService shopOrderService; + private final ShopOrderMapper shopOrderMapper; private final ShopOrderGoodsService shopOrderGoodsService; private final GltTicketTemplateService gltTicketTemplateService; @@ -86,7 +85,7 @@ public class GltTicketIssueService { LocalDateTime todayStart = LocalDate.now().atStartOfDay(); LocalDateTime tomorrowStart = todayStart.plusDays(1); - List orders = shopOrderService.list( + List orders = shopOrderMapper.selectList( new LambdaQueryWrapper() .eq(ShopOrder::getTenantId, tenantId) .in(ShopOrder::getFormId, uniqueGoodsIds) @@ -155,7 +154,9 @@ public class GltTicketIssueService { @Transactional public void suerTicketRelease(String orderNo, Integer tenantId){ //1.订单为空跳过执行 - ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId); + ShopOrder shopOrder = shopOrderMapper.selectOne(new LambdaQueryWrapper() + .eq(ShopOrder::getOrderNo, orderNo) + .eq(ShopOrder::getTenantId, tenantId)); if(shopOrder == null){ return; } @@ -187,14 +188,10 @@ public class GltTicketIssueService { //6.更新商品订单为已完成、已收到赠品状态 if (release.get()) { - shopOrderService.update(new LambdaUpdateWrapper() - .eq(ShopOrder::getOrderId, shopOrder.getOrderId()) - .eq(ShopOrder::getTenantId, tenantId) - .eq(ShopOrder::getOrderStatus, 0) - .set(ShopOrder::getOrderStatus, 1) - .set(ShopOrder::getHasTakeGift, true) - .set(ShopOrder::getUpdateTime, LocalDateTime.now()) - ); + shopOrder.setOrderStatus(1); + shopOrder.setHasTakeGift(true); + shopOrder.setUpdateTime(LocalDateTime.now()); + shopOrderMapper.updateById(shopOrder); } } @@ -225,15 +222,10 @@ public class GltTicketIssueService { if (shouldCompleteOrder) { LocalDateTime now = LocalDateTime.now(); // 任务执行完后将订单置为“已完成”，避免后续扫描重复处理（幂等虽可挡住，但会产生大量无意义查询）。 - shopOrderService.update( - new LambdaUpdateWrapper() - .eq(ShopOrder::getOrderId, order.getOrderId()) - .eq(ShopOrder::getTenantId, tenantId) - .eq(ShopOrder::getOrderStatus, 0) - .set(ShopOrder::getOrderStatus, 1) - .set(ShopOrder::getHasTakeGift, true) - .set(ShopOrder::getUpdateTime, now) - ); + order.setOrderStatus(1); + order.setHasTakeGift(true); + order.setUpdateTime(LocalDateTime.now()); + shopOrderMapper.updateById(order); } return issuedCount; @@ -254,7 +246,7 @@ public class GltTicketIssueService { // - 这里先对商城订单行加行锁，保证同一订单在同一时刻只会被一个事务处理。 // (注意：需数据库支持 SELECT ... FOR UPDATE，且 shop_order.order_id 为主键/有索引) if (order.getOrderId() != null) { - shopOrderService.getOne( + shopOrderMapper.selectOne( new LambdaQueryWrapper() .eq(ShopOrder::getOrderId, order.getOrderId()) .eq(ShopOrder::getTenantId, tenantId) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 00df5b5..c22fd88 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: modules password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver @@ -15,9 +15,8 @@ spring: redis: database: 0 - host: 127.0.0.1 - port: 6379 - password: redis_t74P8C + host: localhost + port: 6379 # 日志配置 logging: diff --git a/src/main/resources/application-glt.yml b/src/main/resources/application-glt.yml index 4eb942f..844d97e 100644 --- a/src/main/resources/application-glt.yml +++ b/src/main/resources/application-glt.yml @@ -50,7 +50,7 @@ config: # 生产环境接口 server-url: https://glt-server.websoft.top/api # 业务模块接口 - api-url: https://glt-api.websoft.top/api + api-url: https://glt-dev-api.websoft.top/api upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml deleted file mode 100644 index c22fd88..0000000 --- a/src/main/resources/application-local.yml +++ /dev/null @@ -1,69 +0,0 @@ -# 开发环境配置 - -# 服务器配置 -server: - port: 9200 - -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: modules - password: tYmmMGh5wpwXR3ae - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - - redis: - database: 0 - host: localhost - port: 6379 - -# 日志配置 -logging: - level: - com.gxwebsoft: DEBUG - com.baomidou.mybatisplus: DEBUG - -socketio: - host: localhost #IP地址 - -# MQTT配置 -mqtt: - enabled: false # 添加开关来禁用MQTT服务 - host: tcp://132.232.214.96:1883 - username: swdev - password: Sw20250523 - client-id-prefix: hjm_car_ - topic: /SW_GPS/# - qos: 2 - connection-timeout: 10 - keep-alive-interval: 20 - auto-reconnect: true - -# 框架配置 -config: - # 开发环境接口 - server-url: https://glt-server.websoft.top/api - upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) - -# 开发环境证书配置 -certificate: - load-mode: CLASSPATH # 开发环境从classpath加载 - wechat-pay: - dev: - private-key-file: "apiclient_key.pem" - apiclient-cert-file: "apiclient_cert.pem" - wechatpay-cert-file: "wechatpay_cert.pem" - -# 阿里云翻译配置 -aliyun: - translate: - access-key-id: LTAI5tEsyhW4GCKbds1qsopg - access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO - endpoint: mt.cn-hangzhou.aliyuncs.com - -# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致） -wechatpay: - transfer: - scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]' diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 910449c..703b485 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,8 +4,8 @@ server: # 多环境配置 spring: profiles: - active: local -# active: dev + active: dev +# active: glt # active: prod application: From f3d6bbef63a808009e76b744d8ca5effe8a6eb0c Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 13 May 2026 09:55:49 +0800 Subject: [PATCH 42/60] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=91=98=E8=AE=A1=E7=AE=97=E4=B8=80=E7=BA=A7=E3=80=81=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E5=88=86=E9=94=80=E4=BD=A3=E9=87=91=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=202.=E4=BC=98=E5=8C=96=E9=80=81=E6=B0=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=B8=9A=E5=8A=A1=203.=E4=BC=98=E5=8C=96=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E6=98=8E=E7=BB=86=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1=204.?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E4=B8=9A=E5=8A=A1=E5=A2=9E=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95ID=E4=BC=A0=E5=85=A5=E4=BC=9A=E4=B8=8E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7ID=E9=87=8D=E5=A4=8D=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=83=BD=E6=98=AF=E5=B7=B2=E4=BD=BF=E7=94=A8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GltTicketOrderController.java | 6 ++--- .../task/DealerOrderSettlement10584Task.java | 26 +++++++++++------- .../ShopDealerCapitalController.java | 16 +++++------ .../ShopDealerWithdrawController.java | 5 ++++ .../shop/entity/ShopDealerWithdraw.java | 3 +++ .../shop/mapper/ShopDealerRefereeMapper.java | 3 ++- .../mapper/xml/ShopDealerCapitalMapper.xml | 1 - .../mapper/xml/ShopDealerRefereeMapper.xml | 11 +++++--- ...opDealerCommissionRollbackServiceImpl.java | 2 +- .../shop/vo/ShopDealerRefereeVO.java | 27 +++++++++++++++++++ 10 files changed, 73 insertions(+), 27 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopDealerRefereeVO.java diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java index 09ab3e8..f928a07 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java @@ -329,16 +329,14 @@ public class GltTicketOrderController extends BaseController { if (addr == null) { return null; } - if (StrUtil.isNotBlank(addr.getFullAddress())) { - return addr.getFullAddress(); - } // 兼容旧数据：fullAddress 为空时，拼接省市区 + 详细地址 return StrUtil.blankToDefault( StrUtil.join("", StrUtil.nullToEmpty(addr.getProvince()), StrUtil.nullToEmpty(addr.getCity()), StrUtil.nullToEmpty(addr.getRegion()), - StrUtil.nullToEmpty(addr.getAddress()) + StrUtil.nullToEmpty(addr.getAddress()), + StrUtil.nullToEmpty(addr.getFullAddress()) ), addr.getAddress() ); diff --git a/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java b/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java index 6f64719..d60c107 100644 --- a/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java @@ -16,6 +16,7 @@ import com.gxwebsoft.shop.mapper.ShopDealerRefereeMapper; import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.service.*; import com.gxwebsoft.shop.util.UpstreamUserFinder; +import com.gxwebsoft.shop.vo.ShopDealerRefereeVO; import com.gxwebsoft.shop.vo.ShopOrderGoodsVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -484,16 +485,23 @@ public class DealerOrderSettlement10584Task { AtomicReference simpleMoney = new AtomicReference<>(BigDecimal.ZERO); - if (dealerLevel >= 1) { - Integer dealerId = shopDealerRefereeMapper.getDealerIdByUserId(order.getUserId()); - if(dealerId != null){ - directDealerId = dealerId; + ShopDealerRefereeVO dealerRefereeVO = shopDealerRefereeMapper.getDealerIdByUserId(order.getUserId()); + if (dealerLevel == 1) { + Integer directUserId = dealerRefereeVO.getDirectUserId(); + Integer directUserType = dealerRefereeVO.getDirectUserType(); + if(directUserId != null && directUserType != null && directUserType == 0){ + directDealerId = dealerRefereeVO.getDirectUserId(); } - } - if (dealerLevel >= 2 && directDealerId != null) { - Integer dealerId = shopDealerRefereeMapper.getDealerIdByUserId(directDealerId); - if(dealerId != null){ - simpleDealerId = dealerId; + }else { + Integer directUserId = dealerRefereeVO.getDirectUserId(); + Integer directUserType = dealerRefereeVO.getDirectUserType(); + Integer simpleUserId = dealerRefereeVO.getSimpleUserId(); + Integer simpleUserType = dealerRefereeVO.getSimpleUserType(); + if(directUserId != null && directUserType != null && directUserType == 0){ + directDealerId = directUserId; + } + if(simpleUserId != null && simpleUserType != null && simpleUserType == 0){ + simpleDealerId = simpleUserId; } } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java index d7ccaf1..c23cfd9 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java @@ -1,17 +1,17 @@ package com.gxwebsoft.shop.controller; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.ShopDealerCapitalService; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.param.ShopDealerCapitalParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.ShopDealerCapitalService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -34,7 +34,7 @@ public class ShopDealerCapitalController extends BaseController { @PreAuthorize("hasAuthority('shop:shopDealerCapital:list')") @Operation(summary = "分页查询分销商资金明细表") @GetMapping("/page") - public ApiResult> page(ShopDealerCapitalParam param) { + public ApiResult> page(@ParameterObject ShopDealerCapitalParam param) { // 使用关联查询 return success(shopDealerCapitalService.pageRel(param)); } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java index b13ef3a..57fb70d 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java @@ -2,6 +2,7 @@ package com.gxwebsoft.shop.controller; import cn.hutool.core.util.StrUtil; import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.shop.entity.ShopDealerUser; import com.gxwebsoft.shop.service.ShopDealerUserService; import com.gxwebsoft.shop.service.ShopDealerWithdrawService; @@ -43,6 +44,8 @@ public class ShopDealerWithdrawController extends BaseController { private ShopDealerUserService shopDealerUserService; @Resource private WxTransferService wxTransferService; + @Resource + private OrderNoUtils orderNoUtils; @PreAuthorize("hasAuthority('shop:shopDealerWithdraw:list')") @Operation(summary = "分页查询分销商提现明细表") @@ -89,6 +92,8 @@ public class ShopDealerWithdrawController extends BaseController { return fail("tenantId为空，无法发起提现"); } + String orderNo = orderNoUtils.generate("WD"); + shopDealerWithdraw.setOrderNo(orderNo); shopDealerWithdraw.setTenantId(tenantId); shopDealerWithdraw.setUserId(loginUser.getUserId()); diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java index 6289926..752db70 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java @@ -27,6 +27,9 @@ public class ShopDealerWithdraw implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; + @Schema(description = "订单号") + private String orderNo; + @Schema(description = "分销商用户ID") private Integer userId; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java index 7c9c491..0fffecd 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gxwebsoft.shop.entity.ShopDealerReferee; import com.gxwebsoft.shop.param.ShopDealerRefereeParam; +import com.gxwebsoft.shop.vo.ShopDealerRefereeVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -39,6 +40,6 @@ public interface ShopDealerRefereeMapper extends BaseMapper { * @param userId 用户ID * @return */ - Integer getDealerIdByUserId(@Param("userId") Integer userId); + ShopDealerRefereeVO getDealerIdByUserId(@Param("userId") Integer userId); } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml index d1fa10e..f94b40f 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml @@ -40,7 +40,6 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR a.user_id = #{param.keywords} OR a.order_no = #{param.keywords} ) diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml index ac748e2..72960dd 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml @@ -57,15 +57,20 @@ - SELECT - a.dealer_id + b.user_id directUserId, + b.type directUserType, + d.user_id simpleUserId, + d.type simpleUserType FROM shop_dealer_referee a LEFT JOIN shop_dealer_user b ON a.dealer_id = b.user_id + LEFT JOIN shop_dealer_referee c ON b.user_id = c.user_id + LEFT JOIN shop_dealer_user d ON d.user_id = c.dealer_id WHERE b.is_delete = 0 - AND b.type = 0 + and d.is_delete = 0 AND a.user_id = #{userId} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java index d43001a..232854d 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java @@ -166,7 +166,7 @@ public class ShopDealerCommissionRollbackServiceImpl implements ShopDealerCommis if (refundAmount.compareTo(orderBaseAmount) >= 0) { return BigDecimal.ONE; } - return refundAmount.divide(orderBaseAmount, 10, RoundingMode.HALF_UP); + return refundAmount.divide(orderBaseAmount, 3, RoundingMode.HALF_UP); } private void markDealerOrderInvalid(Integer tenantId, String orderNo) { diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopDealerRefereeVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopDealerRefereeVO.java new file mode 100644 index 0000000..cead2ea --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopDealerRefereeVO.java @@ -0,0 +1,27 @@ +package com.gxwebsoft.shop.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * + * @author xm + * @since 2026-05-13 + */ +@Data +@Schema(description = "两级推荐人数据") +public class ShopDealerRefereeVO { + + @Schema(description = "一级推荐人") + private Integer directUserId; + + @Schema(description = "一级推荐人类型 0-分销商 1-门店/服务商 2-集团分红") + private Integer directUserType; + + @Schema(description = "二级推荐人") + private Integer simpleUserId; + + @Schema(description = "二级推荐人类型 0-分销商 1-门店/服务商 2-集团分红") + private Integer simpleUserType; + +} From c3fcb36f663f451d54e8e17cdc09a82b412636f2 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 13 May 2026 16:32:09 +0800 Subject: [PATCH 43/60] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=8C=89=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=9B=9E=E9=80=80=E5=88=86?= =?UTF-8?q?=E9=94=80=E7=94=A8=E6=88=B7=E9=92=B1=E5=8C=85=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=8A=E5=90=8C=E6=AD=A5=E7=94=9F=E4=BA=A7=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/enums/ShopDealerTypeEnum.java | 3 +- .../controller/ShopDealerUserController.java | 8 ++ .../ShopDealerWithdrawController.java | 3 +- .../shop/controller/ShopOrderController.java | 11 +- .../shop/dto/ShopDealerRefundDto.java | 28 +++++ .../shop/entity/ShopDealerCapital.java | 4 +- .../ShopDealerCommissionRollbackService.java | 2 + .../shop/service/ShopDealerUserService.java | 8 ++ ...opDealerCommissionRollbackServiceImpl.java | 55 ++++++++ .../impl/ShopDealerUserServiceImpl.java | 118 ++++++++++++++++++ src/main/resources/application-dev.yml | 5 + 11 files changed, 237 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/dto/ShopDealerRefundDto.java diff --git a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java index 51cb3be..55fce65 100644 --- a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java +++ b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java @@ -13,7 +13,8 @@ public enum ShopDealerTypeEnum { FREEZE_ACCOUNT(1, "操作冻结账户余额"), WITHDRAW_ACCOUNT(2, "操作提现账户余额【直接结算】"), - DEFROST(3, "解冻"); + DEFROST(3, "解冻"), + ORDER_REFUND(4, "退单"); private final Integer code; private final String desc; diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java index 9cecbd2..fd4a688 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java @@ -11,6 +11,7 @@ import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.dto.ShopDealerRefundDto; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.ShopDealerUser; import com.gxwebsoft.shop.param.ShopDealerUserImportParam; @@ -185,4 +186,11 @@ public class ShopDealerUserController extends BaseController { return success(shopDealerUserService.reduceBalance(reduceDto)); } + @Operation(summary = "分销退单") + @PostMapping("/refundOrder") + @Deprecated + public ApiResult refundOrder(@RequestBody ShopDealerRefundDto refundDto) { + return success(shopDealerUserService.refundOrder(refundDto)); + } + } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java index 57fb70d..0127250 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java @@ -256,7 +256,8 @@ public class ShopDealerWithdrawController extends BaseController { } // 使用提现记录ID构造单号，保持幂等；微信要求 5-32 且仅字母/数字 - String outBillNo = String.format("WD%03d", db.getId()); + String outBillNo = db.getOrderNo(); + String remark = "分销商提现"; String userName = db.getRealName(); diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index efba38e..95cea99 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -17,6 +17,7 @@ import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.Payment; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.glt.service.GltTicketIssueService; import com.gxwebsoft.glt.service.GltTicketRevokeService; import com.gxwebsoft.payment.dto.PaymentResponse; @@ -111,6 +112,8 @@ public class ShopOrderController extends BaseController { private ShopDealerCommissionRollbackService shopDealerCommissionRollbackService; @Resource private GltTicketIssueService gltTicketIssueService; + @Resource + private OrderNoUtils orderNoUtils; @Operation(summary = "分页查询订单") @GetMapping("/page") @@ -493,12 +496,12 @@ public class ShopOrderController extends BaseController { if (!Boolean.TRUE.equals(current.getPayStatus())) { return fail("订单未支付，无法退款"); } - if (StrUtil.isNotBlank(current.getRefundOrder())) { - logger.warn("订单已经退款过，订单号: {}, 退款单号: {}", current.getOrderNo(), current.getRefundOrder()); + if (StrUtil.isNotBlank(current.getRefundOrder()) || current.getOrderStatus() == 6) { + logger.warn("订单已经退款过，订单号: {}, 退款单号: {}", current.getOrderNo(), current.getRefundOrder() != null ? current.getRefundOrder() : ""); return fail("订单已退款，请勿重复操作"); } - String refundNo = "RF" + IdUtil.getSnowflakeNextId(); + String refundNo = orderNoUtils.generate("RF"); BigDecimal refundAmount = req.getRefundMoney(); if (refundAmount == null || refundAmount.compareTo(BigDecimal.ZERO) <= 0) { @@ -572,7 +575,7 @@ public class ShopOrderController extends BaseController { rollbackOrder.setOrderNo(current.getOrderNo()); rollbackOrder.setPayPrice(current.getPayPrice()); rollbackOrder.setTotalPrice(current.getTotalPrice()); - boolean rollbackOk = shopDealerCommissionRollbackService.rollbackOnOrderRefund(rollbackOrder, refundAmount); + boolean rollbackOk = shopDealerCommissionRollbackService.rollbackOnOrderRefundV2(rollbackOrder, refundAmount); if (!rollbackOk) { logger.error("退款成功但回退分红/分润/佣金失败 - tenantId={}, orderId={}, orderNo={}", tenantId, current.getOrderId(), current.getOrderNo()); diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerRefundDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerRefundDto.java new file mode 100644 index 0000000..c1576f3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerRefundDto.java @@ -0,0 +1,28 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 分销订单退款 + * @author xm + * @since 2026-05-13 + */ +@Data +@Schema(name = "ShopDealerUserReduceDto", description = "分销订单退款") +public class ShopDealerRefundDto { + + @Schema(description = "订单号") + @NotNull(message = "变订单号不可为空！") + private String orderNo; + + @Schema(description = "租户ID") + private Integer tenantId; + + @Schema(description = "退款金额") + private BigDecimal refundAmount; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java index 864b842..cbddfe8 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java @@ -35,7 +35,7 @@ public class ShopDealerCapital implements Serializable { @Schema(description = "分销商用户ID") private Integer userId; - @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻") + @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻 4-退款") private Integer type; @Schema(description = "分销商昵称") @@ -49,7 +49,7 @@ public class ShopDealerCapital implements Serializable { @TableField(exist = false) private Integer orderStatus; - @Schema(description = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)") + @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)") private Integer flowType; @Schema(description = "变更金额") diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerCommissionRollbackService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerCommissionRollbackService.java index e0fca92..5dbd54f 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerCommissionRollbackService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerCommissionRollbackService.java @@ -17,5 +17,7 @@ public interface ShopDealerCommissionRollbackService { * @return true=执行成功或无可回退数据；false=执行失败 */ boolean rollbackOnOrderRefund(ShopOrder order, BigDecimal refundAmount); + + boolean rollbackOnOrderRefundV2(ShopOrder order, BigDecimal refundAmount); } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index ef2a6d5..dc4131c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -2,6 +2,7 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.dto.ShopDealerRefundDto; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.ShopDealerUser; import com.gxwebsoft.shop.param.ShopDealerUserParam; @@ -50,4 +51,11 @@ public interface ShopDealerUserService extends IService { * @return */ Boolean reduceBalance(ShopDealerUserReduceDto reduceDto); + + /** + * 分销订单退款 + * @param refundDto + * @return + */ + Boolean refundOrder(ShopDealerRefundDto refundDto); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java index 232854d..7625bd7 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java @@ -1,8 +1,10 @@ package com.gxwebsoft.shop.service.impl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.gxwebsoft.shop.dto.ShopDealerRefundDto; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.entity.ShopDealerOrder; import com.gxwebsoft.shop.entity.ShopDealerUser; @@ -137,6 +139,59 @@ public class ShopDealerCommissionRollbackServiceImpl implements ShopDealerCommis return true; } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean rollbackOnOrderRefundV2(ShopOrder order, BigDecimal refundAmount) { + if (order == null || order.getTenantId() == null || StrUtil.isEmpty(order.getOrderNo())) { + return true; + } + Integer tenantId = order.getTenantId(); + String orderNo = order.getOrderNo(); + + //判断退款金额不能大于实付金额 + if(refundAmount.compareTo(order.getPayPrice()) > 0){ + throw new RuntimeException("退款金额不能大于订单实付金额！"); + } + + //执行分销订单退款业务 + ShopDealerRefundDto refundDto = new ShopDealerRefundDto(); + refundDto.setOrderNo(orderNo); + refundDto.setTenantId(tenantId); + refundDto.setRefundAmount(refundAmount); + Boolean refundResult = shopDealerUserService.refundOrder(refundDto); + + if(refundResult){ + //退款金额与实付金额一致，标记分销订单失效 + if (order.getPayPrice().compareTo(refundAmount) == 0) { + markDealerOrderInvalid(tenantId, orderNo); + }else { + BigDecimal rate = refundAmount.divide(order.getPayPrice(), 3, RoundingMode.HALF_UP); + BigDecimal remainRate = BigDecimal.ONE.subtract(rate); + LambdaQueryWrapper orderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopDealerOrder::getOrderNo, orderNo); + ShopDealerOrder shopDealerOrder = shopDealerOrderService.getOne(orderLambdaQueryWrapper); + if(shopDealerOrder != null){ + if(shopDealerOrder.getFirstMoney().compareTo(BigDecimal.ZERO) > 0){ + shopDealerOrder.setFirstMoney(shopDealerOrder.getFirstMoney().multiply(remainRate)); + } + if(shopDealerOrder.getSecondMoney().compareTo(BigDecimal.ZERO) > 0){ + shopDealerOrder.setSecondMoney(shopDealerOrder.getSecondMoney().multiply(remainRate)); + } + if(shopDealerOrder.getFirstDividend().compareTo(BigDecimal.ZERO) > 0){ + shopDealerOrder.setFirstDividend(shopDealerOrder.getFirstDividend().multiply(remainRate)); + } + if(shopDealerOrder.getSecondDividend().compareTo(BigDecimal.ZERO) > 0){ + shopDealerOrder.setSecondDividend(shopDealerOrder.getSecondDividend().multiply(remainRate)); + } + shopDealerOrder.setUpdateTime(LocalDateTime.now()); + shopDealerOrderService.updateById(shopDealerOrder); + } + } + return Boolean.TRUE; + }else { + return Boolean.FALSE; + } + } + private boolean hasUnfreezeMarker(Integer tenantId, ShopDealerCapital cap) { if (tenantId == null || cap == null || cap.getId() == null || cap.getUserId() == null || cap.getOrderNo() == null) { return false; diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index 12fc4e3..80c00e2 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -10,12 +10,16 @@ import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; import com.gxwebsoft.common.system.redis.OrderNoUtils; +import com.gxwebsoft.shop.dto.ShopDealerRefundDto; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.entity.ShopDealerUser; +import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.mapper.ShopDealerCapitalMapper; import com.gxwebsoft.shop.mapper.ShopDealerUserMapper; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.param.ShopDealerUserParam; +import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.service.ShopDealerUserService; import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; @@ -23,7 +27,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -44,6 +51,10 @@ public class ShopDealerUserServiceImpl extends ServiceImpl dealerCapitalList = shopDealerCapitalMapper.selectList( + new LambdaQueryWrapper() + .eq(ShopDealerCapital::getTenantId, entity.getTenantId()) + .eq(ShopDealerCapital::getOrderNo, entity.getOrderNo()) + .in(ShopDealerCapital::getFlowType, Arrays.asList(ShopDealerCapitalUpdateEnum.DISTRIBUTION_INCOME.getType(), + ShopDealerCapitalUpdateEnum.MANAGEMENT_INCOME.getType(), ShopDealerCapitalUpdateEnum.DIVIDEND_INCOME.getType(), + ShopDealerCapitalUpdateEnum.PROMOTION_INCOME.getType(), ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW.getType(), + ShopDealerCapitalUpdateEnum.DELIVERY_INCOME.getType())) + .isNotNull(ShopDealerCapital::getUserId) + ); + + if(CollectionUtils.isNotEmpty(dealerCapitalList)){ + //2.查询订单信息 + ShopOrder order = shopOrderMapper.selectOne(new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getPayPrice, ShopOrder::getUserId) + .eq(ShopOrder::getOrderNo, entity.getOrderNo())); + + //3.订单不存在则回退 + if(order == null){ + throw new RuntimeException("退款查询订单信息失败！"); + } + + //4.订单实付金额为0则不执行退款业务 + if(order.getPayPrice().compareTo(BigDecimal.ZERO) <= 0){ + return Boolean.TRUE; + } + + //5.退款金额不能大于实付金额 + if(entity.getRefundAmount().compareTo(order.getPayPrice()) > 0){ + throw new RuntimeException("退款金额不能大于实付金额！"); + } + + //6.查询分销用户信息 + List shopDealerUserList = new ArrayList<>(); + List userIdList = dealerCapitalList.stream().map(ShopDealerCapital::getUserId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + shopDealerUserList = lambdaQuery().in(ShopDealerUser::getUserId, userIdList).list(); + } + + //7.创建批量更新用户钱包、批量信息分销明细集合对象 + List shopDealerUserUpdateList = new ArrayList<>(); + List newCapitalList = new ArrayList<>(); + + //8.以用户分组，对结算订单进行业务操作 + Map> userDealerMap = dealerCapitalList.stream().collect(Collectors.groupingBy(ShopDealerCapital::getUserId)); + + //9.计算退款比率【退款金额/实付金额】 + BigDecimal rate = entity.getRefundAmount().divide(order.getPayPrice(), 3, RoundingMode.HALF_UP);; + + //10.遍历用户分销对象数据执行业务 + List finalShopDealerUserList = shopDealerUserList; + BigDecimal finalRate = rate; + userDealerMap.forEach((k, value) ->{ + BigDecimal money = value.stream().map(ShopDealerCapital::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate); + BigDecimal freezeMoney = value.stream().map(ShopDealerCapital::getFreezeMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate); + + ShopDealerUser dealerUser = finalShopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null); + if(dealerUser != null){ + //11.修改分销用户账户信息 + dealerUser.setMoney(dealerUser.getMoney().subtract(money)); + dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney)); + dealerUser.setTotalMoney(dealerUser.getTotalMoney().subtract(money.add(freezeMoney))); + dealerUser.setUpdateTime(LocalDateTime.now()); + shopDealerUserUpdateList.add(dealerUser); + + //12.新增退单分销记录 + ShopDealerCapital capital = new ShopDealerCapital(); + String no = orderNoUtils.generate("R"); + capital.setNo(no); + capital.setUserId(k); + capital.setType(ShopDealerTypeEnum.ORDER_REFUND.getCode()); + capital.setOrderNo(entity.getOrderNo()); + capital.setFlowType(ShopDealerCapitalUpdateEnum.ORDER_REFUND.getType()); + capital.setMoney(money.negate()); + capital.setMoneyAfter(dealerUser.getMoney()); + capital.setFreezeMoney(freezeMoney.negate()); + capital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + capital.setComments(ShopDealerCapitalUpdateEnum.ORDER_REFUND.getDescription()); + capital.setToUserId(order.getUserId()); + capital.setTenantId(entity.getTenantId()); + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser != null){ + capital.setCreator(loginUser.getUserId()); + } + capital.setCreateTime(LocalDateTime.now()); + newCapitalList.add(capital); + } + }); + + //13.批量修改分销用户钱包余额 + if(CollectionUtils.isNotEmpty(shopDealerUserUpdateList)){ + updateBatchById(shopDealerUserUpdateList); + } + + //14.批量生成分销记录数据 + if(CollectionUtils.isNotEmpty(newCapitalList)){ + shopDealerCapitalService.saveBatch(newCapitalList); + } + return Boolean.TRUE; + }else { + return Boolean.TRUE; + } + } + public ShopDealerUser getDealerUser(Integer userId){ ShopDealerUser shopDealerUser = baseMapper.selectOne(new LambdaQueryWrapper().eq(ShopDealerUser::getUserId, userId)); if(shopDealerUser == null){ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c22fd88..9398561 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -18,6 +18,11 @@ spring: host: localhost port: 6379 +# database: 0 +# host: 8.134.55.105 +# port: 16379 +# password: redis_t74P8C + # 日志配置 logging: level: From cdabd5d446427755bf81221b05371b0e1f39b305 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 13 May 2026 17:29:45 +0800 Subject: [PATCH 44/60] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B0=B4=E7=A5=A8?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gxwebsoft/glt/service/GltTicketIssueService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 049898a..f4358ec 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -188,7 +188,6 @@ public class GltTicketIssueService { //6.更新商品订单为已完成、已收到赠品状态 if (release.get()) { - shopOrder.setOrderStatus(1); shopOrder.setHasTakeGift(true); shopOrder.setUpdateTime(LocalDateTime.now()); shopOrderMapper.updateById(shopOrder); From 65f1fa861d6838b46a5e866ff24a707e3f72146f Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Thu, 14 May 2026 01:33:58 +0800 Subject: [PATCH 45/60] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/WxLoginController.java | 1700 ++++++++--------- src/main/resources/application-glt.yml | 3 +- 2 files changed, 852 insertions(+), 851 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java index 3c3942d..533bb03 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -1,851 +1,851 @@ -//package com.gxwebsoft.common.system.controller; -// -//import cn.hutool.core.io.FileUtil; -//import cn.hutool.core.util.RandomUtil; -//import cn.hutool.core.util.StrUtil; -//import cn.hutool.http.HttpRequest; -//import cn.hutool.http.HttpUtil; -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONObject; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.fasterxml.jackson.databind.JsonNode; -//import com.fasterxml.jackson.databind.ObjectMapper; -//import com.gxwebsoft.cms.entity.CmsWebsite; -//import com.gxwebsoft.cms.service.CmsWebsiteService; -//import com.gxwebsoft.common.core.config.ConfigProperties; -//import com.gxwebsoft.common.core.exception.BusinessException; -//import com.gxwebsoft.common.core.security.JwtSubject; -//import com.gxwebsoft.common.core.security.JwtUtil; -//import com.gxwebsoft.common.core.utils.CommonUtil; -//import com.gxwebsoft.common.core.utils.RedisUtil; -//import com.gxwebsoft.common.core.utils.RequestUtil; -//import com.gxwebsoft.common.core.web.ApiResult; -//import com.gxwebsoft.common.core.web.BaseController; -//import com.gxwebsoft.common.system.entity.*; -//import com.gxwebsoft.common.system.param.UserParam; -//import com.gxwebsoft.common.system.result.LoginResult; -//import com.gxwebsoft.common.system.service.*; -//import io.swagger.v3.oas.annotations.tags.Tag; -//import io.swagger.v3.oas.annotations.Operation; -//import okhttp3.*; -//import org.springframework.data.redis.core.StringRedisTemplate; -//import org.springframework.transaction.annotation.Transactional; -//import org.springframework.web.bind.annotation.*; -//import org.springframework.web.bind.annotation.RequestBody; -// -//import javax.annotation.Resource; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -//import java.io.File; -//import java.io.IOException; -//import java.time.Instant; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -//import java.util.concurrent.TimeUnit; -//import java.util.concurrent.TimeUnit; -// -//import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN; -//import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; -//import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY; -// -//@RestController -//@RequestMapping("/api/wx-login") -//@Tag(name = "微信小程序登录API") -//public class WxLoginController extends BaseController { -// private final StringRedisTemplate redisTemplate; -// private final OkHttpClient http = new OkHttpClient(); -// private final ObjectMapper om; -// private volatile long tokenExpireEpoch = 0L; // 过期的 epoch 秒 -// @Resource -// private SettingService settingService; -// @Resource -// private UserService userService; -// @Resource -// private ConfigProperties configProperties; -// @Resource -// private UserRoleService userRoleService; -// @Resource -// private LoginRecordService loginRecordService; -// @Resource -// private RoleService roleService; -// @Resource -// private RedisUtil redisUtil; -// @Resource -// private RequestUtil requestUtil; -// @Resource -// private ConfigProperties config; -// @Resource -// private UserRefereeService userRefereeService; -// @Resource -// private CmsWebsiteService cmsWebsiteService; -// -// -// public WxLoginController(StringRedisTemplate redisTemplate, ObjectMapper objectMapper) { -// this.redisTemplate = redisTemplate; -// this.om = objectMapper; -// } -// -// @Operation(summary = "获取微信AccessToken") -// @Transactional(rollbackFor = {Exception.class}) -// @PostMapping("/getAccessToken") -// public ApiResult getMpAccessToken() { -// return success("操作成功", getAccessToken()); -// } -// -// @Operation(summary = "获取微信openId") -// @Transactional(rollbackFor = {Exception.class}) -// @PostMapping("/getOpenId") -// public ApiResult getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) { -// // 1.获取openid -// JSONObject result = getOpenIdByCode(userParam); -// String openid = result.getString("openid"); -// String unionid = result.getString("unionid"); -// if (openid == null) { -// return fail("获取openid失败", null); -// } -// // 2.通过openid查询用户是否已存在 -// User user = userService.getByOauthId(userParam); -// // 3.存在则签发token并返回登录成功,不存在则注册新用户 -// if (user == null) { -// user = addUser(userParam); -// } -// // 4.签发token -// loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request); -// String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), -// configProperties.getTokenExpireTime(), configProperties.getTokenKey()); -// return success("登录成功", new LoginResult(access_token, user)); -// } -// -// @Operation(summary = "微信授权手机号码并登录") -// @Transactional(rollbackFor = {Exception.class}) -// @PostMapping("/loginByMpWxPhone") -// public ApiResult loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) { -// // 获取手机号码 -// String phone = getPhoneByCode(userParam); -// if (phone == null) { -// String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); -// redisTemplate.delete(key); -// throw new BusinessException("授权失败，请重试"); -// } -// // 查询是否存在 -// User user = userService.getByPhone(phone); -// // 不存在则注册 -// if (user == null) { -// if ((userParam.getOpenid() == null || userParam.getOpenid().isEmpty()) && userParam.getAuthCode() != null) { -// UserParam userParam2 = new UserParam(); -// userParam2.setCode(userParam.getAuthCode()); -// JSONObject result = getOpenIdByCode(userParam2); -// String openid = result.getString("openid"); -//// String unionid = result.getString("unionid"); -// userParam.setOpenid(openid); -// } -// userParam.setPhone(phone); -// user = addUser(userParam); -// user.setRecommend(1); -// } else { -// // 存在则检查绑定上级 -// if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { -// UserReferee check = userRefereeService.check(user.getUserId(), userParam.getRefereeId()); -// if (check == null) { -// UserReferee userReferee = new UserReferee(); -// userReferee.setDealerId(userParam.getRefereeId()); -// userReferee.setUserId(user.getUserId()); -// userRefereeService.save(userReferee); -// } -// } -// } -// // 签发token -// String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), -// configProperties.getTokenExpireTime(), configProperties.getTokenKey()); -// loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request); -// // 附加体育中心项目用户信息 -//// user.setBookingUser(); -// return success("登录成功", new LoginResult(access_token, user)); -// } -// -// @Operation(summary = "微信授权手机号码并更新") -// @Transactional(rollbackFor = {Exception.class}) -// @PostMapping("/updatePhoneByMpWx") -// public ApiResult updatePhoneByMpWx(@RequestBody UserParam userParam) { -// // 获取微信授权手机号 -// String phone = getPhoneByCode(userParam); -// // 查询当前用户 -// User user = userService.getById(userParam.getUserId()); -// if (user != null && phone != null) { -// user.setPhone(phone); -// userService.updateUser(user); -// return success("更新成功", phone); -// } -// return fail("更新失败"); -// } -// -// /** -// * 新用户注册 -// */ -// private User addUser(UserParam userParam) { -// User addUser = new User(); -// // 注册用户 -// addUser.setStatus(0); -// addUser.setUsername(createUsername("wx_")); -// addUser.setNickname("微信用户"); -// addUser.setPlatform(MP_WEIXIN); -// addUser.setGradeId(2); -// if (userParam.getGradeId() != null) { -// addUser.setGradeId(userParam.getGradeId()); -// } -// if (userParam.getPhone() != null) { -// addUser.setPhone(userParam.getPhone()); -// } -// if (StrUtil.isNotBlank(userParam.getOpenid())) { -// addUser.setOpenid(userParam.getOpenid()); -// } -// if (StrUtil.isNotBlank(userParam.getUnionid())) { -// addUser.setUnionid(userParam.getUnionid()); -// } -// addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); -// addUser.setTenantId(getTenantId()); -// addUser.setRecommend(1); -// Role role = roleService.getOne(new QueryWrapper().eq("role_code", "user"), false); -// addUser.setRoleId(role.getRoleId()); -// if (userService.saveUser(addUser)) { -// // 添加用户角色 -// final UserRole userRole = new UserRole(); -// userRole.setUserId(addUser.getUserId()); -// userRole.setTenantId(addUser.getTenantId()); -// userRole.setRoleId(addUser.getRoleId()); -// userRoleService.save(userRole); -// } -// // 绑定关系 -// if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { -// UserReferee check = userRefereeService.check(addUser.getUserId(), userParam.getRefereeId()); -// if (check == null) { -// UserReferee userReferee = new UserReferee(); -// userReferee.setDealerId(userParam.getRefereeId()); -// userReferee.setUserId(addUser.getUserId()); -// userRefereeService.save(userReferee); -// } -// } -// return addUser; -// } -// -// // 获取openid -// private JSONObject getOpenIdByCode(UserParam userParam) { -// // 从缓存获取微信小程序配置信息 -// JSONObject setting = getWxConfigFromCache(getTenantId()); -// // 获取openId -// String apiUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + setting.getString("appId") + "&secret=" + setting.getString("appSecret") + "&js_code=" + userParam.getCode() + "&grant_type=authorization_code"; -// // 执行get请求 -// String result = HttpUtil.get(apiUrl); -// // 解析access_token -// return JSON.parseObject(result); -// } -// -// /** -// * 获取微信手机号码 -// * -// * @param userParam 需要传微信凭证code -// */ -// private String getPhoneByCode(UserParam userParam) { -// // 获取手机号码 -// String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken(); -// HashMap paramMap = new HashMap<>(); -// if (StrUtil.isBlank(userParam.getCode())) { -// throw new BusinessException("code不能为空"); -// } -// paramMap.put("code", userParam.getCode()); -// // 执行post请求 -// String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap)); -// JSONObject json = JSON.parseObject(post); -// if (json.get("errcode").equals(0)) { -// JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info")); -// // 微信用户的手机号码 -// final String phoneNumber = phoneInfo.getString("phoneNumber"); -// // 验证手机号码 -//// if (userParam.getNotVerifyPhone() == null && !Validator.isMobile(phoneNumber)) { -//// String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); -//// redisTemplate.delete(key); -//// throw new BusinessException("手机号码格式不正确"); -//// } -// return phoneNumber; -// } -// return null; -// } -// -// /** -// * 生成随机账号 -// * -// * @return username -// */ -// private String createUsername(String type) { -// return type.concat(RandomUtil.randomString(12)); -// } -// -// /** -// * 获取接口调用凭据AccessToken -// * ... -// */ -// public String getAccessToken() { -// Integer tenantId = getTenantId(); -// String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); -// -// // 从缓存获取微信小程序配置信息 -// JSONObject setting = getWxConfigFromCache(tenantId); -// if (setting == null) { -// throw new BusinessException("请先配置小程序"); -// } -// -// // 从缓存获取access_token -// String value = redisTemplate.opsForValue().get(key); -// if (value != null) { -// // 解析access_token -// JSONObject response = JSON.parseObject(value); -// String accessToken = response.getString("access_token"); -// if (accessToken != null) { -// return accessToken; -// } -// } -// -// // 微信获取凭证接口 -// String apiUrl = "https://api.weixin.qq.com/cgi-bin/token"; -// // 组装url参数 -// String url = apiUrl.concat("?grant_type=client_credential") -// .concat("&appid=").concat(setting.getString("appId")) -// .concat("&secret=").concat(setting.getString("appSecret")); -// -// // 执行get请求 -// String result = HttpUtil.get(url); -// // 解析access_token -// JSONObject response = JSON.parseObject(result); -// if (response.getString("access_token") != null) { -// // 存入缓存 -// redisTemplate.opsForValue().set(key, result, 7000L, TimeUnit.SECONDS); -// return response.getString("access_token"); -// } -// throw new BusinessException("小程序配置不正确"); -// } -// -// @Operation(summary = "获取微信openId并更新") -// @PostMapping("/getWxOpenId") -// public ApiResult getWxOpenId(@RequestBody UserParam userParam) { -// final User loginUser = getLoginUser(); -// if (loginUser == null) { -// return fail("请先登录"); -// } -// // 已存在直接返回 -// if (StrUtil.isNotBlank(loginUser.getOpenid())) { -// return success(loginUser); -// } -// // 请求微信接口获取openid -// String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; -// final HashMap map = new HashMap<>(); -// final JSONObject setting = getWxConfigFromCache(getTenantId()); -// final String appId = setting.getString("appId"); -// final String appSecret = setting.getString("appSecret"); -// map.put("appid", appId); -// map.put("secret", appSecret); -// map.put("js_code", userParam.getCode()); -// map.put("grant_type", "authorization_code"); -// final String response = HttpUtil.get(apiUrl, map); -// final JSONObject jsonObject = JSONObject.parseObject(response); -// String openid = jsonObject.getString("openid"); -// String sessionKey = jsonObject.getString("session_key"); -// String unionid = jsonObject.getString("unionid"); -// // 保存openID -// if (loginUser.getOpenid() == null || StrUtil.isBlank(loginUser.getOpenid())) { -// loginUser.setOpenid(openid); -// loginUser.setUnionid(unionid); -// requestUtil.updateUser(loginUser); -//// userService.updateById(loginUser); -// } -// return success("获取成功", jsonObject); -// } -// -// @Operation(summary = "仅获取微信openId") -// @PostMapping("/getWxOpenIdOnly") -// public ApiResult getWxOpenIdOnly(@RequestBody UserParam userParam) { -// -// String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; -// final HashMap map = new HashMap<>(); -// final JSONObject setting = getWxConfigFromCache(getTenantId()); -// final String appId = setting.getString("appId"); -// final String appSecret = setting.getString("appSecret"); -// map.put("appid", appId); -// map.put("secret", appSecret); -// map.put("js_code", userParam.getCode()); -// map.put("grant_type", "authorization_code"); -// final String response = HttpUtil.get(apiUrl, map); -// final JSONObject jsonObject = JSONObject.parseObject(response); -// return success("获取成功", jsonObject); -// } -// -// @Operation(summary = "获取微信小程序码-用户ID") -// @GetMapping("/getUserQRCode") -// public ApiResult getQRCode() { -// String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); -// final HashMap map = new HashMap<>(); -// map.put("path", "/package/user/qrcode?user_id=" + getLoginUserId()); -//// map.put("env_version","trial"); -// // 获取图片 Buffer -// byte[] qrCode = HttpRequest.post(apiUrl) -// .body(JSON.toJSONString(map)) -// .execute().bodyBytes(); -// -// // 保存的文件名称 -// final String fileName = CommonUtil.randomUUID8().concat(".png"); -// // 保存路径 -// String filePath = getUploadDir().concat("qrcode/") + fileName; -// File file = FileUtil.writeBytes(qrCode, filePath); -// if (file != null) { -// return success(config.getFileServer().concat("/qrcode/").concat(fileName)); -// } -// return fail("获取失败", null); -// } -// -// @Operation(summary = "获取微信小程序码-订单核销码") -// @GetMapping("/getOrderQRCode/{orderNo}") -// public ApiResult getOrderQRCode(@PathVariable("orderNo") String orderNo) { -// String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); -// final HashMap map = new HashMap<>(); -// map.put("path", "/package/admin/order-scan?orderNo=".concat(orderNo)); -// map.put("env_version", "release"); -// // 获取图片 Buffer -// byte[] qrCode = HttpRequest.post(apiUrl) -// .body(JSON.toJSONString(map)) -// .execute().bodyBytes(); -// -// // 保存的文件名称 -// final String fileName = CommonUtil.randomUUID8().concat(".png"); -// // 保存路径 -// String filePath = getUploadDir().concat("qrcode/") + fileName; -// File file = FileUtil.writeBytes(qrCode, filePath); -// if (file != null) { -// return success(config.getFileServer().concat("/qrcode/").concat(fileName)); -// } -// return fail("获取失败", null); -// } -// -// @Operation(summary = "获取微信小程序码-订单核销码-数量极多的业务场景") -// @GetMapping("/getOrderQRCodeUnlimited/{scene}") -// public void getOrderQRCodeUnlimited(@PathVariable("scene") String scene, HttpServletResponse response) throws IOException { -// try { -// // 从scene参数中解析租户ID -// System.out.println("scene = " + scene); -// Integer tenantId = extractTenantIdFromScene(scene); -// System.out.println("从scene参数中解析租户ID = " + tenantId); -// if (tenantId == null) { -// response.setStatus(HttpServletResponse.SC_BAD_REQUEST); -// response.getWriter().write("{\"error\":\"无法从scene参数中获取租户信息\"}"); -// return; -// } -// -// // 使用指定租户ID获取 access_token -// String accessToken = getAccessTokenForTenant(tenantId); -// String apiUrl = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken; -// -// final HashMap map = new HashMap<>(); -// map.put("scene", scene); -// map.put("page", "pages/index/index"); -// map.put("env_version", "release"); -// -// // 判断应用运行状态 -// final CmsWebsite website = cmsWebsiteService.getByTenantId(tenantId); -// if(website != null && Integer.valueOf(2).equals(website.getRunning())){ -// map.put("check_path",false); -// map.put("env_version","trial"); -// } -// -// String jsonBody = JSON.toJSONString(map); -// System.out.println("请求的 JSON body = " + jsonBody); -// -// // 获取微信 API 响应 -// cn.hutool.http.HttpResponse httpResponse = HttpRequest.post(apiUrl) -// .body(jsonBody) -// .execute(); -// -// byte[] responseBytes = httpResponse.bodyBytes(); -// String contentType = httpResponse.header("Content-Type"); -// -// // 检查响应内容类型，判断是否为错误响应 -// if (contentType != null && contentType.contains("application/json")) { -// // 微信返回了错误信息（JSON格式） -// String errorResponse = new String(responseBytes, "UTF-8"); -// System.err.println("微信 API 错误响应: " + errorResponse); -// -// // 返回错误信息给前端 -// response.setContentType("application/json;charset=UTF-8"); -// response.setStatus(HttpServletResponse.SC_BAD_REQUEST); -// response.getWriter().write(errorResponse); -// return; -// } -// -// // 成功获取二维码图片 -// response.setContentType("image/png"); -// response.setHeader("Cache-Control", "no-cache"); -// response.setHeader("Content-Disposition", "inline; filename=qrcode.png"); -// -// // 输出图片 -// response.getOutputStream().write(responseBytes); -// System.out.println("二维码生成成功，大小: " + responseBytes.length + " bytes"); -// -// } catch (Exception e) { -// System.err.println("生成二维码失败: " + e.getMessage()); -// e.printStackTrace(); -// -// // 返回错误信息 -// response.setContentType("application/json;charset=UTF-8"); -// response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); -// response.getWriter().write("{\"error\":\"生成二维码失败: " + e.getMessage() + "\"}"); -// } -// } -// -// @Operation(summary = "获取微信小程序码-用户ID") -// @GetMapping("/getQRCodeText") -// public byte[] getQRCodeText(String scene, String page, Integer width, -// Boolean isHyaline, String envVersion) throws IOException { -// HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/wxa/getwxacodeunlimit") -// .newBuilder() -// .addQueryParameter("access_token", getLocalAccessToken()) -// .build(); -// -// System.out.println("page = " + page); -// // 构造请求 JSON -// // 注意：scene 仅支持可见字符，长度上限 32，尽量 URL-safe（字母数字下划线等） -// // page 必须是已发布小程序内的路径（不带开头斜杠也可） -// var root = om.createObjectNode(); -// root.put("scene", scene); -// if (page != null) root.put("page", page); -// if (width != null) root.put("width", width); // 默认 430，建议 280~1280 -// if (isHyaline != null) root.put("is_hyaline", isHyaline); -// if (envVersion != null) root.put("env_version", envVersion); // release/trial/develop -// -// okhttp3.RequestBody reqBody = okhttp3.RequestBody.create( -// root.toString(), MediaType.parse("application/json; charset=utf-8")); -// Request req = new Request.Builder().url(url).post(reqBody).build(); -// -// try (Response resp = http.newCall(req).execute()) { -// if (!resp.isSuccessful()) { -// throw new IOException("HTTP " + resp.code() + " calling getwxacodeunlimit"); -// } -// MediaType ct = resp.body().contentType(); -// byte[] bytes = resp.body().bytes(); -// // 微信出错时返回 JSON，需要识别一下 -// if (ct != null && ct.subtype() != null && ct.subtype().contains("json")) { -// String err = new String(bytes); -// throw new IOException("WeChat error: " + err); -// } -// return bytes; // 成功就是图片二进制（PNG） -// } -// } -// -// /** -// * 获取/刷新 access_token -// */ -// public String getLocalAccessToken() throws IOException { -// long now = Instant.now().getEpochSecond(); -// String key = "AccessToken:Local:" + getTenantId(); -// -// // 从缓存获取access_token，使用JSON格式 -// String value = redisUtil.get(key); -// if (value != null && now < tokenExpireEpoch - 60) { -// try { -// // 尝试解析为JSON格式 -// JSONObject response = JSON.parseObject(value); -// String accessToken = response.getString("access_token"); -// if (accessToken != null) { -// System.out.println("从缓存获取到access_token(Local): " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); -// return accessToken; -// } -// } catch (Exception e) { -// // 如果解析失败，可能是旧格式的纯字符串token -// System.out.println("本地缓存token格式异常，使用原值: " + e.getMessage()); -// return value; -// } -// } -// -// // 从缓存获取微信小程序配置信息 -// Integer tenantId = getTenantId(); -// JSONObject setting = getWxConfigFromCache(tenantId); -// if (setting == null) { -// throw new IOException("请先配置小程序"); -// } -// -// String appId = setting.getString("appId"); -// String appSecret = setting.getString("appSecret"); -// -// if (appId == null || appSecret == null) { -// throw new IOException("小程序配置不完整，缺少 appId 或 appSecret"); -// } -// -// HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/cgi-bin/token") -// .newBuilder() -// .addQueryParameter("grant_type", "client_credential") -// .addQueryParameter("appid", appId) -// .addQueryParameter("secret", appSecret) -// .build(); -// -// Request req = new Request.Builder().url(url).get().build(); -// try (Response resp = http.newCall(req).execute()) { -// String body = resp.body().string(); -// JsonNode json = om.readTree(body); -// if (json.has("access_token")) { -// String token = json.get("access_token").asText(); -// long expiresIn = json.get("expires_in").asInt(7200); -// -// // 缓存完整的JSON响应，与其他方法保持一致 -// redisUtil.set(key, body, expiresIn, TimeUnit.SECONDS); -// tokenExpireEpoch = now + expiresIn; -// System.out.println("获取新的access_token成功(Local)，租户ID: " + tenantId); -// return token; -// } else { -// throw new IOException("Get access_token failed: " + body); -// } -// } -// } -// -// /** -// * 文件上传位置(服务器) -// */ -// private String getUploadDir() { -// return config.getUploadPath(); -// } -// -// @Operation(summary = "调试：检查微信小程序配置") -// @GetMapping("/debug/checkWxConfig") -// public ApiResult debugCheckWxConfig() { -// Integer tenantId = getTenantId(); -// Map result = new HashMap<>(); -// result.put("tenantId", tenantId); -// -// try { -// // 尝试从缓存获取配置 -// JSONObject setting = getWxConfigFromCache(tenantId); -// result.put("hasConfig", true); -// result.put("config", setting); -// result.put("cacheKey", MP_WX_KEY + tenantId); -// } catch (Exception e) { -// result.put("hasConfig", false); -// result.put("error", e.getMessage()); -// result.put("cacheKey", MP_WX_KEY + tenantId); -// -// // 提供创建配置的建议 -// Map suggestion = new HashMap<>(); -// suggestion.put("message", "请在Redis中创建微信小程序配置"); -// suggestion.put("cacheKey", MP_WX_KEY + tenantId); -// suggestion.put("tenantId", tenantId); -// suggestion.put("sampleConfig", createSampleWxConfig()); -// result.put("suggestion", suggestion); -// } -// -// return success("配置检查完成", result); -// } -// -// @Operation(summary = "调试：创建示例微信小程序配置") -// @PostMapping("/debug/createSampleWxConfig") -// public ApiResult debugCreateSampleWxConfig(@RequestBody Map params) { -// Integer tenantId = getTenantId(); -// -// String appId = params.get("appId"); -// String appSecret = params.get("appSecret"); -// -// if (appId == null || appSecret == null) { -// return fail("请提供 appId 和 appSecret", null); -// } -// -// try { -// // 直接在Redis中创建配置 -// String key = MP_WX_KEY + tenantId; -// -// // 创建配置内容 -// Map config = new HashMap<>(); -// config.put("appId", appId); -// config.put("appSecret", appSecret); -// config.put("tenantId", tenantId.toString()); -// config.put("settingKey", "mp-weixin"); -// config.put("settingId", "301"); -// -// // 保存到Redis缓存 -// redisUtil.set(key, JSON.toJSONString(config)); -// -// return success("微信小程序配置创建成功", config); -// } catch (Exception e) { -// return fail("创建配置失败: " + e.getMessage(), null); -// } -// } -// -// private Map createSampleWxConfig() { -// Map sample = new HashMap<>(); -// sample.put("appId", "wx_your_app_id_here"); -// sample.put("appSecret", "your_app_secret_here"); -// return sample; -// } -// -// @Operation(summary = "调试：获取AccessToken") -// @GetMapping("/debug/getAccessToken") -// public ApiResult debugGetAccessToken() { -// try { -// // 获取当前线程的租户ID -// Integer tenantId = getTenantId(); -// if (tenantId == null) { -// tenantId = 10550; // 默认租户 -// } -// -// System.out.println("=== 开始调试获取AccessToken，租户ID: " + tenantId + " ==="); -// -// // 手动调用获取AccessToken -// String accessToken = getAccessTokenForTenant(tenantId); -// -// String result = "获取AccessToken成功: " + (accessToken != null ? accessToken.substring(0, Math.min(10, accessToken.length())) + "..." : "null"); -// System.out.println("调试结果: " + result); -// -// return success(result); -// } catch (Exception e) { -// System.err.println("调试获取AccessToken异常: " + e.getMessage()); -// e.printStackTrace(); -// return fail("获取AccessToken失败: " + e.getMessage()); -// } -// } -// -// /** -// * 从Redis缓存中获取微信小程序配置 -// * @param tenantId 租户ID -// * @return 微信配置信息 -// */ -// private JSONObject getWxConfigFromCache(Integer tenantId) { -// String key = MP_WX_KEY + tenantId; -// String cacheValue = redisUtil.get(key); -// if (StrUtil.isBlank(cacheValue)) { -// throw new BusinessException("未找到微信小程序配置，请检查缓存key: " + key); -// } -// try { -// return JSON.parseObject(cacheValue); -// } catch (Exception e) { -// throw new BusinessException("微信小程序配置格式错误: " + e.getMessage()); -// } -// } -// -// /** -// * 从scene参数中提取租户ID -// * scene格式: uid_userId_tenantId（优先）或 uid_userId（兼容旧格式） -// */ -// private Integer extractTenantIdFromScene(String scene) { -// try { -// System.out.println("解析scene参数: " + scene); -// -// if (scene != null && scene.startsWith("uid_")) { -// String content = scene.substring(4); // 去掉"uid_"前缀 -// -// // 优先解析 uid_userId_tenantId 格式 -// String[] parts = content.split("_"); -// if (parts.length >= 2) { -// try { -// Integer tenantId = Integer.parseInt(parts[1]); -// System.out.println("从scene直接解析到tenantId = " + tenantId); -// return tenantId; -// } catch (NumberFormatException e) { -// System.err.println("scene中tenantId格式异常: " + parts[1]); -// } -// } -// -// // 兼容旧格式 uid_userId：根据用户ID查询租户ID -// if (parts.length == 1) { -// Integer userId = Integer.parseInt(parts[0]); -// System.out.println("userId = " + userId); -// try { -// List users = userService.listByIdIgnoreTenant(userId); -// System.out.println("查询到用户数量 = " + (users != null ? users.size() : 0)); -// if (users != null && !users.isEmpty()) { -// System.out.println("从用户ID " + userId + " 获取到租户ID: " + users.get(0).getTenantId()); -// return users.get(0).getTenantId(); -// } else { -// System.err.println("未找到用户ID: " + userId); +package com.gxwebsoft.common.system.controller; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.gxwebsoft.cms.entity.CmsWebsite; +import com.gxwebsoft.cms.service.CmsWebsiteService; +import com.gxwebsoft.common.core.config.ConfigProperties; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.security.JwtSubject; +import com.gxwebsoft.common.core.security.JwtUtil; +import com.gxwebsoft.common.core.utils.CommonUtil; +import com.gxwebsoft.common.core.utils.RedisUtil; +import com.gxwebsoft.common.core.utils.RequestUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.*; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.*; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import okhttp3.*; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.time.Instant; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeUnit; + +import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN; +import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; +import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY; + +@RestController +@RequestMapping("/api/wx-login") +@Tag(name = "微信小程序登录API") +public class WxLoginController extends BaseController { + private final StringRedisTemplate redisTemplate; + private final OkHttpClient http = new OkHttpClient(); + private final ObjectMapper om; + private volatile long tokenExpireEpoch = 0L; // 过期的 epoch 秒 + @Resource + private SettingService settingService; + @Resource + private UserService userService; + @Resource + private ConfigProperties configProperties; + @Resource + private UserRoleService userRoleService; + @Resource + private LoginRecordService loginRecordService; + @Resource + private RoleService roleService; + @Resource + private RedisUtil redisUtil; + @Resource + private RequestUtil requestUtil; + @Resource + private ConfigProperties config; + @Resource + private UserRefereeService userRefereeService; + @Resource + private CmsWebsiteService cmsWebsiteService; + + + public WxLoginController(StringRedisTemplate redisTemplate, ObjectMapper objectMapper) { + this.redisTemplate = redisTemplate; + this.om = objectMapper; + } + + @Operation(summary = "获取微信AccessToken") + @Transactional(rollbackFor = {Exception.class}) + @PostMapping("/getAccessToken") + public ApiResult getMpAccessToken() { + return success("操作成功", getAccessToken()); + } + + @Operation(summary = "获取微信openId") + @Transactional(rollbackFor = {Exception.class}) + @PostMapping("/getOpenId") + public ApiResult getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) { + // 1.获取openid + JSONObject result = getOpenIdByCode(userParam); + String openid = result.getString("openid"); + String unionid = result.getString("unionid"); + if (openid == null) { + return fail("获取openid失败", null); + } + // 2.通过openid查询用户是否已存在 + User user = userService.getByOauthId(userParam); + // 3.存在则签发token并返回登录成功,不存在则注册新用户 + if (user == null) { + user = addUser(userParam); + } + // 4.签发token + loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request); + String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + return success("登录成功", new LoginResult(access_token, user)); + } + + @Operation(summary = "微信授权手机号码并登录") + @Transactional(rollbackFor = {Exception.class}) + @PostMapping("/loginByMpWxPhone") + public ApiResult loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) { + // 获取手机号码 + String phone = getPhoneByCode(userParam); + if (phone == null) { + String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); + redisTemplate.delete(key); + throw new BusinessException("授权失败，请重试"); + } + // 查询是否存在 + User user = userService.getByPhone(phone); + // 不存在则注册 + if (user == null) { + if ((userParam.getOpenid() == null || userParam.getOpenid().isEmpty()) && userParam.getAuthCode() != null) { + UserParam userParam2 = new UserParam(); + userParam2.setCode(userParam.getAuthCode()); + JSONObject result = getOpenIdByCode(userParam2); + String openid = result.getString("openid"); +// String unionid = result.getString("unionid"); + userParam.setOpenid(openid); + } + userParam.setPhone(phone); + user = addUser(userParam); + user.setRecommend(1); + } else { + // 存在则检查绑定上级 + if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { + UserReferee check = userRefereeService.check(user.getUserId(), userParam.getRefereeId()); + if (check == null) { + UserReferee userReferee = new UserReferee(); + userReferee.setDealerId(userParam.getRefereeId()); + userReferee.setUserId(user.getUserId()); + userRefereeService.save(userReferee); + } + } + } + // 签发token + String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request); + // 附加体育中心项目用户信息 +// user.setBookingUser(); + return success("登录成功", new LoginResult(access_token, user)); + } + + @Operation(summary = "微信授权手机号码并更新") + @Transactional(rollbackFor = {Exception.class}) + @PostMapping("/updatePhoneByMpWx") + public ApiResult updatePhoneByMpWx(@RequestBody UserParam userParam) { + // 获取微信授权手机号 + String phone = getPhoneByCode(userParam); + // 查询当前用户 + User user = userService.getById(userParam.getUserId()); + if (user != null && phone != null) { + user.setPhone(phone); + userService.updateUser(user); + return success("更新成功", phone); + } + return fail("更新失败"); + } + + /** + * 新用户注册 + */ + private User addUser(UserParam userParam) { + User addUser = new User(); + // 注册用户 + addUser.setStatus(0); + addUser.setUsername(createUsername("wx_")); + addUser.setNickname("微信用户"); + addUser.setPlatform(MP_WEIXIN); + addUser.setGradeId(2); + if (userParam.getGradeId() != null) { + addUser.setGradeId(userParam.getGradeId()); + } + if (userParam.getPhone() != null) { + addUser.setPhone(userParam.getPhone()); + } + if (StrUtil.isNotBlank(userParam.getOpenid())) { + addUser.setOpenid(userParam.getOpenid()); + } + if (StrUtil.isNotBlank(userParam.getUnionid())) { + addUser.setUnionid(userParam.getUnionid()); + } + addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); + addUser.setTenantId(getTenantId()); + addUser.setRecommend(1); + Role role = roleService.getOne(new QueryWrapper().eq("role_code", "user"), false); + addUser.setRoleId(role.getRoleId()); + if (userService.saveUser(addUser)) { + // 添加用户角色 + final UserRole userRole = new UserRole(); + userRole.setUserId(addUser.getUserId()); + userRole.setTenantId(addUser.getTenantId()); + userRole.setRoleId(addUser.getRoleId()); + userRoleService.save(userRole); + } + // 绑定关系 + if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null && userParam.getRefereeId() != 0) { + UserReferee check = userRefereeService.check(addUser.getUserId(), userParam.getRefereeId()); + if (check == null) { + UserReferee userReferee = new UserReferee(); + userReferee.setDealerId(userParam.getRefereeId()); + userReferee.setUserId(addUser.getUserId()); + userRefereeService.save(userReferee); + } + } + return addUser; + } + + // 获取openid + private JSONObject getOpenIdByCode(UserParam userParam) { + // 从缓存获取微信小程序配置信息 + JSONObject setting = getWxConfigFromCache(getTenantId()); + // 获取openId + String apiUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + setting.getString("appId") + "&secret=" + setting.getString("appSecret") + "&js_code=" + userParam.getCode() + "&grant_type=authorization_code"; + // 执行get请求 + String result = HttpUtil.get(apiUrl); + // 解析access_token + return JSON.parseObject(result); + } + + /** + * 获取微信手机号码 + * + * @param userParam 需要传微信凭证code + */ + private String getPhoneByCode(UserParam userParam) { + // 获取手机号码 + String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken(); + HashMap paramMap = new HashMap<>(); + if (StrUtil.isBlank(userParam.getCode())) { + throw new BusinessException("code不能为空"); + } + paramMap.put("code", userParam.getCode()); + // 执行post请求 + String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap)); + JSONObject json = JSON.parseObject(post); + if (json.get("errcode").equals(0)) { + JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info")); + // 微信用户的手机号码 + final String phoneNumber = phoneInfo.getString("phoneNumber"); + // 验证手机号码 +// if (userParam.getNotVerifyPhone() == null && !Validator.isMobile(phoneNumber)) { +// String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); +// redisTemplate.delete(key); +// throw new BusinessException("手机号码格式不正确"); // } -// } catch (Exception ex) { -// System.err.println("查询用户异常: " + ex.getMessage()); -// } -// } -// } -// -// // 如果无法解析，默认使用租户10550 -// System.out.println("无法解析scene参数，使用默认租户ID: 10550"); -// return 10550; -// -// } catch (Exception e) { -// System.err.println("解析scene参数异常: " + e.getMessage()); -// // 出现异常时，默认使用租户10550 -// return 10550; -// } -// } -// -// /** -// * 为指定租户获取AccessToken -// */ -// private String getAccessTokenForTenant(Integer tenantId) { -// try { -// String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); -// -// // 从缓存获取access_token -// String value = redisUtil.get(key); -// if (value != null) { -// try { -// // 尝试解析为JSON格式（与getAccessToken方法保持一致） -// JSONObject response = JSON.parseObject(value); -// String accessToken = response.getString("access_token"); -// if (accessToken != null) { -// System.out.println("从缓存获取到access_token: " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); -// return accessToken; -// } -// } catch (Exception e) { -// // 如果解析失败，可能是旧格式的纯字符串token，直接返回 -// System.out.println("缓存token格式异常，使用原值: " + e.getMessage()); -// return value; -// } -// } -// -// // 缓存中没有，重新获取 -// JSONObject wxConfig = getWxConfigFromCache(tenantId); -// String appId = wxConfig.getString("appId"); -// String appSecret = wxConfig.getString("appSecret"); -// -// String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appId + "&secret=" + appSecret; -// System.out.println("调用微信API获取token - 租户ID: " + tenantId + ", AppID: " + (appId != null ? appId.substring(0, Math.min(8, appId.length())) + "..." : "null")); -// System.out.println("微信API请求URL: " + apiUrl.replaceAll("secret=[^&]*", "secret=***")); -// String result = HttpUtil.get(apiUrl); -// System.out.println("微信API响应: " + result); -// JSONObject json = JSON.parseObject(result); -// -// // 检查是否有错误 -// if (json.containsKey("errcode")) { -// Integer errcode = json.getInteger("errcode"); -// String errmsg = json.getString("errmsg"); -// System.err.println("微信API错误 - errcode: " + errcode + ", errmsg: " + errmsg); -// -// if (errcode == 40125) { -// throw new RuntimeException("微信AppSecret配置错误，请检查并更新正确的AppSecret"); -// } else if (errcode == 40013) { -// throw new RuntimeException("微信AppID配置错误，请检查并更新正确的AppID"); -// } else { -// throw new RuntimeException("微信API调用失败: " + errmsg + " (errcode: " + errcode + ")"); -// } -// } -// -// if (json.containsKey("access_token")) { -// String accessToken = json.getString("access_token"); -// Integer expiresIn = json.getInteger("expires_in"); -// -// // 缓存access_token，存储完整JSON响应（与getAccessToken方法保持一致） -// redisUtil.set(key, result, (long) (expiresIn - 300), TimeUnit.SECONDS); -// -// System.out.println("获取新的access_token成功，租户ID: " + tenantId); -// return accessToken; -// } else { -// throw new RuntimeException("获取access_token失败: " + result); -// } -// -// } catch (Exception e) { -// System.err.println("获取access_token异常，租户ID: " + tenantId + ", 错误: " + e.getMessage()); -// throw new RuntimeException("获取access_token失败: " + e.getMessage()); -// } -// } -// -//} + return phoneNumber; + } + return null; + } + + /** + * 生成随机账号 + * + * @return username + */ + private String createUsername(String type) { + return type.concat(RandomUtil.randomString(12)); + } + + /** + * 获取接口调用凭据AccessToken + * ... + */ + public String getAccessToken() { + Integer tenantId = getTenantId(); + String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); + + // 从缓存获取微信小程序配置信息 + JSONObject setting = getWxConfigFromCache(tenantId); + if (setting == null) { + throw new BusinessException("请先配置小程序"); + } + + // 从缓存获取access_token + String value = redisTemplate.opsForValue().get(key); + if (value != null) { + // 解析access_token + JSONObject response = JSON.parseObject(value); + String accessToken = response.getString("access_token"); + if (accessToken != null) { + return accessToken; + } + } + + // 微信获取凭证接口 + String apiUrl = "https://api.weixin.qq.com/cgi-bin/token"; + // 组装url参数 + String url = apiUrl.concat("?grant_type=client_credential") + .concat("&appid=").concat(setting.getString("appId")) + .concat("&secret=").concat(setting.getString("appSecret")); + + // 执行get请求 + String result = HttpUtil.get(url); + // 解析access_token + JSONObject response = JSON.parseObject(result); + if (response.getString("access_token") != null) { + // 存入缓存 + redisTemplate.opsForValue().set(key, result, 7000L, TimeUnit.SECONDS); + return response.getString("access_token"); + } + throw new BusinessException("小程序配置不正确"); + } + + @Operation(summary = "获取微信openId并更新") + @PostMapping("/getWxOpenId") + public ApiResult getWxOpenId(@RequestBody UserParam userParam) { + final User loginUser = getLoginUser(); + if (loginUser == null) { + return fail("请先登录"); + } + // 已存在直接返回 + if (StrUtil.isNotBlank(loginUser.getOpenid())) { + return success(loginUser); + } + // 请求微信接口获取openid + String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; + final HashMap map = new HashMap<>(); + final JSONObject setting = getWxConfigFromCache(getTenantId()); + final String appId = setting.getString("appId"); + final String appSecret = setting.getString("appSecret"); + map.put("appid", appId); + map.put("secret", appSecret); + map.put("js_code", userParam.getCode()); + map.put("grant_type", "authorization_code"); + final String response = HttpUtil.get(apiUrl, map); + final JSONObject jsonObject = JSONObject.parseObject(response); + String openid = jsonObject.getString("openid"); + String sessionKey = jsonObject.getString("session_key"); + String unionid = jsonObject.getString("unionid"); + // 保存openID + if (loginUser.getOpenid() == null || StrUtil.isBlank(loginUser.getOpenid())) { + loginUser.setOpenid(openid); + loginUser.setUnionid(unionid); + requestUtil.updateUser(loginUser); +// userService.updateById(loginUser); + } + return success("获取成功", jsonObject); + } + + @Operation(summary = "仅获取微信openId") + @PostMapping("/getWxOpenIdOnly") + public ApiResult getWxOpenIdOnly(@RequestBody UserParam userParam) { + + String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; + final HashMap map = new HashMap<>(); + final JSONObject setting = getWxConfigFromCache(getTenantId()); + final String appId = setting.getString("appId"); + final String appSecret = setting.getString("appSecret"); + map.put("appid", appId); + map.put("secret", appSecret); + map.put("js_code", userParam.getCode()); + map.put("grant_type", "authorization_code"); + final String response = HttpUtil.get(apiUrl, map); + final JSONObject jsonObject = JSONObject.parseObject(response); + return success("获取成功", jsonObject); + } + + @Operation(summary = "获取微信小程序码-用户ID") + @GetMapping("/getUserQRCode") + public ApiResult getQRCode() { + String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); + final HashMap map = new HashMap<>(); + map.put("path", "/package/user/qrcode?user_id=" + getLoginUserId()); +// map.put("env_version","trial"); + // 获取图片 Buffer + byte[] qrCode = HttpRequest.post(apiUrl) + .body(JSON.toJSONString(map)) + .execute().bodyBytes(); + + // 保存的文件名称 + final String fileName = CommonUtil.randomUUID8().concat(".png"); + // 保存路径 + String filePath = getUploadDir().concat("qrcode/") + fileName; + File file = FileUtil.writeBytes(qrCode, filePath); + if (file != null) { + return success(config.getFileServer().concat("/qrcode/").concat(fileName)); + } + return fail("获取失败", null); + } + + @Operation(summary = "获取微信小程序码-订单核销码") + @GetMapping("/getOrderQRCode/{orderNo}") + public ApiResult getOrderQRCode(@PathVariable("orderNo") String orderNo) { + String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); + final HashMap map = new HashMap<>(); + map.put("path", "/package/admin/order-scan?orderNo=".concat(orderNo)); + map.put("env_version", "release"); + // 获取图片 Buffer + byte[] qrCode = HttpRequest.post(apiUrl) + .body(JSON.toJSONString(map)) + .execute().bodyBytes(); + + // 保存的文件名称 + final String fileName = CommonUtil.randomUUID8().concat(".png"); + // 保存路径 + String filePath = getUploadDir().concat("qrcode/") + fileName; + File file = FileUtil.writeBytes(qrCode, filePath); + if (file != null) { + return success(config.getFileServer().concat("/qrcode/").concat(fileName)); + } + return fail("获取失败", null); + } + + @Operation(summary = "获取微信小程序码-订单核销码-数量极多的业务场景") + @GetMapping("/getOrderQRCodeUnlimited/{scene}") + public void getOrderQRCodeUnlimited(@PathVariable("scene") String scene, HttpServletResponse response) throws IOException { + try { + // 从scene参数中解析租户ID + System.out.println("scene = " + scene); + Integer tenantId = extractTenantIdFromScene(scene); + System.out.println("从scene参数中解析租户ID = " + tenantId); + if (tenantId == null) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + response.getWriter().write("{\"error\":\"无法从scene参数中获取租户信息\"}"); + return; + } + + // 使用指定租户ID获取 access_token + String accessToken = getAccessTokenForTenant(tenantId); + String apiUrl = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken; + + final HashMap map = new HashMap<>(); + map.put("scene", scene); + map.put("page", "pages/index/index"); + map.put("env_version", "release"); + + // 判断应用运行状态 + final CmsWebsite website = cmsWebsiteService.getByTenantId(tenantId); + if(website != null && Integer.valueOf(2).equals(website.getRunning())){ + map.put("check_path",false); + map.put("env_version","trial"); + } + + String jsonBody = JSON.toJSONString(map); + System.out.println("请求的 JSON body = " + jsonBody); + + // 获取微信 API 响应 + cn.hutool.http.HttpResponse httpResponse = HttpRequest.post(apiUrl) + .body(jsonBody) + .execute(); + + byte[] responseBytes = httpResponse.bodyBytes(); + String contentType = httpResponse.header("Content-Type"); + + // 检查响应内容类型，判断是否为错误响应 + if (contentType != null && contentType.contains("application/json")) { + // 微信返回了错误信息（JSON格式） + String errorResponse = new String(responseBytes, "UTF-8"); + System.err.println("微信 API 错误响应: " + errorResponse); + + // 返回错误信息给前端 + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + response.getWriter().write(errorResponse); + return; + } + + // 成功获取二维码图片 + response.setContentType("image/png"); + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Content-Disposition", "inline; filename=qrcode.png"); + + // 输出图片 + response.getOutputStream().write(responseBytes); + System.out.println("二维码生成成功，大小: " + responseBytes.length + " bytes"); + + } catch (Exception e) { + System.err.println("生成二维码失败: " + e.getMessage()); + e.printStackTrace(); + + // 返回错误信息 + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + response.getWriter().write("{\"error\":\"生成二维码失败: " + e.getMessage() + "\"}"); + } + } + + @Operation(summary = "获取微信小程序码-用户ID") + @GetMapping("/getQRCodeText") + public byte[] getQRCodeText(String scene, String page, Integer width, + Boolean isHyaline, String envVersion) throws IOException { + HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/wxa/getwxacodeunlimit") + .newBuilder() + .addQueryParameter("access_token", getLocalAccessToken()) + .build(); + + System.out.println("page = " + page); + // 构造请求 JSON + // 注意：scene 仅支持可见字符，长度上限 32，尽量 URL-safe（字母数字下划线等） + // page 必须是已发布小程序内的路径（不带开头斜杠也可） + var root = om.createObjectNode(); + root.put("scene", scene); + if (page != null) root.put("page", page); + if (width != null) root.put("width", width); // 默认 430，建议 280~1280 + if (isHyaline != null) root.put("is_hyaline", isHyaline); + if (envVersion != null) root.put("env_version", envVersion); // release/trial/develop + + okhttp3.RequestBody reqBody = okhttp3.RequestBody.create( + root.toString(), MediaType.parse("application/json; charset=utf-8")); + Request req = new Request.Builder().url(url).post(reqBody).build(); + + try (Response resp = http.newCall(req).execute()) { + if (!resp.isSuccessful()) { + throw new IOException("HTTP " + resp.code() + " calling getwxacodeunlimit"); + } + MediaType ct = resp.body().contentType(); + byte[] bytes = resp.body().bytes(); + // 微信出错时返回 JSON，需要识别一下 + if (ct != null && ct.subtype() != null && ct.subtype().contains("json")) { + String err = new String(bytes); + throw new IOException("WeChat error: " + err); + } + return bytes; // 成功就是图片二进制（PNG） + } + } + + /** + * 获取/刷新 access_token + */ + public String getLocalAccessToken() throws IOException { + long now = Instant.now().getEpochSecond(); + String key = "AccessToken:Local:" + getTenantId(); + + // 从缓存获取access_token，使用JSON格式 + String value = redisUtil.get(key); + if (value != null && now < tokenExpireEpoch - 60) { + try { + // 尝试解析为JSON格式 + JSONObject response = JSON.parseObject(value); + String accessToken = response.getString("access_token"); + if (accessToken != null) { + System.out.println("从缓存获取到access_token(Local): " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); + return accessToken; + } + } catch (Exception e) { + // 如果解析失败，可能是旧格式的纯字符串token + System.out.println("本地缓存token格式异常，使用原值: " + e.getMessage()); + return value; + } + } + + // 从缓存获取微信小程序配置信息 + Integer tenantId = getTenantId(); + JSONObject setting = getWxConfigFromCache(tenantId); + if (setting == null) { + throw new IOException("请先配置小程序"); + } + + String appId = setting.getString("appId"); + String appSecret = setting.getString("appSecret"); + + if (appId == null || appSecret == null) { + throw new IOException("小程序配置不完整，缺少 appId 或 appSecret"); + } + + HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/cgi-bin/token") + .newBuilder() + .addQueryParameter("grant_type", "client_credential") + .addQueryParameter("appid", appId) + .addQueryParameter("secret", appSecret) + .build(); + + Request req = new Request.Builder().url(url).get().build(); + try (Response resp = http.newCall(req).execute()) { + String body = resp.body().string(); + JsonNode json = om.readTree(body); + if (json.has("access_token")) { + String token = json.get("access_token").asText(); + long expiresIn = json.get("expires_in").asInt(7200); + + // 缓存完整的JSON响应，与其他方法保持一致 + redisUtil.set(key, body, expiresIn, TimeUnit.SECONDS); + tokenExpireEpoch = now + expiresIn; + System.out.println("获取新的access_token成功(Local)，租户ID: " + tenantId); + return token; + } else { + throw new IOException("Get access_token failed: " + body); + } + } + } + + /** + * 文件上传位置(服务器) + */ + private String getUploadDir() { + return config.getUploadPath(); + } + + @Operation(summary = "调试：检查微信小程序配置") + @GetMapping("/debug/checkWxConfig") + public ApiResult debugCheckWxConfig() { + Integer tenantId = getTenantId(); + Map result = new HashMap<>(); + result.put("tenantId", tenantId); + + try { + // 尝试从缓存获取配置 + JSONObject setting = getWxConfigFromCache(tenantId); + result.put("hasConfig", true); + result.put("config", setting); + result.put("cacheKey", MP_WX_KEY + tenantId); + } catch (Exception e) { + result.put("hasConfig", false); + result.put("error", e.getMessage()); + result.put("cacheKey", MP_WX_KEY + tenantId); + + // 提供创建配置的建议 + Map suggestion = new HashMap<>(); + suggestion.put("message", "请在Redis中创建微信小程序配置"); + suggestion.put("cacheKey", MP_WX_KEY + tenantId); + suggestion.put("tenantId", tenantId); + suggestion.put("sampleConfig", createSampleWxConfig()); + result.put("suggestion", suggestion); + } + + return success("配置检查完成", result); + } + + @Operation(summary = "调试：创建示例微信小程序配置") + @PostMapping("/debug/createSampleWxConfig") + public ApiResult debugCreateSampleWxConfig(@RequestBody Map params) { + Integer tenantId = getTenantId(); + + String appId = params.get("appId"); + String appSecret = params.get("appSecret"); + + if (appId == null || appSecret == null) { + return fail("请提供 appId 和 appSecret", null); + } + + try { + // 直接在Redis中创建配置 + String key = MP_WX_KEY + tenantId; + + // 创建配置内容 + Map config = new HashMap<>(); + config.put("appId", appId); + config.put("appSecret", appSecret); + config.put("tenantId", tenantId.toString()); + config.put("settingKey", "mp-weixin"); + config.put("settingId", "301"); + + // 保存到Redis缓存 + redisUtil.set(key, JSON.toJSONString(config)); + + return success("微信小程序配置创建成功", config); + } catch (Exception e) { + return fail("创建配置失败: " + e.getMessage(), null); + } + } + + private Map createSampleWxConfig() { + Map sample = new HashMap<>(); + sample.put("appId", "wx_your_app_id_here"); + sample.put("appSecret", "your_app_secret_here"); + return sample; + } + + @Operation(summary = "调试：获取AccessToken") + @GetMapping("/debug/getAccessToken") + public ApiResult debugGetAccessToken() { + try { + // 获取当前线程的租户ID + Integer tenantId = getTenantId(); + if (tenantId == null) { + tenantId = 10550; // 默认租户 + } + + System.out.println("=== 开始调试获取AccessToken，租户ID: " + tenantId + " ==="); + + // 手动调用获取AccessToken + String accessToken = getAccessTokenForTenant(tenantId); + + String result = "获取AccessToken成功: " + (accessToken != null ? accessToken.substring(0, Math.min(10, accessToken.length())) + "..." : "null"); + System.out.println("调试结果: " + result); + + return success(result); + } catch (Exception e) { + System.err.println("调试获取AccessToken异常: " + e.getMessage()); + e.printStackTrace(); + return fail("获取AccessToken失败: " + e.getMessage()); + } + } + + /** + * 从Redis缓存中获取微信小程序配置 + * @param tenantId 租户ID + * @return 微信配置信息 + */ + private JSONObject getWxConfigFromCache(Integer tenantId) { + String key = MP_WX_KEY + tenantId; + String cacheValue = redisUtil.get(key); + if (StrUtil.isBlank(cacheValue)) { + throw new BusinessException("未找到微信小程序配置，请检查缓存key: " + key); + } + try { + return JSON.parseObject(cacheValue); + } catch (Exception e) { + throw new BusinessException("微信小程序配置格式错误: " + e.getMessage()); + } + } + + /** + * 从scene参数中提取租户ID + * scene格式: uid_userId_tenantId（优先）或 uid_userId（兼容旧格式） + */ + private Integer extractTenantIdFromScene(String scene) { + try { + System.out.println("解析scene参数: " + scene); + + if (scene != null && scene.startsWith("uid_")) { + String content = scene.substring(4); // 去掉"uid_"前缀 + + // 优先解析 uid_userId_tenantId 格式 + String[] parts = content.split("_"); + if (parts.length >= 2) { + try { + Integer tenantId = Integer.parseInt(parts[1]); + System.out.println("从scene直接解析到tenantId = " + tenantId); + return tenantId; + } catch (NumberFormatException e) { + System.err.println("scene中tenantId格式异常: " + parts[1]); + } + } + + // 兼容旧格式 uid_userId：根据用户ID查询租户ID + if (parts.length == 1) { + Integer userId = Integer.parseInt(parts[0]); + System.out.println("userId = " + userId); + try { + List users = userService.listByIdIgnoreTenant(userId); + System.out.println("查询到用户数量 = " + (users != null ? users.size() : 0)); + if (users != null && !users.isEmpty()) { + System.out.println("从用户ID " + userId + " 获取到租户ID: " + users.get(0).getTenantId()); + return users.get(0).getTenantId(); + } else { + System.err.println("未找到用户ID: " + userId); + } + } catch (Exception ex) { + System.err.println("查询用户异常: " + ex.getMessage()); + } + } + } + + // 如果无法解析，默认使用租户10550 + System.out.println("无法解析scene参数，使用默认租户ID: 10550"); + return 10550; + + } catch (Exception e) { + System.err.println("解析scene参数异常: " + e.getMessage()); + // 出现异常时，默认使用租户10550 + return 10550; + } + } + + /** + * 为指定租户获取AccessToken + */ + private String getAccessTokenForTenant(Integer tenantId) { + try { + String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString()); + + // 从缓存获取access_token + String value = redisUtil.get(key); + if (value != null) { + try { + // 尝试解析为JSON格式（与getAccessToken方法保持一致） + JSONObject response = JSON.parseObject(value); + String accessToken = response.getString("access_token"); + if (accessToken != null) { + System.out.println("从缓存获取到access_token: " + accessToken.substring(0, Math.min(10, accessToken.length())) + "..."); + return accessToken; + } + } catch (Exception e) { + // 如果解析失败，可能是旧格式的纯字符串token，直接返回 + System.out.println("缓存token格式异常，使用原值: " + e.getMessage()); + return value; + } + } + + // 缓存中没有，重新获取 + JSONObject wxConfig = getWxConfigFromCache(tenantId); + String appId = wxConfig.getString("appId"); + String appSecret = wxConfig.getString("appSecret"); + + String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appId + "&secret=" + appSecret; + System.out.println("调用微信API获取token - 租户ID: " + tenantId + ", AppID: " + (appId != null ? appId.substring(0, Math.min(8, appId.length())) + "..." : "null")); + System.out.println("微信API请求URL: " + apiUrl.replaceAll("secret=[^&]*", "secret=***")); + String result = HttpUtil.get(apiUrl); + System.out.println("微信API响应: " + result); + JSONObject json = JSON.parseObject(result); + + // 检查是否有错误 + if (json.containsKey("errcode")) { + Integer errcode = json.getInteger("errcode"); + String errmsg = json.getString("errmsg"); + System.err.println("微信API错误 - errcode: " + errcode + ", errmsg: " + errmsg); + + if (errcode == 40125) { + throw new RuntimeException("微信AppSecret配置错误，请检查并更新正确的AppSecret"); + } else if (errcode == 40013) { + throw new RuntimeException("微信AppID配置错误，请检查并更新正确的AppID"); + } else { + throw new RuntimeException("微信API调用失败: " + errmsg + " (errcode: " + errcode + ")"); + } + } + + if (json.containsKey("access_token")) { + String accessToken = json.getString("access_token"); + Integer expiresIn = json.getInteger("expires_in"); + + // 缓存access_token，存储完整JSON响应（与getAccessToken方法保持一致） + redisUtil.set(key, result, (long) (expiresIn - 300), TimeUnit.SECONDS); + + System.out.println("获取新的access_token成功，租户ID: " + tenantId); + return accessToken; + } else { + throw new RuntimeException("获取access_token失败: " + result); + } + + } catch (Exception e) { + System.err.println("获取access_token异常，租户ID: " + tenantId + ", 错误: " + e.getMessage()); + throw new RuntimeException("获取access_token失败: " + e.getMessage()); + } + } + +} diff --git a/src/main/resources/application-glt.yml b/src/main/resources/application-glt.yml index 844d97e..12ba2fc 100644 --- a/src/main/resources/application-glt.yml +++ b/src/main/resources/application-glt.yml @@ -50,7 +50,8 @@ config: # 生产环境接口 server-url: https://glt-server.websoft.top/api # 业务模块接口 - api-url: https://glt-dev-api.websoft.top/api + api-url: https://glt-api.websoft.top/api +# api-url: https://glt-dev-api.websoft.top/api upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 From f86bf8df4b1eaafe630838c62e49a56d2d70232c Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Thu, 14 May 2026 08:21:10 +0800 Subject: [PATCH 46/60] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 67 +++++++++++++---------- src/main/resources/application-glt.yml | 1 - src/main/resources/application-local.yml | 69 ++++++++++++++++++++++++ src/main/resources/application-prod.yml | 6 ++- src/main/resources/application.yml | 4 +- 5 files changed, 114 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/application-local.yml diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9398561..844d97e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,40 +1,38 @@ -# 开发环境配置 - -# 服务器配置 -server: - port: 9200 +# 生产环境配置 # 数据源配置 spring: datasource: - url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai username: modules password: tYmmMGh5wpwXR3ae driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource + druid: + remove-abandoned: true + # redis redis: database: 0 - host: localhost + host: 1Panel-redis-GmNr port: 6379 - -# database: 0 -# host: 8.134.55.105 -# port: 16379 -# password: redis_t74P8C + password: redis_t74P8C # 日志配置 logging: + file: + name: websoft-modules.log level: - com.gxwebsoft: DEBUG - com.baomidou.mybatisplus: DEBUG + root: WARN + com.gxwebsoft: ERROR + com.baomidou.mybatisplus: ERROR socketio: - host: localhost #IP地址 + host: 0.0.0.0 #IP地址 # MQTT配置 mqtt: - enabled: false # 添加开关来禁用MQTT服务 + enabled: false # 启用MQTT服务 host: tcp://132.232.214.96:1883 username: swdev password: Sw20250523 @@ -47,28 +45,41 @@ mqtt: # 框架配置 config: - # 开发环境接口 + # 文件服务器 + file-server: https://file-s209.shoplnk.cn + # 生产环境接口 server-url: https://glt-server.websoft.top/api - upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) + # 业务模块接口 + api-url: https://glt-dev-api.websoft.top/api + upload-path: /www/wwwroot/file.ws -# 开发环境证书配置 + # 阿里云OSS云存储 + endpoint: https://oss-cn-shenzhen.aliyuncs.com + accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP + accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM + bucketName: oss-gxwebsoft + bucketDomain: https://oss.wsdns.cn + aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com + +# 生产环境证书配置 certificate: - load-mode: CLASSPATH # 开发环境从classpath加载 - wechat-pay: - dev: - private-key-file: "apiclient_key.pem" - apiclient-cert-file: "apiclient_cert.pem" - wechatpay-cert-file: "wechatpay_cert.pem" + load-mode: VOLUME # 生产环境从Docker挂载卷加载 + cert-root-path: /www/wwwroot/file.ws +# 支付配置缓存 +payment: + cache: + # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 + key-prefix: "Payment:1" + # 缓存过期时间（小时） + expire-hours: 24 # 阿里云翻译配置 aliyun: translate: access-key-id: LTAI5tEsyhW4GCKbds1qsopg access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO endpoint: mt.cn-hangzhou.aliyuncs.com - -# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致） wechatpay: transfer: scene-id: 1005 - scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]' + scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' diff --git a/src/main/resources/application-glt.yml b/src/main/resources/application-glt.yml index 12ba2fc..4eb942f 100644 --- a/src/main/resources/application-glt.yml +++ b/src/main/resources/application-glt.yml @@ -51,7 +51,6 @@ config: server-url: https://glt-server.websoft.top/api # 业务模块接口 api-url: https://glt-api.websoft.top/api -# api-url: https://glt-dev-api.websoft.top/api upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..c22fd88 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,69 @@ +# 开发环境配置 + +# 服务器配置 +server: + port: 9200 + +# 数据源配置 +spring: + datasource: + url: jdbc:mysql://47.107.249.41:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: modules + password: tYmmMGh5wpwXR3ae + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + + redis: + database: 0 + host: localhost + port: 6379 + +# 日志配置 +logging: + level: + com.gxwebsoft: DEBUG + com.baomidou.mybatisplus: DEBUG + +socketio: + host: localhost #IP地址 + +# MQTT配置 +mqtt: + enabled: false # 添加开关来禁用MQTT服务 + host: tcp://132.232.214.96:1883 + username: swdev + password: Sw20250523 + client-id-prefix: hjm_car_ + topic: /SW_GPS/# + qos: 2 + connection-timeout: 10 + keep-alive-interval: 20 + auto-reconnect: true + +# 框架配置 +config: + # 开发环境接口 + server-url: https://glt-server.websoft.top/api + upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) + +# 开发环境证书配置 +certificate: + load-mode: CLASSPATH # 开发环境从classpath加载 + wechat-pay: + dev: + private-key-file: "apiclient_key.pem" + apiclient-cert-file: "apiclient_cert.pem" + wechatpay-cert-file: "wechatpay_cert.pem" + +# 阿里云翻译配置 +aliyun: + translate: + access-key-id: LTAI5tEsyhW4GCKbds1qsopg + access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO + endpoint: mt.cn-hangzhou.aliyuncs.com + +# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致） +wechatpay: + transfer: + scene-id: 1005 + scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]' diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 0f4eb72..4eb942f 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -32,7 +32,7 @@ socketio: # MQTT配置 mqtt: - enabled: true # 启用MQTT服务 + enabled: false # 启用MQTT服务 host: tcp://132.232.214.96:1883 username: swdev password: Sw20250523 @@ -48,7 +48,9 @@ config: # 文件服务器 file-server: https://file-s209.shoplnk.cn # 生产环境接口 - server-url: https://server.websoft.top/api + server-url: https://glt-server.websoft.top/api + # 业务模块接口 + api-url: https://glt-api.websoft.top/api upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 703b485..910449c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,8 +4,8 @@ server: # 多环境配置 spring: profiles: - active: dev -# active: glt + active: local +# active: dev # active: prod application: From 7de53327d639d30661fa5c2a07b8a9525b5788c9 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Thu, 14 May 2026 17:45:04 +0800 Subject: [PATCH 47/60] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 4 ++-- src/main/resources/application-local.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 844d97e..98793ed 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -47,8 +47,8 @@ mqtt: config: # 文件服务器 file-server: https://file-s209.shoplnk.cn - # 生产环境接口 - server-url: https://glt-server.websoft.top/api + # 测试环境接口 + server-url: https://glt-dev-server.websoft.top/api # 业务模块接口 api-url: https://glt-dev-api.websoft.top/api upload-path: /www/wwwroot/file.ws diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index c22fd88..400131d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -42,8 +42,8 @@ mqtt: # 框架配置 config: - # 开发环境接口 - server-url: https://glt-server.websoft.top/api + # 测试环境接口 + server-url: https://glt-dev-server.websoft.top/api upload-path: /Users/gxwebsoft/Documents/uploads/ # window(D:\Temp) # 开发环境证书配置 From 2fbcf16a48d2a9a89ccc5a8f0fd48d20c9387dc0 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Sat, 16 May 2026 15:10:14 +0800 Subject: [PATCH 48/60] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E5=95=86=E4=BD=A3=E9=87=91=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E7=BB=93=E7=AE=97=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=AF=8F=E5=A4=A9=E5=87=8C=E6=99=A8=E4=B8=80=E7=82=B9?= =?UTF-8?q?=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/ConfigProperties.java | 2 +- .../impl/GltTicketOrderServiceImpl.java | 4 +- .../payment/service/WxPayConfigService.java | 2 +- .../controller/ShopDealerOrderController.java | 27 ++- .../shop/dto/ShopDealerSettlementDto.java | 31 ++++ .../shop/dto/ShopDealerSettlementItemDto.java | 26 +++ .../com/gxwebsoft/shop/entity/ShopOrder.java | 6 + .../shop/mapper/ShopDealerOrderMapper.java | 8 + .../shop/mapper/xml/ShopDealerOrderMapper.xml | 22 +++ .../shop/service/ShopDealerUserService.java | 9 + .../impl/ShopDealerUserServiceImpl.java | 47 +++++ .../service/impl/ShopOrderServiceImpl.java | 7 - .../shop/task/OrderSettlementTask.java | 166 ++++++++++++++++++ .../shop/vo/ShopDealerOrderTaskVO.java | 45 +++++ 14 files changed, 381 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java create mode 100644 src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementItemDto.java create mode 100644 src/main/java/com/gxwebsoft/shop/task/OrderSettlementTask.java create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopDealerOrderTaskVO.java diff --git a/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java b/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java index d500177..dfee5d3 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java +++ b/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java @@ -60,7 +60,7 @@ public class ConfigProperties { /** * token过期时间, 单位秒 */ - private Long tokenExpireTime = 60 * 60 * 365 * 24L; + private Long tokenExpireTime = 60 * 60 * 30 * 24L; /** * token快要过期自动刷新时间, 单位分钟 diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index d6e24cb..c22951d 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -194,9 +194,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl teamSettlement() { + orderSettlementTask.teamSettlement(); + return success("success"); + } } diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java new file mode 100644 index 0000000..2c950e2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java @@ -0,0 +1,31 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 分销订单结算 + * @author xm + * @since 2026-05-13 + */ +@Data +@Schema(name = "ShopDealerSettlementDto", description = "分销订单结算") +public class ShopDealerSettlementDto { + + @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻 4-退款") + private Integer type; + + @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)") + private Integer flowType; + + @Schema(description = "描述") + private String comments; + + @Schema(description = "商城ID") + private Integer tenantId; + + @Schema(description = "明细列表") + private List itemList; +} diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementItemDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementItemDto.java new file mode 100644 index 0000000..7d57e13 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementItemDto.java @@ -0,0 +1,26 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 分销订单退款 + * @author xm + * @since 2026-05-13 + */ +@Data +@Schema(name = "ShopDealerSettlementItemDto", description = "分销订单退款") +public class ShopDealerSettlementItemDto { + + @Schema(description = "订单号") + private String no; + + @Schema(description = "分销商用户ID") + private Integer userId; + + @Schema(description = "变更金额") + private BigDecimal money; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index 586de72..a844a9f 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -334,6 +334,12 @@ public class ShopOrder implements Serializable { @Schema(description = "推广核销佣金") private BigDecimal verifyMoney; + @Schema(description = "门店、服务商结算标识 0-未结算 1-已结算") + private Integer teamSettlementFlag; + + @Schema(description = "分红结算标识 0-未结算 1-已结算") + private Integer dividendSettlementFlag; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java index 928b066..10ac5c8 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gxwebsoft.shop.entity.ShopDealerOrder; import com.gxwebsoft.shop.param.ShopDealerOrderParam; +import com.gxwebsoft.shop.vo.ShopDealerOrderTaskVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,4 +35,11 @@ public interface ShopDealerOrderMapper extends BaseMapper { */ List selectListRel(@Param("param") ShopDealerOrderParam param); + /** + * 获取订单门店/分销商待结算数据 + * @param tenantId 租户ID + * @return + */ + List getDealerOrderList(@Param("tenantId") Integer tenantId); + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml index b49c42d..d70a745 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml @@ -89,5 +89,27 @@ + diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index dc4131c..9977568 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -3,6 +3,7 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.shop.dto.ShopDealerRefundDto; +import com.gxwebsoft.shop.dto.ShopDealerSettlementDto; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.ShopDealerUser; import com.gxwebsoft.shop.param.ShopDealerUserParam; @@ -58,4 +59,12 @@ public interface ShopDealerUserService extends IService { * @return */ Boolean refundOrder(ShopDealerRefundDto refundDto); + + /** + * 用户资金结算 + * @param dto + * @return + */ + Boolean settlementBatch(ShopDealerSettlementDto dto); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index 80c00e2..a11d677 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -1,5 +1,6 @@ package com.gxwebsoft.shop.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; @@ -11,6 +12,8 @@ import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.shop.dto.ShopDealerRefundDto; +import com.gxwebsoft.shop.dto.ShopDealerSettlementDto; +import com.gxwebsoft.shop.dto.ShopDealerSettlementItemDto; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.entity.ShopDealerUser; @@ -364,6 +367,50 @@ public class ShopDealerUserServiceImpl extends ServiceImpl itemList = entity.getItemList(); + + List userIdList = itemList.stream().map(ShopDealerSettlementItemDto::getUserId).distinct().collect(Collectors.toList()); + + List shopDealerUserList = baseMapper.selectList(new LambdaQueryWrapper().select(ShopDealerUser::getId, ShopDealerUser::getUserId, + ShopDealerUser::getMoney, ShopDealerUser::getTotalMoney, ShopDealerUser::getFreezeMoney).in(ShopDealerUser::getUserId, userIdList)); + + List updateDealerUserList = new ArrayList<>(); + List capitalList = new ArrayList<>(); + itemList.forEach(item ->{ + ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> item.getUserId().equals(shopDealerUser.getUserId())).findFirst().orElse(null); + if(dealerUser != null){ + dealerUser.setMoney(dealerUser.getMoney().add(item.getMoney())); + dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(item.getMoney())); + dealerUser.setUpdateTime(now); + updateDealerUserList.add(dealerUser); + + ShopDealerCapital capital = BeanUtil.toBean(entity, ShopDealerCapital.class); + capital.setNo(item.getNo()); + capital.setUserId(item.getUserId()); + capital.setMoney(item.getMoney()); + capital.setMoneyAfter(dealerUser.getMoney()); + capital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + capital.setCreateTime(now); + capitalList.add(capital); + } + }); + + if(CollectionUtils.isNotEmpty(updateDealerUserList)){ + updateBatchById(updateDealerUserList); + } + + if(CollectionUtils.isNotEmpty(capitalList)){ + shopDealerCapitalService.saveBatch(capitalList); + } + } + return Boolean.TRUE; + } + public ShopDealerUser getDealerUser(Integer userId){ ShopDealerUser shopDealerUser = baseMapper.selectOne(new LambdaQueryWrapper().eq(ShopDealerUser::getUserId, userId)); if(shopDealerUser == null){ diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 72be190..f5bf420 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -851,13 +851,6 @@ public class ShopOrderServiceImpl extends ServiceImpl orderTaskVOList = shopDealerOrderMapper.getDealerOrderList(10584); + if(CollectionUtils.isNotEmpty(orderTaskVOList)){ + LocalDateTime now = LocalDateTime.now(); + List orderIdList = orderTaskVOList.stream().map(ShopDealerOrderTaskVO::getOrderId).distinct().collect(Collectors.toList()); + List shopDealerIdList = orderTaskVOList.stream().map(ShopDealerOrderTaskVO::getShopDealerOrderId).distinct().collect(Collectors.toList()); + + //2.查询商品订单信息 + List shopOrderList = shopOrderMapper.selectList(new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getTeamSettlementFlag) + .in(ShopOrder::getOrderId, orderIdList)); + + //3.查询商品订单分销信息 + List shopDealerOrderList = shopDealerOrderMapper.selectList(new LambdaQueryWrapper().select(ShopDealerOrder::getId, ShopDealerOrder::getOrderNo) + .in(ShopDealerOrder::getId, shopDealerIdList)); + + //4.结算一级服务商佣金 + Map> firstDealerMap = orderTaskVOList.stream().collect(Collectors.groupingBy(ShopDealerOrderTaskVO::getFirstDividendUser)); + List firstSettlementItemDtoList = new ArrayList<>(); + firstDealerMap.forEach((k, value) ->{ + List orderIds = value.stream().map(ShopDealerOrderTaskVO::getOrderId).distinct().collect(Collectors.toList()); + List shopDealerOrderIds = value.stream().map(ShopDealerOrderTaskVO::getShopDealerOrderId).distinct().collect(Collectors.toList()); + + //4.1 标记商品订单为已结算状态 + List shopOrders = shopOrderList.stream().filter(shopOrder -> orderIds.contains(shopOrder.getOrderId())).collect(Collectors.toList()); + shopOrders.forEach(shopOrder -> shopOrder.setTeamSettlementFlag(1)); + + //4.2 生成分销记录【增加钱包金额】 + BigDecimal firstDividendSum = value.stream().map(ShopDealerOrderTaskVO::getFirstDividend).reduce(BigDecimal.ZERO, BigDecimal::add); + ShopDealerSettlementItemDto itemDto = new ShopDealerSettlementItemDto(); + String no = orderNoUtils.generate("C"); + itemDto.setNo(no); + itemDto.setUserId(k); + itemDto.setMoney(firstDividendSum); + firstSettlementItemDtoList.add(itemDto); + + //4.3更新商品分销记录对应的一级服务商佣金为已结算状态 + List shopDealerOrders = shopDealerOrderList.stream().filter(shopDealerOrder -> shopDealerOrderIds.contains(shopDealerOrder.getId())).collect(Collectors.toList()); + shopDealerOrders.forEach(shopDealerOrder -> { + shopDealerOrder.setFirstDividendFlag(1); + shopDealerOrder.setFirstDividendNo(no); + shopDealerOrder.setFirstDividendTime(now); + }); + }); + + //4.4 一级结算【增加钱包金额】 + if(CollectionUtils.isNotEmpty(firstSettlementItemDtoList)){ + ShopDealerSettlementDto firstSettlementDto = new ShopDealerSettlementDto(); + firstSettlementDto.setType(ShopDealerTypeEnum.WITHDRAW_ACCOUNT.getCode()); + firstSettlementDto.setFlowType(ShopDealerCapitalUpdateEnum.MANAGEMENT_INCOME.getType()); + firstSettlementDto.setComments("团队管理津贴(1)"); + firstSettlementDto.setTenantId(10584); + firstSettlementDto.setItemList(firstSettlementItemDtoList); + shopDealerUserService.settlementBatch(firstSettlementDto); + } + + //5.结算二级服务商佣金 + Map> secondDealerMap = orderTaskVOList.stream().collect(Collectors.groupingBy(ShopDealerOrderTaskVO::getSecondDividendUser)); + List secondSettlementItemDtoList = new ArrayList<>(); + secondDealerMap.forEach((k, value) ->{ + List orderIds = value.stream().map(ShopDealerOrderTaskVO::getOrderId).distinct().collect(Collectors.toList()); + List shopDealerOrderIds = value.stream().map(ShopDealerOrderTaskVO::getShopDealerOrderId).distinct().collect(Collectors.toList()); + + //5.1 标记商品订单为已结算状态 + List shopOrders = shopOrderList.stream().filter(shopOrder -> orderIds.contains(shopOrder.getOrderId())).collect(Collectors.toList()); + shopOrders.forEach(shopOrder -> shopOrder.setTeamSettlementFlag(1)); + + //5.2 生成分销记录【增加钱包金额】 + BigDecimal secondDividendSum = value.stream().map(ShopDealerOrderTaskVO::getSecondDividend).reduce(BigDecimal.ZERO, BigDecimal::add); + ShopDealerSettlementItemDto itemDto = new ShopDealerSettlementItemDto(); + String no = orderNoUtils.generate("C"); + itemDto.setNo(no); + itemDto.setUserId(k); + itemDto.setMoney(secondDividendSum); + secondSettlementItemDtoList.add(itemDto); + + //5.3 更新商品分销记录对应的一级服务商佣金为已结算状态 + List shopDealerOrders = shopDealerOrderList.stream().filter(shopDealerOrder -> shopDealerOrderIds.contains(shopDealerOrder.getId())).collect(Collectors.toList()); + shopDealerOrders.forEach(shopDealerOrder -> { + shopDealerOrder.setSecondDividendFlag(1); + shopDealerOrder.setSecondDividendNo(no); + shopDealerOrder.setSecondDividendTime(now); + }); + }); + + //5.4 二级结算【增加钱包金额】 + if(CollectionUtils.isNotEmpty(secondSettlementItemDtoList)){ + ShopDealerSettlementDto secondSettlementDto = new ShopDealerSettlementDto(); + secondSettlementDto.setType(ShopDealerTypeEnum.WITHDRAW_ACCOUNT.getCode()); + secondSettlementDto.setFlowType(ShopDealerCapitalUpdateEnum.MANAGEMENT_INCOME.getType()); + secondSettlementDto.setComments("团队管理津贴(2)"); + secondSettlementDto.setTenantId(10584); + secondSettlementDto.setItemList(secondSettlementItemDtoList); + shopDealerUserService.settlementBatch(secondSettlementDto); + } + + //6.批量修改订单为已结算状态 + if(CollectionUtils.isNotEmpty(shopOrderList)){ + shopOrderService.updateBatchById(shopOrderList); + } + + //7.批量修改订单分销数据为已结算状态 + if(CollectionUtils.isNotEmpty(shopDealerOrderList)){ + shopDealerOrderService.updateBatchById(shopDealerOrderList); + } + } + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopDealerOrderTaskVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopDealerOrderTaskVO.java new file mode 100644 index 0000000..dcc772a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopDealerOrderTaskVO.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.shop.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 订单分销门店/服务商分佣记录 + * @author xm + * @since 2026-05-15 + */ +@Data +@Schema(description = "订单分销门店/服务商分佣记录") +public class ShopDealerOrderTaskVO { + + @Schema(description = "商品订单ID") + private Integer orderId; + + @Schema(description = "主键ID") + private Integer shopDealerOrderId; + + @Excel(name = "订单编号") + private String orderNo; + + @Schema(description = "一级服务商/门店") + private Integer firstDividendUser; + + @Schema(description = "一级服务商/门店管理津贴") + private BigDecimal firstDividend; + + @Schema(description = "一级服务商/门店结算标识 0-否 1-是") + private Integer firstDividendFlag; + + @Schema(description = "二级服务商/门店") + private Integer secondDividendUser; + + @Schema(description = "二级服务商/门店管理津贴") + private BigDecimal secondDividend; + + @Schema(description = "二级服务商/门店结算标识 0-否 1-是") + private Integer secondDividendFlag; + +} From b5d4274d975a419e7885e3b90664c0941a05bb69 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Tue, 19 May 2026 10:32:17 +0800 Subject: [PATCH 49/60] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E3=80=81=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E5=8A=A0=E8=BD=BD=E8=B7=AF=E5=BE=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=202=E3=80=81=E4=BC=98=E5=8C=96=E9=85=8D=E9=80=81=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E4=B8=9A=E5=8A=A1=EF=BC=8C=E9=85=8D=E9=80=81=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8D=B3=E8=AE=A1=E7=AE=97=203=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=97=A8=E5=BA=97=E3=80=81=E6=9C=8D=E5=8A=A1=E5=95=86?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BB=BB=E5=8A=A1=204=E3=80=81=E7=A7=92?= =?UTF-8?q?=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=A2=9E=E5=8A=A0=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/config/CertificateProperties.java | 2 +- .../controller/DatabaseFixController.java | 2 +- .../controller/DevEnvironmentController.java | 2 +- .../EnvironmentAwarePaymentService.java | 4 +- .../core/utils/WechatCertAutoConfig.java | 2 +- .../utils/WechatPayCertificateDiagnostic.java | 4 +- .../core/utils/WechatPayCertificateFixer.java | 4 +- .../core/utils/WechatPayConfigValidator.java | 4 +- .../core/utils/WechatPayDiagnostic.java | 2 +- .../service/impl/SettingServiceImpl.java | 2 +- .../GltTicketTemplateController.java | 1 + .../impl/GltTicketOrderServiceImpl.java | 27 +++++++++++++- .../GltTicketOrderAutoConfirm10584Task.java | 2 +- .../payment/constants/PaymentConstants.java | 2 +- .../payment/service/WxPayConfigService.java | 8 ++-- .../shop/constants/WxPayConstants.java | 2 +- .../ShopFlashSaleActivityController.java | 8 ++-- .../shop/controller/ShopOrderController.java | 19 +++++++++- .../shop/entity/ShopFlashSaleActivity.java | 3 ++ .../com/gxwebsoft/shop/entity/ShopGoods.java | 26 +++++++++---- .../shop/mapper/xml/ShopGoodsMapper.xml | 3 ++ .../param/ShopFlashSaleActivityParam.java | 3 ++ .../gxwebsoft/shop/param/ShopGoodsParam.java | 37 +++++++++++++++++-- .../service/ShopFlashSaleActivityService.java | 9 ++++- .../impl/ShopDealerUserServiceImpl.java | 1 - .../ShopFlashSaleActivityServiceImpl.java | 23 +++++++++++- .../service/impl/ShopOrderServiceImpl.java | 18 ++------- .../gxwebsoft/shop/task/CouponExpireTask.java | 2 +- .../shop/task/OrderAutoCancelTask.java | 2 +- .../shop/task/OrderSettlementTask.java | 2 + .../shop/vo/ShopFlashSaleActivityVO.java | 3 ++ src/main/resources/application.yml | 6 +++ .../core/utils/EncryptedQrCodeUtilTest.java | 2 +- .../controller/WxLoginControllerTest.java | 2 +- .../system/service/UserIgnoreTenantTest.java | 2 +- .../system/service/WeixinConfigTest.java | 2 +- .../gxwebsoft/config/MqttPropertiesTest.java | 2 +- .../gxwebsoft/config/ServerUrlConfigTest.java | 2 +- 38 files changed, 183 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/config/CertificateProperties.java b/src/main/java/com/gxwebsoft/common/core/config/CertificateProperties.java index a13c9d3..e669ee9 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/CertificateProperties.java +++ b/src/main/java/com/gxwebsoft/common/core/config/CertificateProperties.java @@ -32,7 +32,7 @@ public class CertificateProperties { /** * 开发环境证书路径前缀 */ - private String devCertPath = "dev"; + private String devCertPath = "local"; /** * 微信支付证书配置 diff --git a/src/main/java/com/gxwebsoft/common/core/controller/DatabaseFixController.java b/src/main/java/com/gxwebsoft/common/core/controller/DatabaseFixController.java index 166e9cd..fdd0ec1 100644 --- a/src/main/java/com/gxwebsoft/common/core/controller/DatabaseFixController.java +++ b/src/main/java/com/gxwebsoft/common/core/controller/DatabaseFixController.java @@ -30,7 +30,7 @@ import java.util.Map; @Tag(name = "数据库修复工具") @RestController @RequestMapping("/api/database-fix") -// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "dev") +// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "local") public class DatabaseFixController extends BaseController { @Autowired diff --git a/src/main/java/com/gxwebsoft/common/core/controller/DevEnvironmentController.java b/src/main/java/com/gxwebsoft/common/core/controller/DevEnvironmentController.java index 8e30a34..c2f5894 100644 --- a/src/main/java/com/gxwebsoft/common/core/controller/DevEnvironmentController.java +++ b/src/main/java/com/gxwebsoft/common/core/controller/DevEnvironmentController.java @@ -28,7 +28,7 @@ import java.util.Map; @Tag(name = "开发环境管理") @RestController @RequestMapping("/api/dev") -// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "dev") +// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "local") public class DevEnvironmentController extends BaseController { @Autowired diff --git a/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java b/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java index c8bdf53..25829f5 100644 --- a/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java +++ b/src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java @@ -70,7 +70,7 @@ public class EnvironmentAwarePaymentService { * 根据当前环境获取回调地址 */ private String getEnvironmentNotifyUrl() { - if ("dev".equals(activeProfile) || "test".equals(activeProfile)) { + if ("local".equals(activeProfile) || "test".equals(activeProfile)) { // 开发/测试环境使用本地回调地址 return devNotifyUrl; } else if ("prod".equals(activeProfile)) { @@ -135,7 +135,7 @@ public class EnvironmentAwarePaymentService { * 是否为开发环境 */ public boolean isDevelopmentEnvironment() { - return "dev".equals(activeProfile) || "test".equals(activeProfile); + return "local".equals(activeProfile) || "test".equals(activeProfile); } /** diff --git a/src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java b/src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java index 75b0a22..3f0f432 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java @@ -84,7 +84,7 @@ public class WechatCertAutoConfig { String apiV3Key = "0kF5OlPr482EZwtn9zGufUcqa7ovgxRL"; // 根据环境选择证书路径 - if ("dev".equals(activeProfile)) { + if ("local".equals(activeProfile)) { // 开发环境：使用配置文件upload-path拼接证书路径 String uploadPath = configProperties.getUploadPath(); // 配置文件路径 String tenantId = "10550"; // 租户ID diff --git a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateDiagnostic.java b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateDiagnostic.java index ebe8189..81e2e9e 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateDiagnostic.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateDiagnostic.java @@ -105,7 +105,7 @@ public class WechatPayCertificateDiagnostic { * 检查证书文件 */ private void checkCertificateFiles(Payment payment, Integer tenantId, String environment, DiagnosticResult result) { - if ("dev".equals(environment)) { + if ("local".equals(environment)) { // 开发环境证书检查 String tenantCertPath = "dev/wechat/" + tenantId; String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); @@ -152,7 +152,7 @@ public class WechatPayCertificateDiagnostic { */ private void validateCertificateContent(Payment payment, Integer tenantId, String environment, DiagnosticResult result) { try { - if ("dev".equals(environment)) { + if ("local".equals(environment)) { String tenantCertPath = "dev/wechat/" + tenantId; String apiclientCertPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getApiclientCertFile(); diff --git a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateFixer.java b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateFixer.java index af6e357..b29918e 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateFixer.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateFixer.java @@ -103,7 +103,7 @@ public class WechatPayCertificateFixer { * 修复证书文件问题 */ private void fixCertificateFiles(Payment payment, Integer tenantId, String environment, FixResult result) { - if ("dev".equals(environment)) { + if ("local".equals(environment)) { fixDevCertificateFiles(tenantId, result); } else { fixProdCertificateFiles(payment, result); @@ -169,7 +169,7 @@ public class WechatPayCertificateFixer { } // 在开发环境中，尝试从证书文件中提取序列号进行验证 - if ("dev".equals(environment)) { + if ("local".equals(environment)) { try { String tenantCertPath = "dev/wechat/" + tenantId; String apiclientCertPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getApiclientCertFile(); diff --git a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayConfigValidator.java b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayConfigValidator.java index 23326d2..eb26d62 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayConfigValidator.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayConfigValidator.java @@ -115,7 +115,7 @@ public class WechatPayConfigValidator { * 验证证书文件 */ private void validateCertificateFiles(Integer tenantId, ValidationResult result) { - if ("dev".equals(activeProfile)) { + if ("local".equals(activeProfile)) { // 开发环境证书验证 String tenantCertPath = "dev/wechat/" + tenantId; String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); @@ -195,7 +195,7 @@ public class WechatPayConfigValidator { // 证书文件检查 report.append("当前环境: ").append(activeProfile).append("\n"); - if ("dev".equals(activeProfile)) { + if ("local".equals(activeProfile)) { String tenantCertPath = "dev/wechat/" + tenantId; String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); boolean certExists = certificateLoader.certificateExists(privateKeyPath); diff --git a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayDiagnostic.java b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayDiagnostic.java index 620d506..a623586 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/WechatPayDiagnostic.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/WechatPayDiagnostic.java @@ -78,7 +78,7 @@ public class WechatPayDiagnostic { } // 生产环境检查证书文件 - if (!"dev".equals(environment)) { + if (!"local".equals(environment)) { if (payment.getApiclientCert() != null) { log.info("商户证书文件配置: {}", payment.getApiclientCert()); } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java index f72ab1d..e48d7d8 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java @@ -143,7 +143,7 @@ public class SettingServiceImpl extends ServiceImpl impl final String apiV3key = jsonObject.getString("wechatApiKey"); if(config == null){ // 根据环境选择不同的证书路径配置 - if ("dev".equals(activeProfile)) { + if ("local".equals(activeProfile)) { // 开发环境：使用配置文件的upload-path拼接证书路径 - 租户ID 10550 System.out.println("=== 开发环境：使用配置文件upload-path拼接证书路径 ==="); String uploadPath = pathConfig.getUploadPath(); // 获取配置的upload-path diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketTemplateController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketTemplateController.java index fb07151..488e7b9 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketTemplateController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketTemplateController.java @@ -79,6 +79,7 @@ public class GltTicketTemplateController extends BaseController { User loginUser = getLoginUser(); if (loginUser != null) { gltTicketTemplate.setUserId(loginUser.getUserId()); + gltTicketTemplate.setTenantId(loginUser.getTenantId()); } if (gltTicketTemplateService.save(gltTicketTemplate)) { return success("添加成功"); diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index c22951d..9c509a5 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -680,6 +680,12 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0) { + BigDecimal money = RIDER_UNIT_COMMISSION + .multiply(BigDecimal.valueOf(qty)) + .setScale(RIDER_COMMISSION_SCALE, RoundingMode.HALF_UP); + if (money.signum() > 0) { + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(ticketOrder.getRiderId()); + reduceDto.setOrderUserId(ticketOrder.getUserId()); + reduceDto.setOrderNo(ticketOrder.getNo()); + reduceDto.setPrice(money); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_INCOME); + shopDealerUserService.reduceBalance(reduceDto); + } + } + //查询未完成订单，完成资金解冻 LambdaQueryWrapper orderLambdaQueryWrapper; if(shopOrderId != null){ diff --git a/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoConfirm10584Task.java b/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoConfirm10584Task.java index 4866fce..ae4d0ee 100644 --- a/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoConfirm10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoConfirm10584Task.java @@ -34,7 +34,7 @@ public class GltTicketOrderAutoConfirm10584Task { private final AtomicBoolean running = new AtomicBoolean(false); - @Scheduled(cron = "${glt.ticket-order.auto-confirm10584.cron:0/33 * * * * ?}") +// @Scheduled(cron = "${glt.ticket-order.auto-confirm10584.cron:0/33 * * * * ?}") @IgnoreTenant("定时任务无登录态，需忽略租户隔离；内部使用 tenantId=10584 精确过滤") public void run() { if (!running.compareAndSet(false, true)) { diff --git a/src/main/java/com/gxwebsoft/payment/constants/PaymentConstants.java b/src/main/java/com/gxwebsoft/payment/constants/PaymentConstants.java index 80f0354..ffd8c2c 100644 --- a/src/main/java/com/gxwebsoft/payment/constants/PaymentConstants.java +++ b/src/main/java/com/gxwebsoft/payment/constants/PaymentConstants.java @@ -230,7 +230,7 @@ public class PaymentConstants { */ public static class Environment { /** 开发环境 */ - public static final String DEV = "dev"; + public static final String DEV = "local"; /** 测试环境 */ public static final String TEST = "test"; /** 生产环境 */ diff --git a/src/main/java/com/gxwebsoft/payment/service/WxPayConfigService.java b/src/main/java/com/gxwebsoft/payment/service/WxPayConfigService.java index db72082..b61fdb5 100644 --- a/src/main/java/com/gxwebsoft/payment/service/WxPayConfigService.java +++ b/src/main/java/com/gxwebsoft/payment/service/WxPayConfigService.java @@ -148,7 +148,7 @@ public class WxPayConfigService { log.info("从数据库获取支付配置成功，租户ID: {}，将缓存配置", tenantId); // 开发环境下，如果apiclientKey为空，设置默认值 - if ("dev".equals(activeProfile) && + if ("local".equals(activeProfile) && (payment.getApiclientKey() == null || payment.getApiclientKey().trim().isEmpty())) { log.warn("开发环境：数据库配置中apiclientKey为空，使用默认值，租户ID: {}", tenantId); payment.setApiclientKey("apiclient_key.pem"); @@ -167,7 +167,7 @@ public class WxPayConfigService { } // 数据库也没有配置 - if (!"dev".equals(activeProfile)) { + if (!"local".equals(activeProfile)) { throw PaymentException.systemError("微信支付配置未找到，租户ID: " + tenantId + "，请检查数据库配置", null); } @@ -237,7 +237,7 @@ public class WxPayConfigService { */ private Config createWxPayConfig(Payment payment, String certificatePath) throws PaymentException { try { - if ("dev".equals(activeProfile) && payment == null) { + if ("local".equals(activeProfile) && payment == null) { // 开发环境测试配置 return createDevTestConfig(certificatePath); } else if (payment != null) { @@ -343,7 +343,7 @@ public class WxPayConfigService { // 开发环境下，如果apiclientKey为空，给一个警告但不抛异常 // 生产环境必须有apiclientKey if (payment.getApiclientKey() == null || payment.getApiclientKey().trim().isEmpty()) { - if ("dev".equals(activeProfile)) { + if ("local".equals(activeProfile)) { log.warn("开发环境：证书文件名(apiclientKey)未配置，将使用默认值"); } else { throw PaymentException.systemError("证书文件名(apiclientKey)未配置", null); diff --git a/src/main/java/com/gxwebsoft/shop/constants/WxPayConstants.java b/src/main/java/com/gxwebsoft/shop/constants/WxPayConstants.java index 1618dd8..8d6eb84 100644 --- a/src/main/java/com/gxwebsoft/shop/constants/WxPayConstants.java +++ b/src/main/java/com/gxwebsoft/shop/constants/WxPayConstants.java @@ -78,7 +78,7 @@ public class WxPayConstants { public static final int AMOUNT_MULTIPLIER = 100; /** 开发环境标识 */ - public static final String PROFILE_DEV = "dev"; + public static final String PROFILE_DEV = "local"; /** 生产环境标识 */ public static final String PROFILE_PROD = "prod"; } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java index dc2e0c9..9ddac55 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java @@ -43,9 +43,9 @@ public class ShopFlashSaleActivityController extends BaseController { @Operation(summary = "个人获取秒杀活动数据") @GetMapping("/getMyActive") - public ApiResult> getMyActive(@RequestParam("tenantId") Integer tenantId) { + public ApiResult> getMyActive(@RequestParam("tenantId") Integer tenantId, Integer popFlag) { // 使用关联查询 - return success(shopFlashSaleActivityService.getMyActive(tenantId)); + return success(shopFlashSaleActivityService.getMyActive(tenantId, popFlag)); } // @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')") @@ -59,9 +59,9 @@ public class ShopFlashSaleActivityController extends BaseController { // @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')") @Operation(summary = "根据id查询秒杀活动") @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { + public ApiResult get(@PathVariable("id") Integer id) { // 使用关联查询 - return success(shopFlashSaleActivityService.getByIdRel(id)); + return success(shopFlashSaleActivityService.getInfoById(id)); } // @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:save')") diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 4a375be..15c4298 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -20,6 +20,7 @@ import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.glt.service.GltTicketIssueService; import com.gxwebsoft.glt.service.GltTicketRevokeService; +import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task; import com.gxwebsoft.payment.dto.PaymentResponse; import com.gxwebsoft.payment.enums.PaymentType; import com.gxwebsoft.payment.service.PaymentService; @@ -114,6 +115,8 @@ public class ShopOrderController extends BaseController { private GltTicketIssueService gltTicketIssueService; @Resource private OrderNoUtils orderNoUtils; + @Resource + private DealerOrderSettlement10584Task dealerOrderSettlement; @Operation(summary = "分页查询订单") @GetMapping("/page") @@ -805,7 +808,7 @@ public class ShopOrderController extends BaseController { if (config == null) { try { NotificationConfig newConfig; - if (active.equals("dev")) { + if (active.equals("local")) { // 开发环境 - 构建包含租户号的私钥路径 String tenantCertPath = "dev/wechat/" + tenantId; String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile(); @@ -975,6 +978,20 @@ public class ShopOrderController extends BaseController { return success(Boolean.TRUE); } + @Operation(summary = "支付成功发送水票", description = "支付成功发送水票") + @PutMapping("/suerTicketRelease") + public ApiResult suerTicketRelease(@RequestBody PaySuccessTaskDto taskDto){ + gltTicketIssueService.suerTicketRelease(taskDto.getOrderNo(), taskDto.getTenantId()); + return success(Boolean.TRUE); + } + + @Operation(summary = "支付成功结算", description = "支付成功结算") + @PutMapping("/orderSettlement") + public ApiResult orderSettlement(@RequestBody PaySuccessTaskDto taskDto){ + dealerOrderSettlement.orderSettlement(taskDto.getOrderNo()); + return success(Boolean.TRUE); + } + @Operation(summary = "更新订单支付状态", description = "用户支付成功后主动同步订单状态") @PutMapping("/payment-status") public ApiResult updateOrderPaymentStatus(@RequestBody UpdatePaymentStatusRequest request) { diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java index 7420d0f..41d06b2 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopFlashSaleActivity.java @@ -78,6 +78,9 @@ public class ShopFlashSaleActivity implements Serializable { @Schema(description = "排序") private Integer sortNumber; + @Schema(description = "是否弹窗 0-否 1-是") + private Integer popFlag; + @Schema(description = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index 0b942d7..4b67efb 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -1,12 +1,11 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; + +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -174,9 +173,6 @@ public class ShopGoods implements Serializable { @Schema(description = "用户ID") private Integer userId; - @Schema(description = "租户id") - private Integer tenantId; - @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开") private String deliveryType; @@ -186,12 +182,28 @@ public class ShopGoods implements Serializable { @Schema(description = "水票ID") private Integer waterTickerId; + @Schema(description = "商品大类 1-水 2-茶叶 3-酒 4-香水") + private Integer categoryType; + + @Schema(description = "租户id") + private Integer tenantId; + + @Schema(description = "创建人") + private Integer creator; + @Schema(description = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + @Schema(description = "修改人") + private Integer updater; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @Schema(description = "是否删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml index 0f57c75..3a74a14 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml @@ -110,6 +110,9 @@ AND a.deleted = #{param.deleted} + + AND a.water_ticket_flag = #{param.waterTicketFlag} + AND a.deleted = 0 diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java index 02cf4a1..fba65fd 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopFlashSaleActivityParam.java @@ -69,6 +69,9 @@ public class ShopFlashSaleActivityParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer sortNumber; + @Schema(description = "是否弹窗 0-否 1-是") + private Integer popFlag; + @Schema(description = "创建者") private String creator; diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java index a1f1880..fd38ccc 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java @@ -1,15 +1,17 @@ package com.gxwebsoft.shop.param; -import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 商品查询参数 * @@ -158,4 +160,33 @@ public class ShopGoodsParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer deliveryMode; + @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开") + private String deliveryType; + + @Schema(description = "水票标识 0-否 1-是") + private Integer waterTicketFlag; + + @Schema(description = "水票ID") + private Integer waterTickerId; + + @Schema(description = "商品大类 1-水 2-茶叶 3-酒 4-香水") + private Integer categoryType; + + @Schema(description = "租户id") + private Integer tenantId; + + @Schema(description = "创建人") + private Integer creator; + + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @Schema(description = "修改人") + private Integer updater; + + @Schema(description = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java index eee7133..5cad0a0 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java @@ -24,6 +24,13 @@ public interface ShopFlashSaleActivityService extends IService pageRel(ShopFlashSaleActivityParam param); + /** + * 查询详情 + * @param id + * @return + */ + ShopFlashSaleActivityVO getInfoById(Integer id); + /** * 关联查询全部 * @@ -45,7 +52,7 @@ public interface ShopFlashSaleActivityService extends IService getMyActive(Integer tenantId); + List getMyActive(Integer tenantId, Integer popFlag); /** * 修改秒杀活动状态 diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index a11d677..85417b8 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -167,7 +167,6 @@ public class ShopDealerUserServiceImpl extends ServiceImpl(list, page.getTotal()); } + @Override + public ShopFlashSaleActivityVO getInfoById(Integer id) { + ShopFlashSaleActivity saleActivity = baseMapper.selectById(id); + ShopFlashSaleActivityVO result = BeanUtil.toBean(saleActivity, ShopFlashSaleActivityVO.class); + if(result.getGoodsId() != null){ + ShopGoods shopGood = shopGoodsMapper.selectById(result.getGoodsId()); + if(shopGood != null){ + result.setGoodsPrice(shopGood.getPrice()); + result.setGoodsTotalPrice(shopGood.getPrice().multiply(new BigDecimal(result.getNum()))); + result.setGoodsName(shopGood.getName()); + result.setImage(shopGood.getImage()); + result.setUnitName(shopGood.getUnitName()); + } + } + return result; + } + @Override public List listRel(ShopFlashSaleActivityParam param) { List list = baseMapper.selectListRel(param); @@ -81,14 +98,13 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl getMyActive(Integer tenantId) { + public List getMyActive(Integer tenantId, Integer popFlag) { List resultVOList = new ArrayList<>(); User loginUser = LoginUserUtil.getLoginUser(); if(loginUser == null){ throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg()); } - Boolean newUser = true; //判断是否为新用户【只要未成功下单都判定为新用户】 LambdaQueryWrapper shopOrderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getUserId, loginUser.getUserId()).eq(ShopOrder::getPayStatus, 1) @@ -101,6 +117,9 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl activityWrapper = lambdaQuery().eq(ShopFlashSaleActivity::getStatus, 0).gt(ShopFlashSaleActivity::getStock, 0).eq(ShopFlashSaleActivity::getTenantId, tenantId) .apply("NOW() BETWEEN start_time AND end_time"); + if(popFlag != null){ + activityWrapper.eq(ShopFlashSaleActivity::getPopFlag, popFlag); + } Map activityMap = new HashMap<>(); if(!newUser){ diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index f5bf420..031d161 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -276,7 +276,7 @@ public class ShopOrderServiceImpl extends ServiceImpl Date: Tue, 19 May 2026 16:47:42 +0800 Subject: [PATCH 50/60] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=80=81?= =?UTF-8?q?=E6=B0=B4=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B0=B4=E7=A5=A8=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=202=E3=80=81=E5=88=86=E9=94=80=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=94=80=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E4=B8=9A=E5=8A=A1=203=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=94=80=E7=94=A8=E6=88=B7=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=BD=93=E6=97=A5=E6=94=B6=E7=9B=8A=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/glt/entity/GltTicketOrder.java | 1 - .../impl/GltTicketOrderServiceImpl.java | 1 + .../task/DealerOrderSettlement10584Task.java | 3 + .../controller/ShopDealerOrderController.java | 8 +++ .../shop/entity/ShopDealerCapital.java | 3 + .../shop/mapper/ShopDealerOrderMapper.java | 8 +++ .../shop/mapper/xml/ShopDealerOrderMapper.xml | 19 +++++++ .../shop/service/ShopDealerOrderService.java | 7 +++ .../impl/ShopDealerOrderServiceImpl.java | 56 ++++++++++++++----- .../impl/ShopDealerUserServiceImpl.java | 17 ++++-- .../vo/ShopDealerOrderTodayRevenueVO.java | 48 ++++++++++++++++ 11 files changed, 152 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopDealerOrderTodayRevenueVO.java diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index 9060d9c..d0a8b69 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -33,7 +33,6 @@ public class GltTicketOrder implements Serializable { private Integer userTicketId; @Schema(description = "关联订单编号") - @TableField(exist = false) private String orderNo; @Schema(description = "订单状态") diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 9c509a5..b2b5db5 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -177,6 +177,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl todayRevenue() { + return success(shopDealerOrderService.todayRevenue()); + } + @PreAuthorize("hasAuthority('shop:shopDealerOrder:save')") @OperationLog @Operation(summary = "添加分销商订单记录表") diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java index cbddfe8..3832a48 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java @@ -77,6 +77,9 @@ public class ShopDealerCapital implements Serializable { @Schema(description = "结算月份") private String month; + @Schema(description = "结算标识 0-未结算 1-已结算") + private Integer paymentFlag; + @Schema(description = "商城ID") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java index 10ac5c8..01776aa 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerOrderMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.gxwebsoft.shop.entity.ShopDealerOrder; import com.gxwebsoft.shop.param.ShopDealerOrderParam; import com.gxwebsoft.shop.vo.ShopDealerOrderTaskVO; +import com.gxwebsoft.shop.vo.ShopDealerOrderTodayRevenueVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -42,4 +43,11 @@ public interface ShopDealerOrderMapper extends BaseMapper { */ List getDealerOrderList(@Param("tenantId") Integer tenantId); + /** + * 获取用户当日分佣数据 + * @param userId + * @return + */ + List getTodayRevenue(@Param("userId") Integer userId); + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml index d70a745..b1cc0eb 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml @@ -111,5 +111,24 @@ AND a.deleted = 0 AND ((b.first_dividend > 0 AND first_dividend_flag = 0) OR (b.second_dividend > 0 AND second_dividend_flag = 0)) + diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java index 4e4f057..3dd1f72 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerOrderService.java @@ -5,6 +5,7 @@ import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.shop.entity.ShopDealerOrder; import com.gxwebsoft.shop.param.ShopDealerOrderParam; +import java.math.BigDecimal; import java.util.List; /** @@ -39,6 +40,12 @@ public interface ShopDealerOrderService extends IService { */ ShopDealerOrder getByIdRel(Integer id); + /** + * 查询门店/服务商本人今日收益 + * @return + */ + BigDecimal todayRevenue(); + /** * 手动触发单条订单的佣金解冻（保留与定时任务相同的前置条件检查） * diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java index e34a778..4c0e906 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java @@ -4,25 +4,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.LoginUserUtil; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.entity.GltTicketTemplate; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.service.GltTicketOrderService; import com.gxwebsoft.glt.service.GltTicketTemplateService; import com.gxwebsoft.glt.service.GltUserTicketService; -import com.gxwebsoft.shop.entity.ShopDealerCapital; -import com.gxwebsoft.shop.entity.ShopDealerOrder; -import com.gxwebsoft.shop.entity.ShopDealerUser; -import com.gxwebsoft.shop.entity.ShopGoods; -import com.gxwebsoft.shop.entity.ShopOrder; -import com.gxwebsoft.shop.entity.ShopOrderGoods; +import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.ShopDealerOrderMapper; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; +import com.gxwebsoft.shop.param.ShopDealerOrderParam; import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.service.ShopDealerOrderService; -import com.gxwebsoft.shop.param.ShopDealerOrderParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.vo.ShopDealerOrderTodayRevenueVO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; @@ -32,11 +32,7 @@ import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -105,6 +101,38 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl revenueVOList = baseMapper.getTodayRevenue(userId); + if(CollectionUtils.isNotEmpty(revenueVOList)){ + for(ShopDealerOrderTodayRevenueVO revenueVO : revenueVOList){ + //已取消订单不统计 + if(Arrays.asList(2, 6).contains(revenueVO.getOrderStatus())){ + continue; + } + if(userId.equals(revenueVO.getFirstUserId()) && revenueVO.getFirstMoney().compareTo(BigDecimal.ZERO) > 0){ + todayRevenue = todayRevenue.add(revenueVO.getFirstMoney()); + } + if(userId.equals(revenueVO.getSecondUserId()) && revenueVO.getSecondMoney().compareTo(BigDecimal.ZERO) > 0){ + todayRevenue = todayRevenue.add(revenueVO.getSecondMoney()); + } + if(userId.equals(revenueVO.getFirstDividendUser()) && revenueVO.getFirstDividend().compareTo(BigDecimal.ZERO) > 0){ + todayRevenue = todayRevenue.add(revenueVO.getFirstDividend()); + } + if(userId.equals(revenueVO.getSecondDividendUser()) && revenueVO.getSecondDividend().compareTo(BigDecimal.ZERO) > 0){ + todayRevenue = todayRevenue.add(revenueVO.getSecondDividend()); + } + } + } + } + return todayRevenue; + } + // ==================== 手动解冻 ==================== @Override diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index 85417b8..7a97228 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -104,6 +104,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl{ //5.4 查询是否存在待解冻订单数据 - ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType())).findFirst().orElse(null); + ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType()) && capital.getPaymentFlag() != null + && capital.getPaymentFlag() == 0).findFirst().orElse(null); if(userCapital != null){ //5.5 查询此订单是否已结算 @@ -239,15 +242,21 @@ public class ShopDealerUserServiceImpl extends ServiceImpl Date: Tue, 19 May 2026 17:40:08 +0800 Subject: [PATCH 51/60] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E9=80=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E6=88=90=E7=BB=93=E7=AE=97=E9=85=8D?= =?UTF-8?q?=E9=80=81=E9=87=91=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ShopDealerCapitalUpdateEnum.java | 3 +- .../impl/GltTicketOrderServiceImpl.java | 35 +++++++++++++------ .../impl/ShopDealerUserServiceImpl.java | 3 +- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java index 304ad31..ff261fb 100644 --- a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java +++ b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java @@ -19,7 +19,8 @@ public enum ShopDealerCapitalUpdateEnum { TRANSFER_PAYMENT(30, "转账支出", false), TRANSFER_INCOME(40, "转账收入", true), FREEZE_MONEY_THAW(50, "佣金解冻", true), - DELIVERY_INCOME(60, "配送奖励", true), + DELIVERY_REWARD(60, "配送奖励", true), + DELIVERY_INCOME(61, "配送提成", true), ORDER_REFUND(70, "佣金退回(退单)", false), ; diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index b2b5db5..18898fc 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -23,6 +23,7 @@ import com.gxwebsoft.glt.service.GltUserTicketLogService; import com.gxwebsoft.glt.service.GltUserTicketService; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.*; +import com.gxwebsoft.shop.mapper.ShopGoodsMapper; import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.service.ShopDealerUserService; @@ -93,6 +94,9 @@ public class GltTicketOrderServiceImpl extends ServiceImpl pageRel(GltTicketOrderParam param) { PageParam page = new PageParam<>(param); @@ -774,9 +778,9 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0) { + if (qty > 0) { //配送提成 BigDecimal money = RIDER_UNIT_COMMISSION .multiply(BigDecimal.valueOf(qty)) .setScale(RIDER_COMMISSION_SCALE, RoundingMode.HALF_UP); @@ -792,15 +796,26 @@ public class GltTicketOrderServiceImpl extends ServiceImpl orderLambdaQueryWrapper; - if(shopOrderId != null){ - orderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getOrderId, shopOrderId).eq(ShopOrder::getOrderStatus, 0); - }else{ - orderLambdaQueryWrapper = new LambdaQueryWrapper().eq(ShopOrder::getOrderId, shopOrderNo).eq(ShopOrder::getOrderStatus, 0); + //配送奖励 + Integer goodsId = userTicket.getGoodsId(); + ShopGoods shopGood = shopGoodsMapper.selectById(goodsId); + ShopOrder order = shopOrderService.getByOrderNo(userTicket.getOrderNo(), userTicket.getTenantId()); + if(shopGood != null && order != null){ + BigDecimal money = order.getPayPrice().multiply(shopGood.getDeliveryMoney()); + if(money.signum() > 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(ticketOrder.getRiderId()); + reduceDto.setOrderUserId(ticketOrder.getUserId()); + reduceDto.setOrderNo(ticketOrder.getNo()); + reduceDto.setPrice(money); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_REWARD); + shopDealerUserService.reduceBalance(reduceDto); + } } - ShopOrder order = shopOrderService.getOne(orderLambdaQueryWrapper); - if(order != null){ + + //查询未完成订单，完成资金解冻 + if(order != null && order.getOrderStatus() == 0){ ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST); reduceDto.setOrderUserId(order.getUserId()); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index 7a97228..bd64ae2 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -118,6 +118,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl Date: Tue, 19 May 2026 17:52:19 +0800 Subject: [PATCH 52/60] =?UTF-8?q?local=E5=90=AF=E5=8A=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 400131d..b6aed37 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -15,8 +15,9 @@ spring: redis: database: 0 - host: localhost - port: 6379 + host: 47.107.249.41 + port: 16379 + password: redis_t74P8C # 日志配置 logging: From 5b876d29ebdf03752d97ac401b5716ab9df8ec6f Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 20 May 2026 11:29:24 +0800 Subject: [PATCH 53/60] =?UTF-8?q?1=E3=80=81=E5=85=B3=E9=97=AD=E5=8E=9F?= =?UTF-8?q?=E6=9C=89=E5=AE=9A=E6=97=B6=E7=BB=93=E7=AE=97=E3=80=81=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E7=BB=93=E7=AE=97=E4=B8=9A=E5=8A=A1=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E6=96=B0=E4=B8=9A=E5=8A=A1=E5=B7=B2=E5=AE=8C=E6=88=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=BB=93=E7=AE=97=E5=8A=9F=E8=83=BD=202=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=92=E6=9D=80=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B4=BB=E5=8A=A8=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E7=A0=81=E4=B8=9A=E5=8A=A1=203=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DealerCommissionUnfreeze10584Task.java | 2 +- .../controller/ShopDealerOrderController.java | 2 +- .../gxwebsoft/shop/dto/UserOrderStats.java | 2 +- .../com/gxwebsoft/shop/entity/ShopOrder.java | 4 +++ .../gxwebsoft/shop/entity/ShopOrderGoods.java | 8 +++++ .../shop/mapper/xml/ShopOrderMapper.xml | 6 ++-- .../impl/ShopOrderGoodsServiceImpl.java | 32 +++++++++++++++++++ .../service/impl/ShopOrderServiceImpl.java | 25 +++++++++++++-- src/main/resources/application-local.yml | 5 ++- 9 files changed, 74 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java b/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java index 41ae77b..ac80e0e 100644 --- a/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/DealerCommissionUnfreeze10584Task.java @@ -116,7 +116,7 @@ public class DealerCommissionUnfreeze10584Task { private final AtomicBoolean running = new AtomicBoolean(false); - @Scheduled(cron = "${dealer.commission.unfreeze10584.cron:0/50 * * * * ?}") +// @Scheduled(cron = "${dealer.commission.unfreeze10584.cron:0/50 * * * * ?}") @IgnoreTenant("定时任务无登录态，需忽略租户隔离；内部使用 tenantId=10584 精确过滤") public void run() { if (!running.compareAndSet(false, true)) { diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java index cc26721..97f490d 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerOrderController.java @@ -183,7 +183,7 @@ public class ShopDealerOrderController extends BaseController { @PreAuthorize("hasAuthority('shop:shopDealerOrder:update')") @OperationLog @Operation(summary = "手动触发单条订单佣金解冻") - @PostMapping("/unfreeze") +// @PostMapping("/unfreeze") public ApiResult manualUnfreeze(@RequestBody Map body) { String orderNo = (String) body.get("orderNo"); if (orderNo == null || orderNo.isBlank()) { diff --git a/src/main/java/com/gxwebsoft/shop/dto/UserOrderStats.java b/src/main/java/com/gxwebsoft/shop/dto/UserOrderStats.java index ae563ca..5ce7eeb 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/UserOrderStats.java +++ b/src/main/java/com/gxwebsoft/shop/dto/UserOrderStats.java @@ -26,7 +26,7 @@ public class UserOrderStats implements Serializable { @Schema(description = "待核销（statusFilter=2）") private Long waitVerify; - @Schema(description = "待收货（statusFilter=3）") + @Schema(description = "待收货/使用（statusFilter=3）") private Long waitReceive; @Schema(description = "待评价（statusFilter=4）") diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index a844a9f..bb6de33 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -313,6 +313,10 @@ public class ShopOrder implements Serializable { @Schema(description = "秒杀活动ID") private Integer activityId; + @Schema(description = "秒杀活动ID") + @TableField(exist = false) + private String activityName; + @Schema(description = "水票订单标识 0-否 1-是") private Integer waterTicketFlag; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java index 195affc..fc886c5 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrderGoods.java @@ -54,6 +54,14 @@ public class ShopOrderGoods implements Serializable { @Schema(description = "商品名称") private String goodsName; + @Schema(description = "商品名称") + @TableField(exist = false) + private String activeNam; + + @Schema(description = "核销码") + @TableField(exist = false) + private String verifyCode; + @Schema(description = "商品规格") private String spec; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index 6a239e5..bca22cf 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -248,8 +248,8 @@ AND a.pay_status = 1 AND a.order_status = 0 and order_type = 2 - - AND a.pay_status = 1 AND a.delivery_status = 20 AND a.order_status = 0 + + AND a.pay_status = 1 AND a.order_status = 0 AND (a.delivery_status = 20 or (a.order_type = 2 and a.delivery_status = 10)) @@ -300,7 +300,7 @@ COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 0 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitPay, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type in(1, 3, 4) AND a.delivery_status = 10 THEN 1 ELSE 0 END), 0) AS waitDeliver, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type = 2 THEN 1 ELSE 0 END), 0) AS waitVerify, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.delivery_status = 20 THEN 1 ELSE 0 END), 0) AS waitReceive, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND (a.delivery_status = 20 or (a.order_type = 2 and a.delivery_status = 10)) THEN 1 ELSE 0 END), 0) AS waitReceive, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 AND a.evaluate_status = 0 THEN 1 ELSE 0 END), 0) AS waitComment, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7) THEN 1 ELSE 0 END), 0) AS refund, diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java index 7019db0..d3471f1 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java @@ -2,12 +2,17 @@ package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; +import com.gxwebsoft.shop.entity.ShopOrder; +import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; import com.gxwebsoft.shop.mapper.ShopOrderGoodsMapper; +import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.service.ShopOrderGoodsService; import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.param.ShopOrderGoodsParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; @@ -21,8 +26,13 @@ import java.util.List; */ @Slf4j @Service +@AllArgsConstructor public class ShopOrderGoodsServiceImpl extends ServiceImpl implements ShopOrderGoodsService { + private ShopOrderMapper shopOrderMapper; + + private ShopFlashSaleActivityMapper shopFlashSaleActivityMapper; + @Override public PageResult pageRel(ShopOrderGoodsParam param) { PageParam page = new PageParam<>(param); @@ -34,6 +44,28 @@ public class ShopOrderGoodsServiceImpl extends ServiceImpl listRel(ShopOrderGoodsParam param) { List list = baseMapper.selectListRel(param); + + //根据订单ID查询活动并回显对应名称、订单核销码 + Integer orderId = param.getOrderId(); + if(orderId != null){ + ShopOrder order = shopOrderMapper.selectById(orderId); + if(order != null){ + ShopFlashSaleActivity saleActivity = null; + if(order.getActivityId() != null){ + saleActivity = shopFlashSaleActivityMapper.selectById(order.getActivityId()); + } + ShopFlashSaleActivity finalSaleActivity = saleActivity; + list.forEach(shopOrderGoods -> { + shopOrderGoods.setVerifyCode(order.getVerifyCode()); + if(finalSaleActivity != null){ + if(shopOrderGoods.getGoodsId().equals(finalSaleActivity.getGoodsId())){ + shopOrderGoods.setActiveNam(finalSaleActivity.getName()); + } + } + }); + } + } + // 排序 PageParam page = new PageParam<>(); page.setDefaultOrder("sort_number asc, create_time desc"); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 031d161..cc24fed 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -25,6 +25,7 @@ import com.gxwebsoft.payment.constants.WechatPayType; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.*; +import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; import com.gxwebsoft.shop.mapper.ShopGoodsMapper; import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; @@ -41,10 +42,10 @@ import com.wechat.pay.java.service.payments.model.Transaction; import com.wechat.pay.java.service.payments.nativepay.NativePayService; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -109,6 +110,8 @@ public class ShopOrderServiceImpl extends ServiceImpl list = baseMapper.selectPageRel(page, param); // 整理订单数据 - if (!CollectionUtils.isEmpty(list)) { + if (CollectionUtils.isNotEmpty(list)) { final Set orderIds = list.stream().map(ShopOrder::getOrderId).collect(Collectors.toSet()); final List goodsList = shopOrderGoodsService.list(new LambdaQueryWrapper().in(ShopOrderGoods::getOrderId, orderIds)); final Map> collect = goodsList.stream().collect(Collectors.groupingBy(ShopOrderGoods::getOrderId)); + + List activityList = new ArrayList<>(); + List activeIdList = list.stream().filter(shopOrder -> shopOrder.getActivityId() != null).map(ShopOrder::getActivityId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(activeIdList)){ + activityList = shopFlashSaleActivityMapper.selectBatchIds(activeIdList); + } + + List finalActivityList = activityList; list.forEach(d -> { d.setOrderGoods(collect.get(d.getOrderId())); @@ -320,6 +331,14 @@ public class ShopOrderServiceImpl extends ServiceImpl d.getActivityId().equals(activity.getId())).findFirst().orElse(null); + if(saleActivity != null){ + d.setActivityName(saleActivity.getName()); + } + } }); } return new PageResult<>(list, page.getTotal()); @@ -444,7 +463,7 @@ public class ShopOrderServiceImpl extends ServiceImpl orderGoodsList = shopOrderGoodsService.getListByOrderId(shopOrder.getOrderId()); - if(!CollectionUtils.isEmpty(orderGoodsList)){ + if(CollectionUtils.isNotEmpty(orderGoodsList)){ List goodsIdList = orderGoodsList.stream().map(ShopOrderGoods::getGoodsId).distinct().collect(Collectors.toList()); List shopGoods = shopGoodsMapper.selectBatchIds(goodsIdList); diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index b6aed37..400131d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -15,9 +15,8 @@ spring: redis: database: 0 - host: 47.107.249.41 - port: 16379 - password: redis_t74P8C + host: localhost + port: 6379 # 日志配置 logging: From 74bf6dd8d268c8ed6e9a6f85b368a1bfd2779192 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 20 May 2026 14:28:30 +0800 Subject: [PATCH 54/60] =?UTF-8?q?1=E3=80=81=E6=8E=A8=E5=B9=BF=E7=A0=81?= =?UTF-8?q?=E5=BA=95=E5=9B=BE=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB=E5=BA=95?= =?UTF-8?q?=E5=9B=BE=E4=B8=9A=E5=8A=A1=202=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A0=B8=E9=94=80=E7=A0=81=E3=80=81=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E4=BA=BA=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/entity/ShopActiveImage.java | 3 +++ .../com/gxwebsoft/shop/entity/ShopOrder.java | 4 ++++ .../shop/param/ShopActiveImageParam.java | 3 +++ .../impl/ShopOrderGoodsServiceImpl.java | 23 +++++++++---------- .../service/impl/ShopOrderServiceImpl.java | 20 ++++++++++++---- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java index 86b3831..4a36503 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java @@ -38,6 +38,9 @@ public class ShopActiveImage implements Serializable { @Schema(description = "图片地址，多个以‘,’隔开") private String imgUrl; + @Schema(description = "分享底图") + private String shareImg; + @Schema(description = "图片地址集合") @TableField(exist = false) private List imgUrlList; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index bb6de33..6ba76a0 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -335,6 +335,10 @@ public class ShopOrder implements Serializable { @Schema(description = "核销人") private Integer verifyUser; + @Schema(description = "核销人") + @TableField(exist = false) + private String verifyUserName; + @Schema(description = "推广核销佣金") private BigDecimal verifyMoney; diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java index f1eef56..f47df2a 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java @@ -35,6 +35,9 @@ public class ShopActiveImageParam extends BaseParam { @Schema(description = "图片地址") private String imgUrl; + @Schema(description = "分享底图") + private String shareImg; + @Schema(description = "启用状态 0-启用 1-禁用") @QueryField(type = QueryType.EQ) private Integer status; diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java index d3471f1..f98f086 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java @@ -2,19 +2,19 @@ package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; import com.gxwebsoft.shop.entity.ShopOrder; +import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; import com.gxwebsoft.shop.mapper.ShopOrderGoodsMapper; import com.gxwebsoft.shop.mapper.ShopOrderMapper; -import com.gxwebsoft.shop.service.ShopOrderGoodsService; -import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.param.ShopOrderGoodsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.service.ShopOrderGoodsService; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; import java.util.List; @@ -54,15 +54,14 @@ public class ShopOrderGoodsServiceImpl extends ServiceImpl { - shopOrderGoods.setVerifyCode(order.getVerifyCode()); - if(finalSaleActivity != null){ - if(shopOrderGoods.getGoodsId().equals(finalSaleActivity.getGoodsId())){ - shopOrderGoods.setActiveNam(finalSaleActivity.getName()); + for(ShopOrderGoods orderGoods : list){ + orderGoods.setVerifyCode(order.getVerifyCode()); + if(saleActivity != null){ + if(orderGoods.getGoodsId().equals(saleActivity.getGoodsId())){ + orderGoods.setActiveNam(saleActivity.getName()); } } - }); + } } } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index cc24fed..82f5440 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -358,11 +358,23 @@ public class ShopOrderServiceImpl extends ServiceImpl Date: Wed, 20 May 2026 16:54:57 +0800 Subject: [PATCH 55/60] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=91=98=E6=8E=A8=E5=B9=BF=E6=A0=B8=E9=94=80=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopDealerUserController.java | 7 +++++++ .../gxwebsoft/shop/entity/ShopDealerUser.java | 17 +++++++++++++---- .../shop/service/ShopDealerUserService.java | 7 +++++++ .../impl/ShopDealerUserServiceImpl.java | 19 +++++++++++++++++++ .../service/impl/ShopOrderServiceImpl.java | 4 ++-- 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java index fd4a688..cbbbdb1 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java @@ -79,6 +79,13 @@ public class ShopDealerUserController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('shop:shopDealerUser:update')") + @Operation(summary = "开启/关闭分销商用户核销权限") + @PutMapping("/verifyEnable") + public ApiResult verifyEnable(@RequestParam("id") Integer id) { + return success(shopDealerUserService.verifyEnable(id)); + } + @PreAuthorize("hasAuthority('shop:shopDealerUser:update')") @Operation(summary = "修改分销商用户记录表") @PutMapping() diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java index 8db36da..4272a7e 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java @@ -1,12 +1,11 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; + +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -105,6 +104,9 @@ public class ShopDealerUser implements Serializable { @Schema(description = "排序号") private Integer sortNumber; + @Schema(description = "核销权限是否开启 0-未开启 1-已开启") + private Boolean verifyFlag; + @Schema(description = "是否删除") private Integer isDelete; @@ -115,6 +117,9 @@ public class ShopDealerUser implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + @Schema(description = "更新人") + private Integer updater; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @@ -122,4 +127,8 @@ public class ShopDealerUser implements Serializable { @Schema(description = "分销商等级：0-普通用户 1-超级管理员 2-合伙人(总店) 3-合伙人(分店)") private Integer dealerLevel; + @Schema(description = "删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index 9977568..1a13058 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -67,4 +67,11 @@ public interface ShopDealerUserService extends IService { */ Boolean settlementBatch(ShopDealerSettlementDto dto); + /** + * 开启/关闭分销商用户核销权限 + * @param id + * @return + */ + Boolean verifyEnable(Integer id); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index bd64ae2..e783c1c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -420,6 +420,25 @@ public class ShopDealerUserServiceImpl extends ServiceImpl().eq(ShopDealerUser::getUserId, userId)); if(shopDealerUser == null){ diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 82f5440..ec1a344 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -441,8 +441,8 @@ public class ShopOrderServiceImpl extends ServiceImpl Date: Thu, 21 May 2026 18:14:35 +0800 Subject: [PATCH 56/60] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E9=80=81=E8=B4=B9=E5=88=86=E4=BD=A3=E8=AE=A1=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=8C=89=E7=99=BE=E5=88=86=E6=AF=94/?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=202?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E8=87=AA=E6=8F=90=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=203=E3=80=81=E5=A2=9E=E5=8A=A0=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=8E=A8=E5=B9=BF=E6=8C=87=E5=AE=9A=E4=BA=BA?= =?UTF-8?q?=E5=88=86=E4=BD=A3=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ShopDealerCapitalUpdateEnum.java | 1 + .../impl/GltTicketOrderServiceImpl.java | 17 ++- .../shop/controller/ShopOrderController.java | 9 ++ .../com/gxwebsoft/shop/entity/ShopGoods.java | 6 ++ .../com/gxwebsoft/shop/entity/ShopOrder.java | 6 ++ .../shop/mapper/ShopOrderMapper.java | 12 +++ .../shop/mapper/xml/ShopOrderMapper.xml | 36 ++++++- .../shop/service/ShopOrderService.java | 8 ++ .../impl/ShopDealerUserServiceImpl.java | 4 +- .../service/impl/ShopOrderServiceImpl.java | 100 ++++++++++++++++-- 10 files changed, 185 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java index ff261fb..94c2734 100644 --- a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java +++ b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java @@ -15,6 +15,7 @@ public enum ShopDealerCapitalUpdateEnum { MANAGEMENT_INCOME(11, "团队管理津贴收入", true), DIVIDEND_INCOME(12, "分红收入", true), PROMOTION_INCOME(13, "现场推广收入", true), + PROMOTION_PARENT_INCOME(14, "现场推广分佣", true), WITHDRAW_PAYMENT(20, "提现支出", false), TRANSFER_PAYMENT(30, "转账支出", false), TRANSFER_INCOME(40, "转账收入", true), diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 18898fc..4ffde38 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -691,7 +691,8 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0) { //配送提成 + if (qty > 0) { //配送提成(每桶0.1) BigDecimal money = RIDER_UNIT_COMMISSION .multiply(BigDecimal.valueOf(qty)) .setScale(RIDER_COMMISSION_SCALE, RoundingMode.HALF_UP); @@ -796,13 +797,19 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0){ + Integer commissionType = shopGood.getCommissionType(); + BigDecimal money = BigDecimal.ZERO; + if(commissionType == 10){ //按金额 + money = shopGood.getDeliveryMoney(); + }else { //按比率 + money = order.getPayPrice().multiply(shopGood.getDeliveryMoney()).divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); + } + if(money.compareTo(BigDecimal.ZERO) > 0){ ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); reduceDto.setUserId(ticketOrder.getRiderId()); diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 15c4298..4866792 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -32,6 +32,7 @@ import com.gxwebsoft.shop.param.ShopOrderParam; import com.gxwebsoft.shop.service.*; import com.gxwebsoft.shop.service.impl.KuaiDi100Impl; import com.gxwebsoft.shop.task.OrderAutoCancelTask; +import com.gxwebsoft.shop.vo.ShopOrderMyVerifyVO; import com.wechat.pay.java.core.RSAAutoCertificateConfig; import com.wechat.pay.java.core.notification.NotificationConfig; import com.wechat.pay.java.core.notification.NotificationParser; @@ -42,6 +43,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; @@ -140,6 +142,13 @@ public class ShopOrderController extends BaseController { return success(shopOrderService.getByIdRel(id)); } +// @PreAuthorize("hasAuthority('shop:shopOrder:list')") + @Operation(summary = "我已核销订单") + @GetMapping("/myVerifyOrder") + public ApiResult myVerifyOrder(@ParameterObject ShopOrderMyVerifyDto myVerifyDto) { + return success(shopOrderService.myVerifyOrder(myVerifyDto)); + } + @Operation(summary = "添加订单【单商品添加】") @PostMapping() public ApiResult save(@RequestBody OrderCreateRequest request) { diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index 4b67efb..ac86fb3 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -109,6 +109,12 @@ public class ShopGoods implements Serializable { @Schema(description = "推广核验佣金比率") private BigDecimal verifyRate; + @Schema(description = "推广核验上级/指定人") + private Integer verifyParentUserId; + + @Schema(description = "推广核验上级佣金比率/指定分佣") + private BigDecimal verifyParentRate; + @Schema(description = "库存计算方式(10下单减库存 20付款减库存)") @JsonAlias({"cdeductStockType"}) private Integer deductStockType; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index 6ba76a0..67e8ffd 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -342,6 +342,12 @@ public class ShopOrder implements Serializable { @Schema(description = "推广核销佣金") private BigDecimal verifyMoney; + @Schema(description = "推广核验上级/指定人") + private Integer verifyParentUser; + + @Schema(description = "推广核验上级/指定人佣金") + private BigDecimal verifyParentMoney; + @Schema(description = "门店、服务商结算标识 0-未结算 1-已结算") private Integer teamSettlementFlag; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java index b905d29..f7a54f8 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java @@ -3,9 +3,12 @@ package com.gxwebsoft.shop.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gxwebsoft.shop.dto.ShopOrderMyVerifyDto; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.param.ShopOrderParam; import com.gxwebsoft.shop.vo.ShopOrderGoodsVO; +import com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -67,4 +70,13 @@ public interface ShopOrderMapper extends BaseMapper { * @return */ List getOrderGoodsInfo(@Param("orderNo") String orderNo); + + /** + * 查询我的核销订单数据 + * @param page + * @param entity + * @return + */ + IPage getMyVerifyPageInfo(@Param("page") Page page, @Param("entity") ShopOrderMyVerifyDto entity); + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index bca22cf..f191dd9 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -342,8 +342,40 @@ AND c.is_open_commission = 1 AND a.order_no = #{orderNo} - - + + UPDATE shop_order diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java index e7df2db..a9cd060 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java @@ -2,10 +2,12 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.dto.ShopOrderMyVerifyDto; import com.gxwebsoft.shop.dto.UserOrderStats; import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.param.ShopOrderParam; +import com.gxwebsoft.shop.vo.ShopOrderMyVerifyVO; import java.math.BigDecimal; import java.util.HashMap; @@ -43,6 +45,12 @@ public interface ShopOrderService extends IService { */ ShopOrder getByIdRel(Integer orderId); + /** + * 我已核销订单 + * @return + */ + ShopOrderMyVerifyVO myVerifyOrder(ShopOrderMyVerifyDto myVerifyDto); + HashMap createWxOrder(ShopOrder shopOrder); ShopOrder getByOutTradeNo(String outTradeNo); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index e783c1c..6ccdcc0 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -117,6 +117,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl pageInfo = baseMapper.getMyVerifyPageInfo(new Page<>(entity.getPage(), entity.getLimit()), entity); + myVerifyVO.setCount(Math.toIntExact(pageInfo.getTotal())); + if(CollectionUtils.isNotEmpty(pageInfo.getRecords())){ + List totalOrderList = pageInfo.getRecords(); + + //统计总订单数据 + int totalGoodsNum = totalOrderList.stream().mapToInt(ShopOrderMyVerifyItemVO::getTotalNum).sum(); + BigDecimal totalMoney = totalOrderList.stream().map(ShopOrderMyVerifyItemVO::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add); + myVerifyVO.setTotalOrderNum(totalOrderList.size()); + myVerifyVO.setTotalGoodsNum(totalGoodsNum); + myVerifyVO.setTotalMoney(totalMoney); + + //统计当月数据 + List currentMonthList = totalOrderList.stream().filter(item -> item.getCreateTime().getYear() == LocalDateTime.now().getYear() + && item.getCreateTime().getMonthValue() == LocalDateTime.now().getMonthValue()).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(currentMonthList)){ + int monthGoodsNum = currentMonthList.stream().mapToInt(ShopOrderMyVerifyItemVO::getTotalNum).sum(); + BigDecimal monthMoney = currentMonthList.stream().map(ShopOrderMyVerifyItemVO::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add); + myVerifyVO.setMonthOrderNum(currentMonthList.size()); + myVerifyVO.setMonthGoodsNum(monthGoodsNum); + myVerifyVO.setMonthMoney(monthMoney); + } + + //统计快核订单 + List liveOrderList = totalOrderList.stream().filter(item -> item.getVerifyMoney().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(liveOrderList)){ + int liveGoodsNum = liveOrderList.stream().mapToInt(ShopOrderMyVerifyItemVO::getTotalNum).sum(); + BigDecimal liveMoney = liveOrderList.stream().map(ShopOrderMyVerifyItemVO::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add); + myVerifyVO.setLiveOrderNum(liveOrderList.size()); + myVerifyVO.setLiveGoodsNum(liveGoodsNum); + myVerifyVO.setLiveMoney(liveMoney); + } + + myVerifyVO.setItemVOList(totalOrderList); + } + return myVerifyVO; + } + @Override public com.gxwebsoft.shop.dto.UserOrderStats getUserOrderStats(Integer userId, Integer tenantId, Integer type) { if (userId == null) { @@ -470,9 +524,16 @@ public class ShopOrderServiceImpl extends ServiceImpl orderGoodsList = shopOrderGoodsService.getListByOrderId(shopOrder.getOrderId()); if(CollectionUtils.isNotEmpty(orderGoodsList)){ @@ -481,20 +542,32 @@ public class ShopOrderServiceImpl extends ServiceImpl verifyMoney = new AtomicReference<>(BigDecimal.ZERO); + AtomicReference verifyParentMoney = new AtomicReference<>(BigDecimal.ZERO); orderGoodsList.forEach(orderGoods -> { ShopGoods shopGood = shopGoods.stream().filter(goods -> orderGoods.getGoodsId().equals(goods.getGoodsId()) && goods.getVerifyRate().compareTo(BigDecimal.ZERO) > 0).findFirst().orElse(null); if (shopGood != null) { - // 计算单商品核价金额 BigDecimal money = orderGoods.getPrice() .multiply(BigDecimal.valueOf(orderGoods.getTotalNum())) .multiply(shopGood.getVerifyRate()) + .multiply(rate) .divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); // 除100，保留2位小数 - - // ✅ 原子更新（关键！） verifyMoney.set(verifyMoney.get().add(money)); + + //存在推广核验上级/指定人 + if(shopGood.getVerifyParentUserId() != null && shopGood.getVerifyParentRate().compareTo(BigDecimal.ZERO) > 0){ + BigDecimal parentMoney = orderGoods.getPrice() + .multiply(BigDecimal.valueOf(orderGoods.getTotalNum())) + .multiply(shopGood.getVerifyParentRate()) + .multiply(rate) + .divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); // 除100，保留2位小数 + verifyParentMoney.set(verifyParentMoney.get().add(parentMoney)); + + shopOrder.setVerifyParentUser(shopGood.getVerifyParentUserId()); + shopOrder.setVerifyParentMoney(verifyMoney.get()); + } } }); shopOrder.setVerifyMoney(verifyMoney.get()); @@ -513,12 +586,27 @@ public class ShopOrderServiceImpl extends ServiceImpl 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(shopOrder.getVerifyParentUser()); + reduceDto.setOrderUserId(shopOrder.getUserId()); + reduceDto.setOrderNo(shopOrder.getOrderNo()); + reduceDto.setPrice(verifyParentMoney.get()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.PROMOTION_PARENT_INCOME); + + Boolean reduceBalance = shopDealerUserService.reduceBalance(reduceDto); + if(!reduceBalance){ + log.error("推广指定人核销失败，结算推广佣金失败：" + reduceDto); + } } } } - //8.判断是否自提订单，如是自提订单需调整为订单完成，用户已收货状态 + //9.判断是否自提订单，如是自提订单需调整为订单完成，用户已收货状态 if(shopOrder.getOrderType() != null && shopOrder.getOrderType() == 2){ shopOrder.setOrderStatus(1); shopOrder.setDeliveryStatus(20); From ba3748d2f9e851a27dcff8c3f5fe830748c1f4d2 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Mon, 25 May 2026 18:08:47 +0800 Subject: [PATCH 57/60] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E5=95=86=E5=93=81=E9=85=8D=E9=80=81=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E5=8D=95=E5=8A=9F=E8=83=BD=203=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=B8=E9=94=80=E5=91=98=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=204=E3=80=81=E5=BC=80=E5=8F=91=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=91=98=E8=BD=AC=E5=8D=95=E5=8A=9F=E8=83=BD=205=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=81=E6=B0=B4=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=9A=E5=8A=A1=206=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E9=85=8D=E9=80=81=E5=B8=88=E5=82=85=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=207=E3=80=81=E5=A2=9E=E5=8A=A0=E6=99=AE=E9=80=9A=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=B8=8B=E5=8D=95=E9=85=8D=E9=80=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=AD=A5=E6=A2=AF=E8=B4=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/MybatisPlusConfig.java | 1 + .../common/system/mapper/UserMapper.java | 7 + .../common/system/mapper/xml/UserMapper.xml | 17 ++ .../controller/GltTicketOrderController.java | 11 +- .../glt/dto/GltTransferOrderDto.java | 25 +++ .../glt/mapper/xml/GltTicketOrderMapper.xml | 4 +- .../glt/service/GltTicketIssueService.java | 12 +- .../glt/service/GltTicketOrderService.java | 14 ++ .../impl/GltSubscribeMessageServiceImpl.java | 6 +- .../impl/GltTicketOrderServiceImpl.java | 90 ++++++++++- .../ShopGoodsCategoryController.java | 1 - .../controller/ShopVerifyUserController.java | 96 +++++++++++ .../shop/dto/OrderCreateRequest.java | 6 + .../shop/dto/ShopOrderMyVerifyDto.java | 27 ++++ .../com/gxwebsoft/shop/entity/ShopGoods.java | 12 +- .../shop/entity/ShopGoodsCategory.java | 10 +- .../com/gxwebsoft/shop/entity/ShopOrder.java | 11 +- .../shop/entity/ShopSurchargeConfig.java | 3 + .../gxwebsoft/shop/entity/ShopVerifyUser.java | 58 +++++++ .../shop/mapper/ShopVerifyUserMapper.java | 37 +++++ .../shop/mapper/xml/ShopVerifyUserMapper.xml | 57 +++++++ .../shop/param/ShopVerifyUserParam.java | 52 ++++++ .../shop/service/OrderBusinessService.java | 66 ++++---- .../shop/service/ShopVerifyUserService.java | 63 ++++++++ .../ShopFlashSaleActivityServiceImpl.java | 9 +- .../service/impl/ShopGoodsServiceImpl.java | 24 ++- .../service/impl/ShopOrderServiceImpl.java | 11 +- .../impl/ShopVerifyUserServiceImpl.java | 151 ++++++++++++++++++ .../shop/vo/ShopOrderMyVerifyItemVO.java | 70 ++++++++ .../shop/vo/ShopOrderMyVerifyVO.java | 52 ++++++ src/main/resources/application-dev.yml | 4 +- src/main/resources/application-local.yml | 5 +- 32 files changed, 940 insertions(+), 72 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/glt/dto/GltTransferOrderDto.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java create mode 100644 src/main/java/com/gxwebsoft/shop/dto/ShopOrderMyVerifyDto.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/ShopVerifyUserMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/ShopVerifyUserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/ShopVerifyUserParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyItemVO.java create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyVO.java diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index 9018256..e8e7a91 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -80,6 +80,7 @@ public class MybatisPlusConfig { @Override public boolean ignoreTable(String tableName) { + TenantContext.setIgnoreTenant(Boolean.TRUE); // 如果当前上下文设置了忽略租户隔离，则忽略所有表的租户隔离 if (TenantContext.isIgnoreTenant()) { return true; diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java index 99a32c6..47f9746 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java @@ -70,4 +70,11 @@ public interface UserMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "true") List listByAlert(); + + /** + * 批量查询用户信息 + * @param userIdList 用户ID集合 + * @return + */ + List selectByUserIdList(@Param("userIdList") List userIdList); } diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml index 4196c93..d9a1921 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -263,5 +263,22 @@ + diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java index f928a07..e2b1e54 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java @@ -9,6 +9,7 @@ import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.glt.dto.GltTransferOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.param.GltTicketOrderDeliveredParam; import com.gxwebsoft.glt.param.GltTicketOrderParam; @@ -23,6 +24,7 @@ import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -56,7 +58,7 @@ public class GltTicketOrderController extends BaseController { @Operation(summary = "分页查询送水订单") @GetMapping("/page") - public ApiResult> page(GltTicketOrderParam param) { + public ApiResult> page(@ParameterObject GltTicketOrderParam param) { // 使用关联查询 return success(gltTicketOrderService.pageRel(param)); } @@ -260,6 +262,13 @@ public class GltTicketOrderController extends BaseController { return success("接单成功"); } + @PreAuthorize("isAuthenticated()") + @Operation(summary = "配送员转单") + @PostMapping("/transferOrder") + public ApiResult transferOrder(@RequestBody GltTransferOrderDto orderDto) { + return success(gltTicketOrderService.transferOrder(orderDto)); + } + @PreAuthorize("isAuthenticated()") @Operation(summary = "配送员开始配送") @PostMapping("/{id}/start") diff --git a/src/main/java/com/gxwebsoft/glt/dto/GltTransferOrderDto.java b/src/main/java/com/gxwebsoft/glt/dto/GltTransferOrderDto.java new file mode 100644 index 0000000..b653b98 --- /dev/null +++ b/src/main/java/com/gxwebsoft/glt/dto/GltTransferOrderDto.java @@ -0,0 +1,25 @@ +package com.gxwebsoft.glt.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 转单请求类 + * + */ +@Data +@Schema(name = "ShopOrderMyVerifyDto", description = "转单请求类") +public class GltTransferOrderDto { + + @Schema(description = "订单ID") + @NotEmpty(message = "订单ID不能为空！") + private Integer id; + + @Schema(description = "转单用户ID") + @NotEmpty(message = "转单用户ID不能为空！") + private Integer userId; + +} + diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml index 8fa4c3c..396237f 100644 --- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml @@ -11,7 +11,7 @@ d.name as receiverName, d.phone as receiverPhone, d.province as receiverProvince, d.city as receiverCity, d.region as receiverRegion, d.address as receiverAddress, d.full_address as receiverFullAddress, d.lat as receiverLat, d.lng as receiverLng, - COALESCE(o.order_no, f.order_no) as orderNo, o.order_status as orderStatus + COALESCE(o.order_no, a.order_no) as orderNo, o.order_status as orderStatus FROM glt_ticket_order a LEFT JOIN shop_store b ON a.store_id = b.id LEFT JOIN shop_store_warehouse w ON a.warehouse_id = w.id @@ -88,7 +88,7 @@ AND a.create_time <= #{param.createTimeEnd} - AND (a.id = #{param.orderNo} OR COALESCE(o.order_no, f.order_no) = #{param.orderNo}) + AND (a.id = #{param.orderNo} OR COALESCE(o.order_no, a.order_no) = #{param.orderNo}) AND u.phone = #{param.phone} diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index f4358ec..247f7ab 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -1,10 +1,7 @@ package com.gxwebsoft.glt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.glt.entity.GltTicketTemplate; -import com.gxwebsoft.glt.entity.GltUserTicket; -import com.gxwebsoft.glt.entity.GltUserTicketLog; -import com.gxwebsoft.glt.entity.GltUserTicketRelease; +import com.gxwebsoft.glt.entity.*; import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.entity.ShopOrderGoods; @@ -18,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; +import javax.annotation.Resource; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -37,6 +35,9 @@ import java.util.concurrent.atomic.AtomicBoolean; @RequiredArgsConstructor public class GltTicketIssueService { + @Resource + private GltTicketOrderService gltTicketOrderService; + public static final int CHANGE_TYPE_ISSUE = 10; private enum IssueOutcome { @@ -144,6 +145,9 @@ public class GltTicketIssueService { //3.执行平台分红业务 TODO 待开发 + //4.普通商品【非水票订单】如果是需要自配送的，则会同步生成派单信息 + gltTicketOrderService.dispatchOrder(orderNo, tenantId); + } /** diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java index 9f3fc81..d5ba7f8 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java @@ -2,6 +2,7 @@ package com.gxwebsoft.glt.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.glt.dto.GltTransferOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.param.GltTicketOrderParam; @@ -64,6 +65,13 @@ public interface GltTicketOrderService extends IService { */ void accept(Integer id, Integer riderId, Integer tenantId); + /** + * 配送员转单 + * @param orderDto + * @return + */ + Boolean transferOrder(GltTransferOrderDto orderDto); + /** * 指派/接单成功后，同步关联商城订单发货状态为“已发货”(deliveryStatus=20)。 * @@ -106,4 +114,10 @@ public interface GltTicketOrderService extends IService { */ int autoConfirmTimeout(Integer tenantId, LocalDateTime now, int timeoutHours, int batchSize); + /** + * 派送订单调度 + * @return + */ + Boolean dispatchOrder(String orderNo, Integer tenantId); + } diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java index 76e8314..563cf72 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java @@ -43,7 +43,7 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic * 模板名称：订单配送通知 * 关键词：订单编号、订单内容、配送地址、订单金额 */ - private static final String SUBSCRIBE_TEMPLATE_ID = "YOUR_TEMPLATE_ID"; // TODO: 替换为实际模板ID + private static final String ORDER_DELIVERY_ID = "vSMSqGVy3aG1RuzQUZlk2y5sWiTFY_hewF5-R-uYwMk"; /** * 发送新订单通知给配送员 @@ -196,8 +196,8 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic Map params = new HashMap<>(); params.put("touser", openId); // 用户 openid - params.put("template_id", SUBSCRIBE_TEMPLATE_ID); // 模板ID - params.put("page", "pages/rider/orders/index"); // 点击后跳转的页面 + params.put("template_id", ORDER_DELIVERY_ID); // 模板ID +// params.put("page", "pages/rider/orders/index"); // 点击后跳转的页面 params.put("data", data); String response = HttpUtil.createPost(url) diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 4ffde38..99ff31f 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.gxwebsoft.glt.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -7,11 +8,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; +import com.gxwebsoft.common.core.utils.LoginUserUtil; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; import com.gxwebsoft.common.system.redis.OrderNoUtils; +import com.gxwebsoft.glt.dto.GltTransferOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; @@ -24,6 +28,7 @@ import com.gxwebsoft.glt.service.GltUserTicketService; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.ShopGoodsMapper; +import com.gxwebsoft.shop.mapper.ShopStoreRiderMapper; import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.service.ShopDealerUserService; @@ -31,18 +36,20 @@ import com.gxwebsoft.shop.service.ShopOrderGoodsService; import com.gxwebsoft.shop.service.ShopOrderService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -97,10 +104,16 @@ public class GltTicketOrderServiceImpl extends ServiceImpl pageRel(GltTicketOrderParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); + page.setDefaultOrder("create_time desc"); List list = baseMapper.selectPageRel(page, param); if(CollectionUtils.isNotEmpty(list)){ List addressIdList = list.stream().map(GltTicketOrder::getAddressId).distinct().collect(Collectors.toList()); @@ -199,8 +212,13 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0; + }else { + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + } + @Override public void markShopOrderShippedAfterRiderAssigned(Integer ticketOrderId, Integer tenantId, Integer riderId) { updateShopOrderDeliveryStatusAfterAccept(ticketOrderId, tenantId, riderId, LocalDateTime.now()); @@ -685,6 +724,49 @@ public class GltTicketOrderServiceImpl extends ServiceImpl shopStoreRiders = shopStoreRiderMapper.selectList(new LambdaQueryWrapper().select(ShopStoreRider::getUserId).in(ShopStoreRider::getWorkStatus, Arrays.asList(1, 2))); + if(CollectionUtils.isNotEmpty(shopStoreRiders)){ + List riderIdList = shopStoreRiders.stream().map(ShopStoreRider::getUserId).distinct().collect(Collectors.toList()); + int i = index.getAndIncrement() % riderIdList.size(); + return riderIdList.get(i); + } + return null; + } + /** * 更新送水订单为已完成状态 * @param ticketOrderId diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsCategoryController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsCategoryController.java index 49077a7..e9059a4 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsCategoryController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsCategoryController.java @@ -6,7 +6,6 @@ import com.gxwebsoft.shop.entity.ShopGoodsCategory; import com.gxwebsoft.shop.param.ShopGoodsCategoryParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.system.entity.User; diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java new file mode 100644 index 0000000..b157adf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java @@ -0,0 +1,96 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopVerifyUser; +import com.gxwebsoft.shop.param.ShopVerifyUserParam; +import com.gxwebsoft.shop.service.ShopVerifyUserService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 订单核销人管理控制器 + * + * @author xm + * @since 2026-05-25 17:13:01 + */ +@Tag(name = "订单核销人管理管理") +@RestController +@RequestMapping("/api/shop/shop-verify-user") +public class ShopVerifyUserController extends BaseController { + @Resource + private ShopVerifyUserService shopVerifyUserService; + +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')") + @Operation(summary = "分页查询订单核销人管理") + @GetMapping("/page") + public ApiResult> page(ShopVerifyUserParam param) { + // 使用关联查询 + return success(shopVerifyUserService.pageRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')") + @Operation(summary = "查询全部订单核销人管理") + @GetMapping() + public ApiResult> list(ShopVerifyUserParam param) { + // 使用关联查询 + return success(shopVerifyUserService.listRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')") + @Operation(summary = "根据id查询订单核销人管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(shopVerifyUserService.getByIdRel(id)); + } + +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:save')") + @OperationLog + @Operation(summary = "添加订单核销人管理") + @PostMapping() + public ApiResult save(@RequestBody ShopVerifyUser shopVerifyUser) { + return success(shopVerifyUserService.saveInfo(shopVerifyUser)); + } + +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:update')") + @Operation(summary = "修改订单核销人管理") + @PutMapping() + public ApiResult update(@RequestBody ShopVerifyUser shopVerifyUser) { + if (shopVerifyUserService.updateById(shopVerifyUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @Operation(summary = "修改订单核销人开启状态") + @PutMapping("/updateStatus") + public ApiResult updateStatus(@RequestParam("id") Integer id) { + return success(shopVerifyUserService.updateStatus(id)); + } + + @Operation(summary = "修改订单核销人核销权限") + @PutMapping("/updateVerifyFlag") + public ApiResult updateVerifyFlag(@RequestParam("id") Integer id) { + return success(shopVerifyUserService.updateVerifyFlag(id)); + } + +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:remove')") + @OperationLog + @Operation(summary = "删除订单核销人管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (shopVerifyUserService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + +} diff --git a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java index 3cef01d..4d5164a 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java +++ b/src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java @@ -91,6 +91,12 @@ public class OrderCreateRequest { @Schema(description = "发货店铺") private String expressMerchantName; + @Schema(description = "配送方式 0-电梯 1-步梯") + private Integer deliveryMethod; + + @Schema(description = "楼层") + private Integer deliveryFloor; + @Schema(description = "订单总额") @NotNull(message = "订单总额不能为空") @DecimalMin(value = "0.01", message = "订单总额必须大于0") diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopOrderMyVerifyDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopOrderMyVerifyDto.java new file mode 100644 index 0000000..39bffd8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopOrderMyVerifyDto.java @@ -0,0 +1,27 @@ +package com.gxwebsoft.shop.dto; + +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 查询个人核销记录 + * + */ +@Data +@Schema(name = "ShopOrderMyVerifyDto", description = "查询个人核销记录") +public class ShopOrderMyVerifyDto extends BaseParam { + + @Schema(description = "用户ID") + private Integer userId; + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "开始时间【核销时间】", example = "2026-05-20") + private String dateStart; + + @Schema(description = "结束时间【核销时间】", example = "2026-05-25") + private String dateEnd; +} + diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index ac86fb3..7c4c11d 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -9,6 +9,8 @@ import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; +import java.util.List; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -179,17 +181,21 @@ public class ShopGoods implements Serializable { @Schema(description = "用户ID") private Integer userId; - @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开") + @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 5-水票 多属性用','隔开") private String deliveryType; + @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 5-水票 多属性用','隔开") + @TableField(exist = false) + private List deliveryTypeList; + @Schema(description = "水票标识 0-否 1-是") private Integer waterTicketFlag; @Schema(description = "水票ID") private Integer waterTickerId; - @Schema(description = "商品大类 1-水 2-茶叶 3-酒 4-香水") - private Integer categoryType; + @Schema(description = "配送楼层步梯费（元）") + private BigDecimal deliveryFee; @Schema(description = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsCategory.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsCategory.java index 6b902cd..ba05f0a 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsCategory.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsCategory.java @@ -2,15 +2,16 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** * 商品分类 * @@ -20,6 +21,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "ShopGoodsCategory对象", description = "商品分类") +@TableName("shop_goods_category") public class ShopGoodsCategory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index 67e8ffd..ce23b1c 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -33,7 +33,7 @@ public class ShopOrder implements Serializable { @TableId(value = "order_id", type = IdType.AUTO) private Integer orderId; - @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递") + @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递 5-水票 6-(配送：自配送/快递)") private Integer orderType; @Schema(description = "订单编号") @@ -354,6 +354,15 @@ public class ShopOrder implements Serializable { @Schema(description = "分红结算标识 0-未结算 1-已结算") private Integer dividendSettlementFlag; + @Schema(description = "配送方式 0-电梯 1-步梯") + private Integer deliveryMethod; + + @Schema(description = "楼层") + private Integer deliveryFloor; + + @Schema(description = "配送费(步梯配送特有)") + private BigDecimal deliveryFee; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java b/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java index 79ff296..cdf9f85 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java @@ -32,6 +32,9 @@ public class ShopSurchargeConfig implements Serializable { @Schema(description = "名称") private String name; + @Schema(description = "商品ID") + private Integer goodsId; + @Schema(description = "价格（元）") private BigDecimal price; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java new file mode 100644 index 0000000..2440f00 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java @@ -0,0 +1,58 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDateTime; +import java.io.Serializable; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 订单核销人管理 + * + * @author xm + * @since 2026-05-25 17:13:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(name = "ShopVerifyUser对象", description = "订单核销人管理") +@TableName("shop_verify_user") +public class ShopVerifyUser implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @Schema(description = "用户ID") + private Integer userId; + + @Schema(description = "用户名称") + @TableField(exist = false) + private String userName; + + @Schema(description = "核销权限是否开启 0-未开启 1-已开启") + private Boolean verifyFlag; + + @Schema(description = "是否开启 0-未开始 1-已开启") + private Boolean status; + + @Schema(description = "创建人") + private Integer creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新人") + private Integer updater; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "是否删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopVerifyUserMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopVerifyUserMapper.java new file mode 100644 index 0000000..4144e63 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopVerifyUserMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.ShopVerifyUser; +import com.gxwebsoft.shop.param.ShopVerifyUserParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 订单核销人管理Mapper + * + * @author xm + * @since 2026-05-25 17:13:00 + */ +public interface ShopVerifyUserMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ShopVerifyUserParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ShopVerifyUserParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopVerifyUserMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopVerifyUserMapper.xml new file mode 100644 index 0000000..61b545a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopVerifyUserMapper.xml @@ -0,0 +1,57 @@ + + + + + + + SELECT a.* + FROM shop_verify_user a + + + AND a.id = #{param.id} + + + AND a.user_id = #{param.userId} + + + AND a.verify_flag = #{param.verifyFlag} + + + AND a.status = #{param.status} + + + AND a.creator = #{param.creator} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.updater = #{param.updater} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopVerifyUserParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopVerifyUserParam.java new file mode 100644 index 0000000..dd6ef77 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/ShopVerifyUserParam.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.shop.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 订单核销人管理查询参数 + * + * @author xm + * @since 2026-05-25 17:13:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@Schema(name = "ShopVerifyUserParam对象", description = "订单核销人管理查询参数") +public class ShopVerifyUserParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @Schema(description = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @Schema(description = "核销权限是否开启 0-未开启 1-已开启") + @QueryField(type = QueryType.EQ) + private Integer verifyFlag; + + @Schema(description = "是否开启 0-未开始 1-已开启") + @QueryField(type = QueryType.EQ) + private Integer status; + + @Schema(description = "创建人") + @QueryField(type = QueryType.EQ) + private Integer creator; + + @Schema(description = "更新人") + @QueryField(type = QueryType.EQ) + private Integer updater; + + @Schema(description = "是否删除 0-未删 1-已删") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java index 7ac1629..82bcc03 100644 --- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java +++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java @@ -23,6 +23,7 @@ import java.math.RoundingMode; import java.security.SecureRandom; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -134,18 +135,6 @@ public class OrderBusinessService { throw new BusinessException("用户未登录"); } - // 检查是否为测试账号 - boolean isTestAccount = orderConfig.isTestAccount(loginUser.getPhone()); - - if (isTestAccount) { - // 测试账号：直接使用测试金额，跳过金额验证 - BigDecimal testAmount = orderConfig.getTestAccount().getTestPayAmount(); - request.setTotalPrice(testAmount); - log.info("测试账号订单，用户：{}，使用测试金额：{}", loginUser.getPhone(), testAmount); - return; // 测试账号跳过后续验证 - } - - // 非测试账号：正常验证流程 // 验证商品信息并计算总金额 BigDecimal calculatedTotal = validateAndCalculateTotal(request); @@ -157,7 +146,6 @@ public class OrderBusinessService { if (request.getTotalPrice() != null && request.getTotalPrice().subtract(calculatedTotal).abs().compareTo(new BigDecimal("0.01")) > 0) { log.warn("订单金额计算不一致，前端传入：{}，后台计算：{}", request.getTotalPrice(), calculatedTotal); -// throw new BusinessException("订单金额计算错误，请刷新重试"); } // 使用后台计算的金额 @@ -328,23 +316,6 @@ public class OrderBusinessService { shopOrder.setComments(orderConfig.getDefaultConfig().getDefaultComments()); } - // 设置价格相关字段（解决数据库字段没有默认值的问题） - if (shopOrder.getPayPrice() == null) { - shopOrder.setPayPrice(shopOrder.getTotalPrice()); // 实际付款默认等于订单总额 - } - - if (shopOrder.getPrice() == null) { - shopOrder.setPrice(shopOrder.getTotalPrice()); // 用于统计的价格默认等于订单总额 - } - - if (shopOrder.getReducePrice() == null) { - shopOrder.setReducePrice(BigDecimal.ZERO); // 减少金额默认为0 - } - - if (shopOrder.getMoney() == null) { - shopOrder.setMoney(shopOrder.getTotalPrice()); // 用于积分赠送的价格默认等于订单总额 - } - // 设置默认状态 shopOrder.setPayStatus(false); // 未付款 shopOrder.setOrderStatus(0); // 未使用 @@ -378,6 +349,16 @@ public class OrderBusinessService { shopOrder.setWaterTicketFlag(0); } + //自配送才计算步梯费用业务【选择步梯配送方式、配送楼层大于1楼、商品已设置配送费】 + if(Arrays.asList(1, 3).contains(shopOrder.getOrderType()) && shopOrder.getDeliveryMethod() == 1 && shopOrder.getDeliveryFloor() > 1 + && shopGoods.getDeliveryFee().compareTo(BigDecimal.ZERO) > 0){ + BigDecimal deliveryFee = BigDecimal.valueOf(shopOrder.getDeliveryFloor() - 1).multiply(shopGoods.getDeliveryFee()).multiply(BigDecimal.valueOf(goodsItem.getQuantity())); + if(deliveryFee.compareTo(BigDecimal.ZERO) > 0){ + shopOrder.setDeliveryFee(deliveryFee); + shopOrder.setTotalPrice(shopOrder.getTotalPrice().add(deliveryFee)); + } + } + //单一配送方式商品如用户没选择配送方式按商品默认配送属性设定订单类型 String deliveryType = shopGoods.getDeliveryType(); if(orderType == null && StrUtil.isNotBlank(deliveryType) && !deliveryType.contains(",")){ @@ -396,14 +377,31 @@ public class OrderBusinessService { break; } default:{ - orderType = 1; + orderType = 5; } } } } } - shopOrder.setOrderType(orderType); + // 设置价格相关字段（解决数据库字段没有默认值的问题） + if (shopOrder.getPayPrice() == null) { + shopOrder.setPayPrice(shopOrder.getTotalPrice()); // 实际付款默认等于订单总额 + } + + if (shopOrder.getPrice() == null) { + shopOrder.setPrice(shopOrder.getTotalPrice()); // 用于统计的价格默认等于订单总额 + } + + if (shopOrder.getReducePrice() == null) { + shopOrder.setReducePrice(BigDecimal.ZERO); // 减少金额默认为0 + } + + if (shopOrder.getMoney() == null) { + shopOrder.setMoney(shopOrder.getTotalPrice()); // 用于积分赠送的价格默认等于订单总额 + } + + shopOrder.setOrderType(orderType); return shopOrder; } @@ -667,8 +665,8 @@ public class OrderBusinessService { throw new BusinessException("收货地址坐标异常，请重新选择收货地址"); } - //订单类型：5-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】 - if(orderType != null && orderType == 5){ + //订单类型：6-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】 + if(orderType != null && orderType == 6){ Boolean exit = shopStoreFenceService.validatePointInEnabled(shopOrder.getTenantId(), lng, lat); if(exit){ shopOrder.setOrderType(1); diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java new file mode 100644 index 0000000..433cbd6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java @@ -0,0 +1,63 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopVerifyUser; +import com.gxwebsoft.shop.param.ShopVerifyUserParam; + +import java.util.List; + +/** + * 订单核销人管理Service + * + * @author xm + * @since 2026-05-25 17:13:00 + */ +public interface ShopVerifyUserService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ShopVerifyUserParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ShopVerifyUserParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return ShopVerifyUser + */ + ShopVerifyUser getByIdRel(Integer id); + + /** + * 修改订单核销人开启状态 + * @param id 主键ID + * @return + */ + Boolean updateStatus(Integer id); + + /** + * 修改订单核销人核销权限 + * @param id 主键ID + * @return + */ + Boolean updateVerifyFlag(Integer id); + + /** + * 保存数据 + * @param shopVerifyUser + * @return + */ + Boolean saveInfo(ShopVerifyUser shopVerifyUser); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java index 3aaa197..4863911 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java @@ -125,10 +125,11 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList()); - LambdaQueryWrapper shopOrderWrapper = new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum) - .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1)); - activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum))); - + if(CollectionUtils.isNotEmpty(activityIdList)){ + LambdaQueryWrapper shopOrderWrapper = new LambdaQueryWrapper().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum) + .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1)); + activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum))); + } activityWrapper.eq(ShopFlashSaleActivity::getDisplayType, 0); } activityWrapper.orderByAsc(ShopFlashSaleActivity::getSortNumber); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsServiceImpl.java index 4984d72..1503909 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsServiceImpl.java @@ -1,5 +1,6 @@ package com.gxwebsoft.shop.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.shop.mapper.ShopGoodsMapper; @@ -11,7 +12,9 @@ import com.gxwebsoft.common.core.web.PageResult; import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * 商品Service实现 @@ -28,6 +31,13 @@ public class ShopGoodsServiceImpl extends ServiceImpl page = new PageParam<>(param); page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); + list.forEach(shopGoods ->{ + String deliveryType = shopGoods.getDeliveryType(); + if(StrUtil.isNotBlank(deliveryType)){ + List deliveryTypeList = Arrays.stream(deliveryType.split(",")).map(Integer::parseInt).collect(Collectors.toList()); + shopGoods.setDeliveryTypeList(deliveryTypeList); + } + }); return new PageResult<>(list, page.getTotal()); } @@ -37,6 +47,13 @@ public class ShopGoodsServiceImpl extends ServiceImpl page = new PageParam<>(); page.setDefaultOrder("sort_number asc, create_time desc"); + list.forEach(shopGoods ->{ + String deliveryType = shopGoods.getDeliveryType(); + if(StrUtil.isNotBlank(deliveryType)){ + List deliveryTypeList = Arrays.stream(deliveryType.split(",")).map(Integer::parseInt).collect(Collectors.toList()); + shopGoods.setDeliveryTypeList(deliveryTypeList); + } + }); return page.sortRecords(list); } @@ -44,7 +61,12 @@ public class ShopGoodsServiceImpl extends ServiceImpl deliveryTypeList = Arrays.stream(shopGoods.getDeliveryType().split(",")).map(Integer::parseInt).collect(Collectors.toList()); + shopGoods.setDeliveryTypeList(deliveryTypeList); + } + return shopGoods; } @InterceptorIgnore(tenantLine = "true") diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index db4c93f..43e4bb1 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -28,10 +28,7 @@ import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.dto.ShopOrderMyVerifyDto; import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.*; -import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; -import com.gxwebsoft.shop.mapper.ShopGoodsMapper; -import com.gxwebsoft.shop.mapper.ShopOrderMapper; -import com.gxwebsoft.shop.mapper.ShopUserAddressMapper; +import com.gxwebsoft.shop.mapper.*; import com.gxwebsoft.shop.param.ShopOrderParam; import com.gxwebsoft.shop.service.*; import com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO; @@ -118,6 +115,8 @@ public class ShopOrderServiceImpl extends ServiceImpl().eq(ShopVerifyUser::getUserId, loginUser.getUserId())); + if(!(verifyUser != null && verifyUser.getVerifyFlag() && verifyUser.getStatus())){ throw new RuntimeException("暂无核销权限！"); } } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java new file mode 100644 index 0000000..9c6f41b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java @@ -0,0 +1,151 @@ +package com.gxwebsoft.shop.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; +import com.gxwebsoft.common.core.utils.LoginUserUtil; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.shop.mapper.ShopVerifyUserMapper; +import com.gxwebsoft.shop.service.ShopVerifyUserService; +import com.gxwebsoft.shop.entity.ShopVerifyUser; +import com.gxwebsoft.shop.param.ShopVerifyUserParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 订单核销人管理Service实现 + * + * @author xm + * @since 2026-05-25 17:00:03 + */ +@Service +@AllArgsConstructor +public class ShopVerifyUserServiceImpl extends ServiceImpl implements ShopVerifyUserService { + + private UserMapper userMapper; + + @Override + public PageResult pageRel(ShopVerifyUserParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + if(CollectionUtils.isNotEmpty(list)){ + List userIdList = list.stream().map(ShopVerifyUser::getUserId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + List userList = userMapper.selectByUserIdList(userIdList); + + for(ShopVerifyUser verifyUser : list){ + User u = userList.stream().filter(user -> verifyUser.getUserId().equals(user.getUserId())).findFirst().orElse(null); + if(u != null){ + verifyUser.setUserName(StrUtil.isNotEmpty(u.getRealName()) ? u.getRealName() : u.getNickname()); + } + } + } + } + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(ShopVerifyUserParam param) { + List list = baseMapper.selectListRel(param); + if(CollectionUtils.isNotEmpty(list)){ + List userIdList = list.stream().map(ShopVerifyUser::getUserId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + List userList = userMapper.selectByUserIdList(userIdList); + + for(ShopVerifyUser verifyUser : list){ + User u = userList.stream().filter(user -> verifyUser.getUserId().equals(user.getUserId())).findFirst().orElse(null); + if(u != null){ + verifyUser.setUserName(StrUtil.isNotEmpty(u.getRealName()) ? u.getRealName() : u.getNickname()); + } + } + } + } + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public ShopVerifyUser getByIdRel(Integer id) { + ShopVerifyUserParam param = new ShopVerifyUserParam(); + param.setId(id); + ShopVerifyUser verifyUser = param.getOne(baseMapper.selectListRel(param)); + if(verifyUser != null){ + User user = userMapper.getById(verifyUser.getUserId()); + if(user != null){ + verifyUser.setUserName(StrUtil.isNotEmpty(user.getRealName()) ? user.getRealName() : user.getNickname()); + } + } + return verifyUser; + } + + @Override + public Boolean updateStatus(Integer id) { + ShopVerifyUser verifyUser = baseMapper.selectById(id); + if(verifyUser != null){ + Boolean status = verifyUser.getStatus(); + if(status){ + verifyUser.setStatus(false); + }else { + verifyUser.setStatus(true); + } + verifyUser.setUpdateTime(LocalDateTime.now()); + User loginUser = LoginUserUtil.getLoginUser(); + verifyUser.setUpdater(loginUser != null ? loginUser.getUserId() : null); + + return baseMapper.updateById(verifyUser) > 0; + }else { + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + } + + @Override + public Boolean updateVerifyFlag(Integer id) { + ShopVerifyUser verifyUser = baseMapper.selectById(id); + if(verifyUser != null){ + Boolean verifyFlag = verifyUser.getVerifyFlag(); + if(verifyFlag){ + verifyUser.setVerifyFlag(false); + }else { + verifyUser.setVerifyFlag(true); + } + verifyUser.setUpdateTime(LocalDateTime.now()); + User loginUser = LoginUserUtil.getLoginUser(); + verifyUser.setUpdater(loginUser != null ? loginUser.getUserId() : null); + + return baseMapper.updateById(verifyUser) > 0; + }else { + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + } + + @Override + public Boolean saveInfo(ShopVerifyUser shopVerifyUser) { + Integer userId = shopVerifyUser.getUserId(); + if(userId == null){ + throw new BusinessException("用户ID必传！"); + } + + List list = lambdaQuery().eq(ShopVerifyUser::getUserId, userId).list(); + if(CollectionUtils.isNotEmpty(list)){ + throw new BusinessException("该用户已存在核销人关系!"); + } + User loginUser = LoginUserUtil.getLoginUser(); + shopVerifyUser.setCreator(loginUser != null ? loginUser.getUserId() : null); + shopVerifyUser.setCreateTime(LocalDateTime.now()); + + return baseMapper.insert(shopVerifyUser) > 0; + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyItemVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyItemVO.java new file mode 100644 index 0000000..495b481 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyItemVO.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.shop.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.Min; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 查询个人核销记录 + * + */ +@Data +@Schema(name = "ShopOrderMyVerifyDto", description = "查询个人核销记录") +public class ShopOrderMyVerifyItemVO { + + @Schema(description = "订单号") + private Integer orderId; + + @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递") + private Integer orderType; + + @Schema(description = "订单编号") + private String orderNo; + + @Schema(description = "订单总额") + private BigDecimal totalPrice; + + @Schema(description = "实际付款") + private BigDecimal payPrice; + + @Schema(description = "购买数量") + @Min(value = 1, message = "购买数量必须大于0") + private Integer totalNum; + + @Schema(description = "商品名称") + private String goodsName; + + @Schema(description = "活动名称") + private String activeName; + + @Schema(description = "支付方式：0余额支付，1微信支付，2支付宝支付，3银联支付，4现金支付，5POS机支付，6免费，7积分支付") + private Integer payType; + + @Schema(description = "0未付款，1已付款") + private Boolean payStatus; + + @Schema(description = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") + private Integer orderStatus; + + @Schema(description = "用户id") + private Integer userId; + + @Schema(description = "核销时间") + private LocalDateTime verifyTime; + + @Schema(description = "核销人") + private Integer verifyUser; + + @Schema(description = "推广核销佣金") + private BigDecimal verifyMoney; + + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + +} + diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyVO.java new file mode 100644 index 0000000..8efcab3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderMyVerifyVO.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.shop.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * 查询个人核销记录 + * + */ +@Data +@Schema(name = "ShopOrderMyVerifyDto", description = "查询个人核销记录") +public class ShopOrderMyVerifyVO { + + @Schema(description = "总核销单量") + private Integer totalOrderNum = 0; + + @Schema(description = "总核销商品数量") + private Integer totalGoodsNum = 0; + + @Schema(description = "总核销订单金额") + private BigDecimal totalMoney = BigDecimal.ZERO; + + @Schema(description = "当月核销单量") + private Integer monthOrderNum = 0; + + @Schema(description = "当月核销商品数量") + private Integer monthGoodsNum = 0; + + @Schema(description = "当月核销订单金额") + private BigDecimal monthMoney = BigDecimal.ZERO; + + @Schema(description = "促销快核订单数") + private Integer liveOrderNum = 0; + + @Schema(description = "促销快核商品数量") + private Integer liveGoodsNum = 0; + + @Schema(description = "促销快核订单金额") + private BigDecimal liveMoney = BigDecimal.ZERO; + + @Schema(description = "核验订单数据") + private List itemVOList = new ArrayList<>(); + + @Schema(description = "分页查询涉及总单量") + private Integer count = 0; + +} + diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 98793ed..c084fe3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -14,8 +14,8 @@ spring: # redis redis: database: 0 - host: 1Panel-redis-GmNr - port: 6379 + host: 8.134.55.105 + port: 16379 password: redis_t74P8C # 日志配置 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 400131d..a763a57 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -15,8 +15,9 @@ spring: redis: database: 0 - host: localhost - port: 6379 + host: 8.134.55.105 + port: 16379 + password: redis_t74P8C # 日志配置 logging: From b9d0d6b036ce2a6b6acf441cf0299755096e3c34 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 27 May 2026 10:56:55 +0800 Subject: [PATCH 58/60] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E9=85=8D?= =?UTF-8?q?=E9=80=81=E5=B8=88=E5=82=85=E8=AE=A2=E5=8D=95=E6=B4=BE=E9=80=81?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=85=8D=E5=AE=8C=E6=88=90=E9=80=81=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=AD=A5=E6=A2=AF=E8=B4=B9=E7=94=A8=E7=BB=99=E5=88=B0?= =?UTF-8?q?=E9=85=8D=E9=80=81=E5=B8=88=E5=82=85=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=203=E3=80=81=E5=A2=9E=E5=8A=A0=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=95=86=E6=9F=A5=E8=AF=A2=E4=B8=AA=E4=BA=BA=E8=B5=84=E9=87=91?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ShopDealerCapitalUpdateEnum.java | 1 + .../controller/GltTicketOrderController.java | 17 ++-- .../glt/dto/NoticeRiderNewOrderDto.java | 35 +++++++++ .../service/GltSubscribeMessageService.java | 7 ++ .../impl/GltSubscribeMessageServiceImpl.java | 45 ++++++++--- .../impl/GltTicketOrderServiceImpl.java | 77 ++++++++++++++++++- .../GltTicketOrderAutoDispatch10584Task.java | 2 +- .../ShopDealerCapitalController.java | 10 +++ .../controller/ShopVerifyUserController.java | 7 ++ .../shop/dto/ShopDealerCapitalWaterDto.java | 28 +++++++ .../shop/entity/ShopActiveImage.java | 7 ++ .../shop/entity/ShopDealerCapital.java | 2 +- .../com/gxwebsoft/shop/entity/ShopGoods.java | 3 + .../gxwebsoft/shop/entity/ShopVerifyUser.java | 7 +- .../shop/mapper/ShopDealerCapitalMapper.java | 11 +++ .../mapper/xml/ShopDealerCapitalMapper.xml | 18 +++++ .../gxwebsoft/shop/param/ShopGoodsParam.java | 4 +- .../shop/service/OrderBusinessService.java | 7 +- .../service/ShopDealerCapitalService.java | 9 +++ .../shop/service/ShopVerifyUserService.java | 7 ++ .../impl/ShopActiveImageServiceImpl.java | 17 ++++ .../impl/ShopDealerCapitalServiceImpl.java | 31 ++++++++ .../impl/ShopDealerUserServiceImpl.java | 5 +- .../impl/ShopOrderGoodsServiceImpl.java | 2 +- .../service/impl/ShopOrderServiceImpl.java | 17 ++-- .../impl/ShopVerifyUserServiceImpl.java | 27 ++++--- .../gxwebsoft/shop/task/CouponExpireTask.java | 4 +- .../shop/vo/ShopDealerCapitalWaterVO.java | 45 +++++++++++ src/main/resources/application-dev.yml | 4 +- src/main/resources/application-local.yml | 5 +- 30 files changed, 405 insertions(+), 56 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/glt/dto/NoticeRiderNewOrderDto.java create mode 100644 src/main/java/com/gxwebsoft/shop/dto/ShopDealerCapitalWaterDto.java create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopDealerCapitalWaterVO.java diff --git a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java index 94c2734..7729632 100644 --- a/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java +++ b/src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java @@ -22,6 +22,7 @@ public enum ShopDealerCapitalUpdateEnum { FREEZE_MONEY_THAW(50, "佣金解冻", true), DELIVERY_REWARD(60, "配送奖励", true), DELIVERY_INCOME(61, "配送提成", true), + DELIVERY_FLOOR_FEE(62, "配送步梯费", true), ORDER_REFUND(70, "佣金退回(退单)", false), ; diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java index e2b1e54..0f7c031 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java @@ -10,6 +10,7 @@ import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; import com.gxwebsoft.glt.dto.GltTransferOrderDto; +import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.param.GltTicketOrderDeliveredParam; import com.gxwebsoft.glt.param.GltTicketOrderParam; @@ -178,14 +179,6 @@ public class GltTicketOrderController extends BaseController { } gltTicketOrderService.createWithWriteOff(gltTicketOrder, loginUser.getUserId(), loginUser.getTenantId()); - - // 订单创建成功后，异步通知所有在线配送员有新订单 - try { - notifyRidersOfNewOrder(gltTicketOrder, loginUser.getTenantId()); - } catch (Exception e) { - log.warn("通知配送员失败（不影响下单）: {}", e.getMessage()); - } - return success("下单成功"); } @@ -244,8 +237,14 @@ public class GltTicketOrderController extends BaseController { } } } + } - log.info("已向 {} 位配送员发送新订单通知", riders.size()); + @PreAuthorize("isAuthenticated()") + @Operation(summary = "配送员调度单通知") + @PostMapping("/sendRiderNewOrderNotice") + public ApiResult sendRiderNewOrderNotice(@RequestBody NoticeRiderNewOrderDto noticeRiderNewOrderDto) { + gltSubscribeMessageService.sendRiderNewOrderNotice(noticeRiderNewOrderDto); + return success("发送消息成功！"); } @PreAuthorize("isAuthenticated()") diff --git a/src/main/java/com/gxwebsoft/glt/dto/NoticeRiderNewOrderDto.java b/src/main/java/com/gxwebsoft/glt/dto/NoticeRiderNewOrderDto.java new file mode 100644 index 0000000..49d5c31 --- /dev/null +++ b/src/main/java/com/gxwebsoft/glt/dto/NoticeRiderNewOrderDto.java @@ -0,0 +1,35 @@ +package com.gxwebsoft.glt.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 配送员新订单配送通知 + * + */ +@Data +@Schema(name = "ShopOrderMyVerifyDto", description = "配送员新订单配送通知") +public class NoticeRiderNewOrderDto { + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "商品名称") + private String goodsName; + + @Schema(description = "配送数量") + private Integer productCount; + + @Schema(description = "期望送达时间") + private LocalDateTime createTime; + + @Schema(description = "租户ID") + private Integer tenantId; + + @Schema(description = "openID") + private String openId; + +} + diff --git a/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java b/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java index 1183754..7ff3ec5 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltSubscribeMessageService.java @@ -1,5 +1,6 @@ package com.gxwebsoft.glt.service; +import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; /** @@ -25,4 +26,10 @@ public interface GltSubscribeMessageService { * @return 是否发送成功 */ boolean sendOrderStatusNotice(GltTicketOrder order, String riderOpenId, String statusText, Integer tenantId); + + /** + * 推送配送师傅接单提醒 + * @param noticeRiderNewOrderDto + */ + void sendRiderNewOrderNotice(NoticeRiderNewOrderDto noticeRiderNewOrderDto); } diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java index 563cf72..5fce7ff 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java @@ -1,14 +1,11 @@ package com.gxwebsoft.glt.service.impl; -import cn.binarywang.wx.miniapp.api.WxMaService; -import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; -import cn.binarywang.wx.miniapp.config.WxMaConfig; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.RedisUtil; +import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.service.GltSubscribeMessageService; import lombok.extern.slf4j.Slf4j; @@ -19,7 +16,8 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; -import static com.gxwebsoft.common.core.constants.RedisConstants.*; +import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; +import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY; /** * 微信订阅消息服务实现 @@ -43,7 +41,34 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic * 模板名称：订单配送通知 * 关键词：订单编号、订单内容、配送地址、订单金额 */ - private static final String ORDER_DELIVERY_ID = "vSMSqGVy3aG1RuzQUZlk2y5sWiTFY_hewF5-R-uYwMk"; + private static final String ORDER_DELIVERY_ID = "vSMSqGVy3aG1RuzQUZlk282p5hCvuMBcHvix1AFhN90"; + + + public void sendRiderNewOrderNotice(NoticeRiderNewOrderDto entity){ + //1.获取微信accessToken + String accessToken = getAccessToken(entity.getTenantId()); + if(accessToken == null){ + log.error("配送发单消息发生失败：获取accessToken失败！"); + return; + } + + //2.品名字段最大能发送20个长度字符，大于15的长度需做处理 + String goodsName = entity.getGoodsName(); + int keepLength = 15; + if (goodsName.length() > keepLength) { + entity.setGoodsName(goodsName.substring(0, keepLength) + "..."); + } + + //3.组装入参 + Map data = new HashMap<>(); + data.put("character_string1", Map.of("value", String.valueOf(entity.getOrderNo()))); + data.put("thing22", Map.of("value", String.valueOf(entity.getGoodsName()))); + data.put("number20", Map.of("value", String.valueOf(entity.getProductCount()))); + data.put("time24", Map.of("value", String.valueOf(entity.getCreateTime()))); + + //推送订阅消息 + sendSubscribeMessage(accessToken, entity.getOpenId(), data); + } /** * 发送新订单通知给配送员 @@ -65,7 +90,7 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic // 构建消息内容 Map data = new HashMap<>(); data.put("phrase1", Map.of("value", "待配送")); // 订单状态 - data.put("character_string2", Map.of("value", String.valueOf(order.getId()))); // 订单编号 + data.put("character_string2", Map.of("value", String.valueOf(order.getOrderNo()))); // 订单编号 data.put("thing3", Map.of("value", truncateStr(order.getAddress(), 20))); // 配送地址 data.put("number4", Map.of("value", String.valueOf(order.getTotalNum()))); // 商品数量 data.put("time5", Map.of("value", formatTime(order.getSendTime()))); // 期望送达时间 @@ -208,14 +233,14 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic .body(); JSONObject result = JSON.parseObject(response); - int errcode = result.getIntValue("errcode"); + int errCode = result.getIntValue("errcode"); - if (errcode == 0) { + if (errCode == 0) { log.info("订阅消息发送成功 - openId={}", openId); return true; } else { log.warn("订阅消息发送失败 - openId={}, errcode={}, errmsg={}", - openId, errcode, result.getString("errmsg")); + openId, errCode, result.getString("errmsg")); return false; } } diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 99ff31f..5fb733e 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -16,12 +16,14 @@ import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.glt.dto.GltTransferOrderDto; +import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.entity.GltUserTicket; import com.gxwebsoft.glt.entity.GltUserTicketLog; import com.gxwebsoft.glt.mapper.GltTicketOrderMapper; import com.gxwebsoft.glt.mapper.GltUserTicketMapper; import com.gxwebsoft.glt.param.GltTicketOrderParam; +import com.gxwebsoft.glt.service.GltSubscribeMessageService; import com.gxwebsoft.glt.service.GltTicketOrderService; import com.gxwebsoft.glt.service.GltUserTicketLogService; import com.gxwebsoft.glt.service.GltUserTicketService; @@ -107,6 +109,9 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0) { //配送提成(每桶0.1) @@ -872,7 +924,11 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(ticketOrder.getRiderId()); + reduceDto.setOrderUserId(ticketOrder.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setPrice(order.getDeliveryFee()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_FLOOR_FEE); + shopDealerUserService.reduceBalance(reduceDto); + } + //查询未完成订单，完成资金解冻 if(order != null && order.getOrderStatus() == 0){ ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); diff --git a/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoDispatch10584Task.java b/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoDispatch10584Task.java index 3a1ef96..c619100 100644 --- a/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoDispatch10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/GltTicketOrderAutoDispatch10584Task.java @@ -35,7 +35,7 @@ public class GltTicketOrderAutoDispatch10584Task { @Value("${glt.ticket.dispatch10584.batchSize:50}") private int batchSize; - @Scheduled(cron = "${glt.ticket.dispatch10584.cron:0/20 * * * * ?}") +// @Scheduled(cron = "${glt.ticket.dispatch10584.cron:0/20 * * * * ?}") @IgnoreTenant("定时任务无登录态，需忽略租户隔离；内部使用 tenantId=10584 精确过滤") public void run() { if (!running.compareAndSet(false, true)) { diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java index c23cfd9..f61a483 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java @@ -6,9 +6,11 @@ import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.dto.ShopDealerCapitalWaterDto; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.param.ShopDealerCapitalParam; import com.gxwebsoft.shop.service.ShopDealerCapitalService; +import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springdoc.api.annotations.ParameterObject; @@ -39,6 +41,14 @@ public class ShopDealerCapitalController extends BaseController { return success(shopDealerCapitalService.pageRel(param)); } + @PreAuthorize("hasAuthority('shop:shopDealerCapital:list')") + @Operation(summary = "分页查询分销商个人流水") + @GetMapping("/myCapitalWater") + public ApiResult> myCapitalWater(ShopDealerCapitalWaterDto waterDto) { + // 使用关联查询 + return success(shopDealerCapitalService.myCapitalWater(waterDto)); + } + @PreAuthorize("hasAuthority('shop:shopDealerCapital:list')") @Operation(summary = "查询全部分销商资金明细表") @GetMapping() diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java index b157adf..f915df5 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopVerifyUserController.java @@ -51,6 +51,13 @@ public class ShopVerifyUserController extends BaseController { return success(shopVerifyUserService.getByIdRel(id)); } +// @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')") + @Operation(summary = "根据用户ID查询订单核销人管理") + @GetMapping("/getByUserId") + public ApiResult getByUserId(@RequestParam("userId") Integer userId) { + return success(shopVerifyUserService.getInfo(userId)); + } + // @PreAuthorize("hasAuthority('shop:shopVerifyUser:save')") @OperationLog @Operation(summary = "添加订单核销人管理") diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerCapitalWaterDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerCapitalWaterDto.java new file mode 100644 index 0000000..88a8c32 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerCapitalWaterDto.java @@ -0,0 +1,28 @@ +package com.gxwebsoft.shop.dto; + +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 查询个人流水 + * + */ +@Data +@Schema(name = "ShopDealerCapitalWaterDto", description = "查询个人流水") +public class ShopDealerCapitalWaterDto extends BaseParam { + + @Schema(description = "用户ID") + @NotEmpty(message = "用户ID不能为空！") + private Integer userId; + + @Schema(description = "起始时间", example = "2026-05-01") + private String dateStart; + + @Schema(description = "结束时间", example = "2026-05-31") + private String dateEnd; + +} + diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java index 4a36503..a2d3de0 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java @@ -51,6 +51,13 @@ public class ShopActiveImage implements Serializable { @Schema(description = "排序") private Integer sortNumber; + @Schema(description = "跳转商品ID") + private Integer goodsId; + + @Schema(description = "跳转商品名称") + @TableField(exist = false) + private String goodsName; + @Schema(description = "租户ID") @NotNull(message = "租户ID不能为空！") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java index 3832a48..1d44e4d 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java @@ -49,7 +49,7 @@ public class ShopDealerCapital implements Serializable { @TableField(exist = false) private Integer orderStatus; - @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)") + @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 14现场推广分佣 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 61配送提成 62配送步梯费 70佣金退回【退单】)") private Integer flowType; @Schema(description = "变更金额") diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java index 7c4c11d..0b60932 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java @@ -194,6 +194,9 @@ public class ShopGoods implements Serializable { @Schema(description = "水票ID") private Integer waterTickerId; + @Schema(description = "0-按每桶楼层计算 1-固定金额") + private Integer deliveryFeeType; + @Schema(description = "配送楼层步梯费（元）") private BigDecimal deliveryFee; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java index 2440f00..a16f037 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopVerifyUser.java @@ -34,10 +34,13 @@ public class ShopVerifyUser implements Serializable { private String userName; @Schema(description = "核销权限是否开启 0-未开启 1-已开启") - private Boolean verifyFlag; + private Integer verifyFlag; @Schema(description = "是否开启 0-未开始 1-已开启") - private Boolean status; + private Integer status; + + @Schema(description = "排序号") + private Integer sortNumber; @Schema(description = "创建人") private Integer creator; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java index d996c07..fd02d59 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopDealerCapitalMapper.java @@ -2,8 +2,11 @@ package com.gxwebsoft.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gxwebsoft.shop.dto.ShopDealerCapitalWaterDto; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.param.ShopDealerCapitalParam; +import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,4 +37,12 @@ public interface ShopDealerCapitalMapper extends BaseMapper { */ List selectListRel(@Param("param") ShopDealerCapitalParam param); + /** + * 查询个人资金流水 + * @param page + * @param entity + * @return + */ + IPage getPageInfo(@Param("page") Page page, @Param("entity") ShopDealerCapitalWaterDto entity); + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml index f94b40f..688e3b9 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml @@ -55,5 +55,23 @@ + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java index fd38ccc..69beb5f 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsParam.java @@ -169,8 +169,8 @@ public class ShopGoodsParam extends BaseParam { @Schema(description = "水票ID") private Integer waterTickerId; - @Schema(description = "商品大类 1-水 2-茶叶 3-酒 4-香水") - private Integer categoryType; + @Schema(description = "0-按每桶楼层计算 1-固定金额") + private Integer deliveryFeeType; @Schema(description = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java index 82bcc03..9c9548d 100644 --- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java +++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java @@ -352,7 +352,12 @@ public class OrderBusinessService { //自配送才计算步梯费用业务【选择步梯配送方式、配送楼层大于1楼、商品已设置配送费】 if(Arrays.asList(1, 3).contains(shopOrder.getOrderType()) && shopOrder.getDeliveryMethod() == 1 && shopOrder.getDeliveryFloor() > 1 && shopGoods.getDeliveryFee().compareTo(BigDecimal.ZERO) > 0){ - BigDecimal deliveryFee = BigDecimal.valueOf(shopOrder.getDeliveryFloor() - 1).multiply(shopGoods.getDeliveryFee()).multiply(BigDecimal.valueOf(goodsItem.getQuantity())); + BigDecimal deliveryFee = BigDecimal.ZERO; + if(shopGoods.getDeliveryFeeType() == 0 ){ + deliveryFee = BigDecimal.valueOf(shopOrder.getDeliveryFloor() - 1).multiply(shopGoods.getDeliveryFee()).multiply(BigDecimal.valueOf(goodsItem.getQuantity())); + }else if(shopOrder.getDeliveryFloor() > 1){ + deliveryFee = shopGoods.getDeliveryFee(); + } if(deliveryFee.compareTo(BigDecimal.ZERO) > 0){ shopOrder.setDeliveryFee(deliveryFee); shopOrder.setTotalPrice(shopOrder.getTotalPrice().add(deliveryFee)); diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java index 67fb29c..371fd23 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerCapitalService.java @@ -2,8 +2,10 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.dto.ShopDealerCapitalWaterDto; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.param.ShopDealerCapitalParam; +import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO; import java.util.List; @@ -23,6 +25,13 @@ public interface ShopDealerCapitalService extends IService { */ PageResult pageRel(ShopDealerCapitalParam param); + /** + * 分页查询分销商个人流水 + * @param waterDto + * @return + */ + PageResult myCapitalWater(ShopDealerCapitalWaterDto waterDto); + /** * 关联查询全部 * diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java index 433cbd6..225676a 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.java @@ -39,6 +39,13 @@ public interface ShopVerifyUserService extends IService { */ ShopVerifyUser getByIdRel(Integer id); + /** + * 通过用户ID查询 + * @param userId + * @return + */ + ShopVerifyUser getInfo(Integer userId); + /** * 修改订单核销人开启状态 * @param id 主键ID diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java index af687e4..ba147b8 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.shop.entity.ShopActiveImage; +import com.gxwebsoft.shop.entity.ShopGoods; import com.gxwebsoft.shop.mapper.ShopActiveImageMapper; +import com.gxwebsoft.shop.mapper.ShopGoodsMapper; import com.gxwebsoft.shop.param.ShopActiveImageParam; import com.gxwebsoft.shop.service.ShopActiveImageService; import lombok.AllArgsConstructor; @@ -14,6 +16,7 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * 推广码底图Service实现 @@ -25,16 +28,30 @@ import java.util.List; @AllArgsConstructor public class ShopActiveImageServiceImpl extends ServiceImpl implements ShopActiveImageService { + private ShopGoodsMapper shopGoodsMapper; + @Override public PageResult pageRel(ShopActiveImageParam param) { PageParam page = new PageParam<>(param); page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); if(CollectionUtils.isNotEmpty(list)){ + List goodsIdList = list.stream().filter(shopActiveImage -> shopActiveImage.getGoodsId() != null).map(ShopActiveImage::getGoodsId) + .distinct().collect(Collectors.toList()); + List shopGoodsList = shopGoodsMapper.selectBatchIds(goodsIdList); + list.forEach(shopActiveImage -> { if(!StringUtils.isEmpty(shopActiveImage.getImgUrl())){ shopActiveImage.setImgUrlList(Arrays.asList(shopActiveImage.getImgUrl().split(","))); } + + //回显商品名称 + if(shopActiveImage.getGoodsId() != null){ + ShopGoods shopGoods = shopGoodsList.stream().filter(goods -> shopActiveImage.getGoodsId().equals(goods.getGoodsId())).findFirst().orElse(null); + if(shopGoods != null){ + shopActiveImage.setGoodsName(shopGoods.getName()); + } + } }); } return new PageResult<>(list, page.getTotal()); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java index 897fbed..f8365db 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java @@ -1,14 +1,24 @@ package com.gxwebsoft.shop.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; +import com.gxwebsoft.common.core.utils.LoginUserUtil; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.dto.ShopDealerCapitalWaterDto; import com.gxwebsoft.shop.mapper.ShopDealerCapitalMapper; import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.entity.ShopDealerCapital; import com.gxwebsoft.shop.param.ShopDealerCapitalParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -28,6 +38,27 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl(list, page.getTotal()); } + @Override + public PageResult myCapitalWater(ShopDealerCapitalWaterDto entity) { + PageResult pageResult = new PageResult<>(); + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser == null){ + throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg()); + } + entity.setUserId(loginUser.getUserId()); + + IPage pageInfo = baseMapper.getPageInfo(new Page<>(entity.getPage(), entity.getLimit()), entity); + if(CollectionUtils.isNotEmpty(pageInfo.getRecords())){ + List records = pageInfo.getRecords(); + pageResult.setList(records); + pageResult.setCount(pageInfo.getTotal()); + }else { + pageResult.setCount(0l); + pageResult.setList(new ArrayList<>()); + } + return pageResult; + } + @Override public List listRel(ShopDealerCapitalParam param) { List list = baseMapper.selectListRel(param); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index 6ccdcc0..af12963 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -120,6 +120,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl listRel(ShopOrderGoodsParam param) { List list = baseMapper.selectListRel(param); - //根据订单ID查询活动并回显对应名称、订单核销码 Integer orderId = param.getOrderId(); if(orderId != null){ @@ -55,6 +54,7 @@ public class ShopOrderGoodsServiceImpl extends ServiceImpl().eq(ShopVerifyUser::getUserId, loginUser.getUserId())); - if(!(verifyUser != null && verifyUser.getVerifyFlag() && verifyUser.getStatus())){ - throw new RuntimeException("暂无核销权限！"); + if(!(verifyUser != null && verifyUser.getVerifyFlag() == 1 && verifyUser.getStatus() == 1)){ + throw new BusinessException("暂无核销权限！"); } } //3.查询订单信息 ShopOrder shopOrder = baseMapper.selectOne(new LambdaQueryWrapper().eq(ShopOrder::getVerifyCode, verifyDto.getVerifyCode())); if(shopOrder == null){ - throw new RuntimeException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); } //4.判断当前订单状态是否允许核销 if(Arrays.asList(2,3,4,6,7).contains(shopOrder.getOrderStatus())){ - throw new RuntimeException("订单当前状态不可核销！"); + throw new BusinessException("订单当前状态不可核销！"); } //5.判断订单是否已支付 if(!shopOrder.getPayStatus()){ - throw new RuntimeException("订单未支付，不可核销！"); + throw new BusinessException("订单未支付，不可核销！"); } //6.判断是否已核销 if(shopOrder.getVerifyStatus() != null && shopOrder.getVerifyStatus() == 1){ - throw new RuntimeException("此订单已核销,无需重复核销！"); + throw new BusinessException("此订单已核销,无需重复核销！"); } shopOrder.setVerifyStatus(1); @@ -624,7 +625,7 @@ public class ShopOrderServiceImpl extends ServiceImpl 0; }catch (Exception e){ - throw new RuntimeException("核销失败：" + e.getMessage()); + throw new BusinessException("核销失败：" + e.getMessage()); } } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java index 9c6f41b..f32f481 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopVerifyUserServiceImpl.java @@ -36,7 +36,7 @@ public class ShopVerifyUserServiceImpl extends ServiceImpl pageRel(ShopVerifyUserParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); if(CollectionUtils.isNotEmpty(list)){ List userIdList = list.stream().map(ShopVerifyUser::getUserId).distinct().collect(Collectors.toList()); @@ -90,15 +90,24 @@ public class ShopVerifyUserServiceImpl extends ServiceImpl list = lambdaQuery().eq(ShopVerifyUser::getUserId, userId).list(); + if(CollectionUtils.isNotEmpty(list)){ + return list.get(0); + } + return null; + } + @Override public Boolean updateStatus(Integer id) { ShopVerifyUser verifyUser = baseMapper.selectById(id); if(verifyUser != null){ - Boolean status = verifyUser.getStatus(); - if(status){ - verifyUser.setStatus(false); + Integer status = verifyUser.getStatus(); + if(status == 0){ + verifyUser.setStatus(1); }else { - verifyUser.setStatus(true); + verifyUser.setStatus(0); } verifyUser.setUpdateTime(LocalDateTime.now()); User loginUser = LoginUserUtil.getLoginUser(); @@ -114,11 +123,11 @@ public class ShopVerifyUserServiceImpl extends ServiceImpl Date: Wed, 27 May 2026 10:59:00 +0800 Subject: [PATCH 59/60] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E6=B6=A6=E5=9F=BA=E7=A1=80=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopGoodsProfitController.java | 93 +++++++++++++++++++ .../shop/entity/ShopGoodsProfit.java | 65 +++++++++++++ .../shop/mapper/ShopGoodsProfitMapper.java | 37 ++++++++ .../shop/mapper/xml/ShopGoodsProfitMapper.xml | 63 +++++++++++++ .../shop/param/ShopGoodsProfitParam.java | 61 ++++++++++++ .../shop/service/ShopGoodsProfitService.java | 42 +++++++++ .../impl/ShopGoodsProfitServiceImpl.java | 49 ++++++++++ 7 files changed, 410 insertions(+) create mode 100644 src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/ShopGoodsProfit.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java new file mode 100644 index 0000000..c7e8ecf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java @@ -0,0 +1,93 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.ShopGoodsProfit; +import com.gxwebsoft.shop.param.ShopGoodsProfitParam; +import com.gxwebsoft.shop.service.ShopGoodsProfitService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商品分润设定控制器 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Tag(name = "商品分润设定管理") +@RestController +@RequestMapping("/api/shop/shop-goods-profit") +public class ShopGoodsProfitController extends BaseController { + @Resource + private ShopGoodsProfitService shopGoodsProfitService; + +// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')") + @Operation(summary = "分页查询商品分润设定") + @GetMapping("/page") + public ApiResult> page(ShopGoodsProfitParam param) { + // 使用关联查询 + return success(shopGoodsProfitService.pageRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')") + @Operation(summary = "查询全部商品分润设定") + @GetMapping() + public ApiResult> list(ShopGoodsProfitParam param) { + // 使用关联查询 + return success(shopGoodsProfitService.listRel(param)); + } + +// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')") + @Operation(summary = "根据id查询商品分润设定") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(shopGoodsProfitService.getByIdRel(id)); + } + +// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:save')") + @OperationLog + @Operation(summary = "添加商品分润设定") + @PostMapping() + public ApiResult save(@RequestBody ShopGoodsProfit shopGoodsProfit) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + shopGoodsProfit.setUserId(loginUser.getUserId()); + } + if (shopGoodsProfitService.save(shopGoodsProfit)) { + return success("添加成功"); + } + return fail("添加失败"); + } + +// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:update')") + @OperationLog + @Operation(summary = "修改商品分润设定") + @PutMapping() + public ApiResult update(@RequestBody ShopGoodsProfit shopGoodsProfit) { + if (shopGoodsProfitService.updateById(shopGoodsProfit)) { + return success("修改成功"); + } + return fail("修改失败"); + } + +// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:remove')") + @OperationLog + @Operation(summary = "删除商品分润设定") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (shopGoodsProfitService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsProfit.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsProfit.java new file mode 100644 index 0000000..d679966 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGoodsProfit.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.shop.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品分润设定 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(name = "ShopGoodsProfit对象", description = "商品分润设定") +@TableName("shop_goods_profit") +public class ShopGoodsProfit implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @Schema(description = "类型 1-股东分红 2-其他") + private Integer type; + + @Schema(description = "商品ID") + private Integer goodsId; + + @Schema(description = "用户ID") + private Integer userId; + + @Schema(description = "分佣比例 百分比") + private BigDecimal profit; + + @Schema(description = "开启状态 0-未开启 1-开启") + private Integer status; + + @Schema(description = "租户ID") + private Integer tenantId; + + @Schema(description = "创建人") + private Integer creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新人") + private Integer updater; + + @Schema(description = "更新人") + private LocalDateTime updateTime; + + @Schema(description = "删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java new file mode 100644 index 0000000..6ef99c6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.ShopGoodsProfit; +import com.gxwebsoft.shop.param.ShopGoodsProfitParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品分润设定Mapper + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +public interface ShopGoodsProfitMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ShopGoodsProfitParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ShopGoodsProfitParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml new file mode 100644 index 0000000..79bf817 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml @@ -0,0 +1,63 @@ + + + + + + + SELECT a.* + FROM shop_goods_profit a + + + AND a.id = #{param.id} + + + AND a.type = #{param.type} + + + AND a.goods_id = #{param.goodsId} + + + AND a.user_id = #{param.userId} + + + AND a.profit = #{param.profit} + + + AND a.status = #{param.status} + + + AND a.creator = #{param.creator} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.updater = #{param.updater} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java new file mode 100644 index 0000000..1014418 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java @@ -0,0 +1,61 @@ +package com.gxwebsoft.shop.param; + +import java.math.BigDecimal; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品分润设定查询参数 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@Schema(name = "ShopGoodsProfitParam对象", description = "商品分润设定查询参数") +public class ShopGoodsProfitParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @Schema(description = "类型 1-股东分红 2-其他") + @QueryField(type = QueryType.EQ) + private Integer type; + + @Schema(description = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @Schema(description = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @Schema(description = "分佣比例 百分比") + @QueryField(type = QueryType.EQ) + private BigDecimal profit; + + @Schema(description = "开启状态 0-未开启 1-开启") + @QueryField(type = QueryType.EQ) + private Integer status; + + @Schema(description = "创建人") + @QueryField(type = QueryType.EQ) + private Integer creator; + + @Schema(description = "更新人") + @QueryField(type = QueryType.EQ) + private Integer updater; + + @Schema(description = "删除 0-未删 1-已删") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java b/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java new file mode 100644 index 0000000..aaa31bf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.ShopGoodsProfit; +import com.gxwebsoft.shop.param.ShopGoodsProfitParam; + +import java.util.List; + +/** + * 商品分润设定Service + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +public interface ShopGoodsProfitService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ShopGoodsProfitParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ShopGoodsProfitParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return ShopGoodsProfit + */ + ShopGoodsProfit getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java new file mode 100644 index 0000000..f860f18 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java @@ -0,0 +1,49 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.ShopGoodsProfitMapper; +import com.gxwebsoft.shop.service.ShopGoodsProfitService; +import com.gxwebsoft.shop.entity.ShopGoodsProfit; +import com.gxwebsoft.shop.param.ShopGoodsProfitParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品分润设定Service实现 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Service +@AllArgsConstructor +public class ShopGoodsProfitServiceImpl extends ServiceImpl implements ShopGoodsProfitService { + + @Override + public PageResult pageRel(ShopGoodsProfitParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(ShopGoodsProfitParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public ShopGoodsProfit getByIdRel(Integer id) { + ShopGoodsProfitParam param = new ShopGoodsProfitParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} From 61b1d16937a6c5299546b3df1f70de365ea63396 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Thu, 28 May 2026 17:01:35 +0800 Subject: [PATCH 60/60] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=B4=BE=E5=8D=95=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=202=E3=80=81=E4=BC=98=E5=8C=96=E9=80=81?= =?UTF-8?q?=E6=B0=B4=E8=AE=A2=E5=8D=95=E9=85=8D=E9=80=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=81=E6=B0=B4=E7=A5=A8=E6=A0=87=E8=AF=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E6=98=BE=E5=93=81=E5=90=8D=E3=80=81=E6=B0=B4?= =?UTF-8?q?=E7=A5=A8=E6=A0=87=E8=AF=86=E3=80=81=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=9A=E5=8A=A1=203=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=80=81=E6=B0=B4=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8D=95=E3=80=81?= =?UTF-8?q?=E9=80=81=E8=BE=BE=E4=B8=9A=E5=8A=A1=204=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B5=84=E9=87=91=E8=A1=A8=E3=80=81=E8=B5=84=E9=87=91?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E8=A1=A8=E8=B5=84=E9=87=91=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/MybatisPlusConfig.java | 16 +- .../controller/GltTicketOrderController.java | 22 ++- .../gxwebsoft/glt/entity/GltTicketOrder.java | 7 + .../glt/mapper/xml/GltTicketOrderMapper.xml | 7 +- .../glt/param/GltTicketOrderParam.java | 3 + .../glt/service/GltTicketOrderService.java | 2 +- .../impl/GltSubscribeMessageServiceImpl.java | 3 +- .../impl/GltTicketOrderServiceImpl.java | 167 +++++++++++++++--- .../com/gxwebsoft/shop/entity/ShopOrder.java | 2 +- .../shop/mapper/ShopOrderMapper.java | 8 + .../shop/mapper/xml/ShopOrderMapper.xml | 25 ++- .../shop/service/ShopOrderService.java | 8 + .../impl/ShopDealerUserServiceImpl.java | 12 +- .../service/impl/ShopOrderServiceImpl.java | 6 + .../shop/vo/ShopOrderGoodsInfoVO.java | 24 +++ 15 files changed, 246 insertions(+), 66 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsInfoVO.java diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index e8e7a91..c5e5f34 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -80,7 +80,7 @@ public class MybatisPlusConfig { @Override public boolean ignoreTable(String tableName) { - TenantContext.setIgnoreTenant(Boolean.TRUE); +// TenantContext.setIgnoreTenant(Boolean.TRUE); // 如果当前上下文设置了忽略租户隔离，则忽略所有表的租户隔离 if (TenantContext.isIgnoreTenant()) { return true; @@ -93,17 +93,8 @@ public class MybatisPlusConfig { "sys_dictionary_data", "apps_test_data", "cms_lang", -// "hjm_car", -// "hjm_fence" -// "cms_website" -// "sys_user" -// "cms_domain" -// "shop_order_goods", "shop_goods", -// "shop_users", - "shop_order" , // 移除shop_order，改为通过注解控制 -// "shop_order_info", -// "booking_user_invoice" + "shop_order" , "shop_order_goods", "glt_ticket_template", "glt_user_ticket", @@ -111,7 +102,8 @@ public class MybatisPlusConfig { "glt_user_ticket_log", "shop_dealer_user", "shop_dealer_order", - "shop_dealer_referee" + "shop_dealer_referee", + "shop_store_rider" ).contains(tableName); } }; diff --git a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java index 0f7c031..4c1dc4c 100644 --- a/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java +++ b/src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java @@ -299,6 +299,13 @@ public class GltTicketOrderController extends BaseController { return success("确认送达"); } + @Operation(summary = "订单调度") + @PostMapping("/dispatchOrder") + public ApiResult dispatchOrder(@RequestParam("orderNo") String orderNo, @RequestParam("tenantId") Integer tenantId) { + gltTicketOrderService.dispatchOrder(orderNo, tenantId); + return success("success!"); + } + @PreAuthorize("isAuthenticated()") @Operation(summary = "用户确认收货") @PostMapping("/{id}/confirm-receive") @@ -382,23 +389,14 @@ public class GltTicketOrderController extends BaseController { } if (gltTicketOrderService.updateById(gltTicketOrder)) { - // 后台指派配送员（直接改 riderId）时，同步商城订单为“已发货”(deliveryStatus=20) - if (gltTicketOrder != null - && gltTicketOrder.getId() != null - && gltTicketOrder.getRiderId() != null - && gltTicketOrder.getRiderId() > 0) { - gltTicketOrderService.markShopOrderShippedAfterRiderAssigned( - gltTicketOrder.getId(), - tenantId, - gltTicketOrder.getRiderId() - ); - } + gltTicketOrderService.markShopOrderShippedAfterRiderAssigned(gltTicketOrder.getId(), tenantId, gltTicketOrder.getRiderId()); + // 后台直接改“已完成”(deliveryStatus=40)时，同步商城订单为“已完成”(orderStatus=1) if (gltTicketOrder != null && gltTicketOrder.getId() != null && gltTicketOrder.getDeliveryStatus() != null && gltTicketOrder.getDeliveryStatus() == GltTicketOrderService.DELIVERY_STATUS_FINISHED) { - gltTicketOrderService.markShopOrderCompletedAfterTicketFinished(gltTicketOrder.getId(), tenantId); + gltTicketOrderService.markShopOrderCompletedAfterTicketFinished(gltTicketOrder.getId()); } return success("修改成功"); } diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index d0a8b69..7db3ba1 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -46,6 +46,10 @@ public class GltTicketOrder implements Serializable { @TableField(exist = false) private String storeName; + @Schema(description = "品名") + @TableField(exist = false) + private String goodsName; + @Schema(description = "门店地址") @TableField(exist = false) private String storeAddress; @@ -213,6 +217,9 @@ public class GltTicketOrder implements Serializable { @Schema(description = "状态, 0正常, 1冻结") private Integer status; + @Schema(description = "水票标识 0-非 1-是") + private Integer waterTicketFlag; + @Schema(description = "是否删除, 0否, 1是") @TableLogic private Integer deleted; diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml index 396237f..d3b8c47 100644 --- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml @@ -20,7 +20,6 @@ LEFT JOIN shop_user_address d ON a.address_id = d.id LEFT JOIN glt_user_ticket f ON a.user_ticket_id = f.id LEFT JOIN shop_order o ON f.order_id = o.order_id AND f.tenant_id = o.tenant_id AND o.deleted = 0 - AND a.id = #{param.id} @@ -103,6 +102,12 @@ OR u.phone LIKE CONCAT('%', #{param.keywords}, '%') ) + + AND a.water_ticket_flag = #{param.waterTicketFlag} + + + AND o.order_status in (0, 1, 5) + diff --git a/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java b/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java index d05e078..bc64b8f 100644 --- a/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java +++ b/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java @@ -94,4 +94,7 @@ public class GltTicketOrderParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer orderStatus; + @Schema(description = "水票订单标识 0-否 1-是") + private Integer waterTicketFlag; + } diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java index d5ba7f8..3a34fe9 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketOrderService.java @@ -84,7 +84,7 @@ public interface GltTicketOrderService extends IService { * *

用于后台直接改 deliveryStatus=40 等不经过 confirmReceive/autoConfirmTimeout 的兜底同步。

*/ - void markShopOrderCompletedAfterTicketFinished(Integer ticketOrderId, Integer tenantId); + void markShopOrderCompletedAfterTicketFinished(Integer id); /** * 配送员开始配送：10 -> 20，并写 sendStartTime。 diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java index 5fce7ff..287fc03 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltSubscribeMessageServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.DateTimeUtil; import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto; import com.gxwebsoft.glt.entity.GltTicketOrder; import com.gxwebsoft.glt.service.GltSubscribeMessageService; @@ -64,7 +65,7 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic data.put("character_string1", Map.of("value", String.valueOf(entity.getOrderNo()))); data.put("thing22", Map.of("value", String.valueOf(entity.getGoodsName()))); data.put("number20", Map.of("value", String.valueOf(entity.getProductCount()))); - data.put("time24", Map.of("value", String.valueOf(entity.getCreateTime()))); + data.put("time24", Map.of("value", DateTimeUtil.formatDateTime(entity.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))); //推送订阅消息 sendSubscribeMessage(accessToken, entity.getOpenId(), data); diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java index 5fb733e..cc8a5ce 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java @@ -36,6 +36,7 @@ import com.gxwebsoft.shop.service.ShopDealerCapitalService; import com.gxwebsoft.shop.service.ShopDealerUserService; import com.gxwebsoft.shop.service.ShopOrderGoodsService; import com.gxwebsoft.shop.service.ShopOrderService; +import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -49,6 +50,7 @@ import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -122,15 +124,28 @@ public class GltTicketOrderServiceImpl extends ServiceImpl list = baseMapper.selectPageRel(page, param); if(CollectionUtils.isNotEmpty(list)){ List addressIdList = list.stream().map(GltTicketOrder::getAddressId).distinct().collect(Collectors.toList()); - List userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList); - if(CollectionUtils.isNotEmpty(userAddressList)){ - list.forEach(ticketOrder ->{ - ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address.getId())).findFirst().orElse(null); - if(shopUserAddress != null){ - ticketOrder.setFullAddress(shopUserAddress.getFullAddress()); - } - }); + List orderNoList = list.stream().filter(gltTicketOrder -> StrUtil.isNotBlank(gltTicketOrder.getOrderNo())).map(GltTicketOrder::getOrderNo).distinct().collect(Collectors.toList()); + List orderGoodsInfoVOList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(orderNoList)){ + orderGoodsInfoVOList = shopOrderService.getOrderGoodsInfoByOrderNos(orderNoList); } + + List userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList); + List finalOrderGoodsInfoVOList = orderGoodsInfoVOList; + list.forEach(ticketOrder ->{ + ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address.getId())).findFirst().orElse(null); + if(shopUserAddress != null){ + ticketOrder.setFullAddress(shopUserAddress.getFullAddress()); + } + + if(StrUtil.isNotBlank(ticketOrder.getOrderNo())){ + ShopOrderGoodsInfoVO shopOrderGoodsInfoVO = finalOrderGoodsInfoVOList.stream().filter(orderGoodsInfoVO -> ticketOrder.getOrderNo().equals(orderGoodsInfoVO.getOrderNo())).findFirst().orElse(null); + if(shopOrderGoodsInfoVO != null){ + ticketOrder.setGoodsName(shopOrderGoodsInfoVO.getGoodsName()); + ticketOrder.setOrderStatus(shopOrderGoodsInfoVO.getOrderStatus()); + } + } + }); } return new PageResult<>(list, page.getTotal()); } @@ -349,7 +364,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 20已发货 - updateShopOrderDeliveryStatusAfterAccept(id, tenantId, riderId, now); + updateShopOrderDeliveryStatusAfterAcceptV2(id, tenantId, riderId, now); return; } @@ -391,12 +406,12 @@ public class GltTicketOrderServiceImpl extends ServiceImpl backfill = new LambdaUpdateWrapper() - .eq(GltUserTicket::getTenantId, tenantId) - .eq(GltUserTicket::getDeleted, 0) - .eq(GltUserTicket::getId, userTicket.getId()); - backfill.set(GltUserTicket::getOrderId, shopOrderId); - if (!StringUtils.hasText(userTicket.getOrderNo()) && StringUtils.hasText(shopOrderNo)) { - backfill.set(GltUserTicket::getOrderNo, shopOrderNo); - } - backfill.set(GltUserTicket::getUpdateTime, now); - try { - gltUserTicketService.update(backfill); - } catch (Exception e) { - log.debug("回填水票关联商城订单信息失败(不影响主流程) - tenantId={}, userTicketId={}, orderId={}, orderNo={}", - tenantId, userTicket.getId(), shopOrderId, shopOrderNo, e); - } } LambdaUpdateWrapper uw = new LambdaUpdateWrapper() @@ -529,6 +528,20 @@ public class GltTicketOrderServiceImpl extends ServiceImpl 0) { + BigDecimal money = RIDER_UNIT_COMMISSION + .multiply(BigDecimal.valueOf(qty)) + .setScale(RIDER_COMMISSION_SCALE, RoundingMode.HALF_UP); + if (money.signum() > 0) { + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(ticketOrder.getRiderId()); + reduceDto.setOrderUserId(ticketOrder.getUserId()); + if(Arrays.asList(1, 3).contains(order.getOrderType())){ + reduceDto.setOrderNo(order.getOrderNo()); + }else { + reduceDto.setOrderNo(ticketOrder.getNo()); + } + reduceDto.setPrice(money); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_INCOME); + shopDealerUserService.reduceBalance(reduceDto); + } + } + + //3.配送奖励(按商品设置) + Integer goodsId = order.getFormId(); + ShopGoods shopGood = shopGoodsMapper.selectById(goodsId); + if(shopGood != null && order != null){ + Integer commissionType = shopGood.getCommissionType(); + BigDecimal money = BigDecimal.ZERO; + if(commissionType == 10){ //按金额 + money = shopGood.getDeliveryMoney(); + }else { //按比率 + money = order.getPayPrice().multiply(shopGood.getDeliveryMoney()).divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); + } + if(money.compareTo(BigDecimal.ZERO) > 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(ticketOrder.getRiderId()); + reduceDto.setOrderUserId(ticketOrder.getUserId()); + if(Arrays.asList(1, 3).contains(order.getOrderType())){ + reduceDto.setOrderNo(order.getOrderNo()); + }else { + reduceDto.setOrderNo(ticketOrder.getNo()); + } + reduceDto.setPrice(money); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_REWARD); + shopDealerUserService.reduceBalance(reduceDto); + } + } + + //4.配送费结算 + if(Arrays.asList(1, 3).contains(order.getOrderType()) && order.getDeliveryFee().compareTo(BigDecimal.ZERO) > 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT); + reduceDto.setUserId(ticketOrder.getRiderId()); + reduceDto.setOrderUserId(ticketOrder.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setPrice(order.getDeliveryFee()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_FLOOR_FEE); + shopDealerUserService.reduceBalance(reduceDto); + } + + //5.查询未完成订单，完成资金解冻 + if(order != null && order.getOrderStatus() == 0){ + ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto(); + reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST); + reduceDto.setOrderUserId(order.getUserId()); + reduceDto.setOrderNo(order.getOrderNo()); + reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW); + + //按订单号资金解冻 + shopDealerUserService.reduceBalance(reduceDto); + } + + //5.调整订单为已完成、配送完成状态 + order.setOrderStatus(1); + order.setDeliveryStatus(40); + order.setUpdateTime(now); + shopOrderService.updateById(order); + } + private void settleRiderCommissionIfEligible(Integer ticketOrderId, Integer tenantId, boolean requirePhoto) { if (ticketOrderId == null || tenantId == null) { return; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index ce23b1c..5d95126 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -190,7 +190,7 @@ public class ShopOrder implements Serializable { @Schema(description = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") private Integer orderStatus; - @Schema(description = "发货状态(10未发货 20已发货 30部分发货)") + @Schema(description = "发货状态(10未发货 20已发货 30部分发货 40已送达)") private Integer deliveryStatus; @Schema(description = "发货备注") diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java index f7a54f8..c5a7083 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gxwebsoft.shop.dto.ShopOrderMyVerifyDto; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.param.ShopOrderParam; +import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO; import com.gxwebsoft.shop.vo.ShopOrderGoodsVO; import com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO; import org.apache.ibatis.annotations.Param; @@ -79,4 +80,11 @@ public interface ShopOrderMapper extends BaseMapper { */ IPage getMyVerifyPageInfo(@Param("page") Page page, @Param("entity") ShopOrderMyVerifyDto entity); + /** + * 通过订单号查询订单商品名称 + * @param orderNoList + * @return + */ + List getOrderGoodsInfoByOrderNos(@Param("orderNoList") List orderNoList); + } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index f191dd9..a9a07ef 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -241,7 +241,7 @@ - AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 AND a.order_type in(1, 3, 4) + AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 AND a.order_type in(1, 3, 4, 5) @@ -298,12 +298,12 @@ -- “全部”默认也会过滤已关闭(取消)订单：statusFilter != 8 时会加 a.order_status != 2 COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 THEN 1 ELSE 0 END), 0) AS total, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 0 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitPay, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type in(1, 3, 4) AND a.delivery_status = 10 THEN 1 ELSE 0 END), 0) AS waitDeliver, + COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type in(1, 3, 4, 5) AND a.delivery_status = 10 THEN 1 ELSE 0 END), 0) AS waitDeliver, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type = 2 THEN 1 ELSE 0 END), 0) AS waitVerify, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND (a.delivery_status = 20 or (a.order_type = 2 and a.delivery_status = 10)) THEN 1 ELSE 0 END), 0) AS waitReceive, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 AND a.evaluate_status = 0 THEN 1 ELSE 0 END), 0) AS waitComment, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed, - COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7) THEN 1 ELSE 0 END), 0) AS refund, +-- COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed, +-- COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7) THEN 1 ELSE 0 END), 0) AS refund, COALESCE(SUM(CASE WHEN a.deleted = 1 THEN 1 ELSE 0 END), 0) AS deleted, COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status = 2 THEN 1 ELSE 0 END), 0) AS canceled FROM shop_order a @@ -375,6 +375,23 @@ ORDER BY a.create_time desc + UPDATE shop_order diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java b/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java index a9cd060..744e42c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java @@ -7,6 +7,7 @@ import com.gxwebsoft.shop.dto.UserOrderStats; import com.gxwebsoft.shop.dto.VerifyShopOrderDto; import com.gxwebsoft.shop.entity.ShopOrder; import com.gxwebsoft.shop.param.ShopOrderParam; +import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO; import com.gxwebsoft.shop.vo.ShopOrderMyVerifyVO; import java.math.BigDecimal; @@ -102,4 +103,11 @@ public interface ShopOrderService extends IService { * @return */ Boolean verifyOrder(VerifyShopOrderDto verifyDto); + + /** + * 通过订单号查询订单商品名称 + * @param orderNoList + * @return + */ + List getOrderGoodsInfoByOrderNos(List orderNoList); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index af12963..ecbaf42 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -283,7 +283,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl finalShopDealerUserList = shopDealerUserList; BigDecimal finalRate = rate; userDealerMap.forEach((k, value) ->{ - BigDecimal money = value.stream().map(ShopDealerCapital::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate); - BigDecimal freezeMoney = value.stream().map(ShopDealerCapital::getFreezeMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate); + BigDecimal money = value.stream().map(ShopDealerCapital::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate).setScale(3, RoundingMode.HALF_UP); + BigDecimal freezeMoney = value.stream().map(ShopDealerCapital::getFreezeMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate).setScale(3, RoundingMode.HALF_UP); ShopDealerUser dealerUser = finalShopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null); if(dealerUser != null){ //11.修改分销用户账户信息 - dealerUser.setMoney(dealerUser.getMoney().subtract(money)); - dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney)); - dealerUser.setTotalMoney(dealerUser.getTotalMoney().subtract(money.add(freezeMoney))); + dealerUser.setMoney(dealerUser.getMoney().subtract(money).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dealerUser.getMoney().subtract(money)); + dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dealerUser.getFreezeMoney().subtract(freezeMoney)); + dealerUser.setTotalMoney(dealerUser.getTotalMoney().subtract(money.add(freezeMoney)).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dealerUser.getTotalMoney().subtract(money.add(freezeMoney))); dealerUser.setUpdateTime(LocalDateTime.now()); shopDealerUserUpdateList.add(dealerUser); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 0a94859..cfc20a1 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -32,6 +32,7 @@ import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.*; import com.gxwebsoft.shop.param.ShopOrderParam; import com.gxwebsoft.shop.service.*; +import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO; import com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO; import com.gxwebsoft.shop.vo.ShopOrderMyVerifyVO; import com.wechat.pay.java.core.Config; @@ -629,6 +630,11 @@ public class ShopOrderServiceImpl extends ServiceImpl getOrderGoodsInfoByOrderNos(List orderNoList) { + return baseMapper.getOrderGoodsInfoByOrderNos(orderNoList); + } + private static Long getLong(Map raw, String key) { Object value = raw.get(key); if (value == null) { diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsInfoVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsInfoVO.java new file mode 100644 index 0000000..8857223 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsInfoVO.java @@ -0,0 +1,24 @@ +package com.gxwebsoft.shop.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 订单商品信息 + * @author xm + * @since 2025-01-12 + */ +@Data +@Schema(description = "订单商品信息") +public class ShopOrderGoodsInfoVO { + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "订单状态") + private Integer orderStatus; + + @Schema(description = "订单品名") + private String goodsName; + +}