From 974ddb0e1d59f701bdf01b38413d5cb87a5c07ed Mon Sep 17 00:00:00 2001 From: zccbbg Date: Thu, 9 May 2024 11:18:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8=E8=A2=AB?= =?UTF-8?q?=E5=90=83=E6=8E=89=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 8 ++++---- .../com/ruoyi/common/core/redis/RedisService.java | 5 ++++- .../com/cyl/h5/controller/H5OrderController.java | 15 +++------------ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 131c747..c9cbdbc 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -44,15 +44,15 @@ aliyun: bucketName: 你的bucketName # bucket 名称 wechat: enabled: false - appId: 你的微信服务号信息 - secret: 你的微信服务号信息 + appId: 你的微信服务号信息（h5的时候需要，小程序的时候不需要） + secret: 你的微信服务号信息（h5的时候需要，小程序的时候不需要） merchantId: 微信支付商户号 privateKeyPath: 微信支付密钥地址相对地址 merchantSerialNumber: 微信支付密钥对应的序列号 apiV3key: 微信支付apiV3key notifyUrl: 微信支付回调地址 - miniProgramAppId: 小程序apppid - miniProgramSecret: + miniProgramAppId: 小程序apppid（h5的时候不需要） + miniProgramSecret: 小程序Secret（h5的时候不需要） sms: enabled: true # 阿里云 dysmsapi.aliyuncs.com diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisService.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisService.java index 739e798..4096797 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisService.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisService.java @@ -1,5 +1,6 @@ package com.ruoyi.common.core.redis; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -8,6 +9,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; @Service +@Slf4j public class RedisService { @Autowired private RedisCache redisCache; @@ -50,7 +52,8 @@ public class RedisService { public void lock(String key, String jobInfo, Integer lockSecond) throws Exception { String existJobInfo = redisCache.getCacheObject(key); if (StringUtils.isNotEmpty(existJobInfo)) { - throw new Exception(String.format("获取锁失败: redisKey: %s, existJobInfo: %s", key, existJobInfo)); + log.info("获取锁失败: redisKey: {}, existJobInfo: {}", key, existJobInfo); + throw new Exception("请不要反复提交订单！"); } redisCache.setCacheObject(key, jobInfo, lockSecond, TimeUnit.SECONDS); } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java index c7aa838..f13197f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java @@ -2,16 +2,8 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSONObject; import com.cyl.h5.domain.dto.DeliveryReq; -import com.cyl.h5.domain.form.ApplyRefundForm; -import com.cyl.h5.domain.form.OrderCreateForm; -import com.cyl.h5.domain.form.CancelOrderForm; -import com.cyl.h5.domain.form.OrderPayForm; -import com.cyl.h5.domain.vo.OrderPayVO; -import com.cyl.h5.domain.vo.AftersaleRefundInfoVO; -import com.cyl.h5.domain.vo.CountOrderVO; -import com.cyl.h5.domain.vo.H5OrderVO; -import com.cyl.h5.domain.vo.OrderCalcVO; -import com.cyl.h5.domain.form.OrderSubmitForm; +import com.cyl.h5.domain.form.*; +import com.cyl.h5.domain.vo.*; import com.cyl.h5.service.H5OrderService; import com.cyl.manager.oms.domain.entity.Aftersale; import com.cyl.manager.oms.domain.entity.Order; @@ -21,7 +13,6 @@ import com.cyl.manager.oms.service.OrderService; import com.cyl.manager.ums.domain.entity.Member; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.enums.AftersaleStatus; import com.ruoyi.common.enums.OrderStatus; @@ -61,7 +52,7 @@ public class H5OrderController { return ResponseEntity.ok(service.submit(form)); }catch (Exception e){ log.info("创建订单方法异常", e); - throw new RuntimeException("服务繁忙，稍后再试"); + throw new RuntimeException(e.getMessage()); }finally { try { redisService.unLock(redisKey, redisValue);