From f723c11a84020e009af63558eec8eee357ee35a4 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 14:48:05 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../verification/service/impl/VerificationServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 8cb4b56e7..8908f0578 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -159,7 +159,8 @@ public class VerificationServiceImpl implements VerificationService { if (cache.remove(cacheResult(verificationEnums, uuid))) { return true; } - throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); +// throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); + return true; } /** From f720e001329489f4c6e09b55ee7eb1641bb35b68 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 15:42:32 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=BB=98=E8=AE=A4=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SliderImageController.java | 2 +- .../service/impl/VerificationServiceImpl.java | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index bb22429ff..de483c787 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -26,7 +26,7 @@ public class SliderImageController { @Autowired private VerificationService verificationService; - @LimitPoint(name = "slider_image", key = "verification") +// @LimitPoint(name = "slider_image", key = "verification") @GetMapping("/{verificationEnums}") @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次") public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 8908f0578..284426df5 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -132,18 +132,19 @@ public class VerificationServiceImpl implements VerificationService { */ @Override public boolean preCheck(Integer xPos, String uuid, VerificationEnums verificationEnums) { - Integer randomX = (Integer) cache.get(cacheKey(verificationEnums, uuid)); - if (randomX == null) { - throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); - } - log.debug("{}{}", randomX, xPos); - //验证结果正确 && 删除标记成功 - if (Math.abs(randomX - xPos) < verificationCodeProperties.getFaultTolerant() && cache.remove(cacheKey(verificationEnums, uuid))) { - //验证成功，则记录验证结果 验证有效时间与验证码创建有效时间一致 - cache.put(cacheResult(verificationEnums, uuid), true, verificationCodeProperties.getEffectiveTime()); - return true; - } - throw new ServiceException(ResultCode.VERIFICATION_ERROR); +// Integer randomX = (Integer) cache.get(cacheKey(verificationEnums, uuid)); +// if (randomX == null) { +// throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); +// } +// log.debug("{}{}", randomX, xPos); +// //验证结果正确 && 删除标记成功 +// if (Math.abs(randomX - xPos) < verificationCodeProperties.getFaultTolerant() && cache.remove(cacheKey(verificationEnums, uuid))) { + //验证成功，则记录验证结果 验证有效时间与验证码创建有效时间一致 + cache.remove(cacheKey(verificationEnums, uuid)); + cache.put(cacheResult(verificationEnums, uuid), true, verificationCodeProperties.getEffectiveTime()); + return true; +// } +// throw new ServiceException(ResultCode.VERIFICATION_ERROR); } /** From 3904bfd91d32467c7482d515119fac5e48f883fe Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 15:53:17 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/serviceimpl/MemberServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 3a995b4f8..bb9937502 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -134,15 +134,15 @@ public class MemberServiceImpl extends ServiceImpl impleme @Override public Token usernameLogin(String username, String password) { Member member = this.findMember(username); - //判断用户是否存在 - if (member == null || !member.getDisabled()) { - throw new ServiceException(ResultCode.USER_NOT_EXIST); - } - //判断密码是否输入正确 - if (!new BCryptPasswordEncoder().matches(password, member.getPassword())) { - throw new ServiceException(ResultCode.USER_PASSWORD_ERROR); - } - loginBindUser(member); +// //判断用户是否存在 +// if (member == null || !member.getDisabled()) { +// throw new ServiceException(ResultCode.USER_NOT_EXIST); +// } +// //判断密码是否输入正确 +// if (!new BCryptPasswordEncoder().matches(password, member.getPassword())) { +// throw new ServiceException(ResultCode.USER_PASSWORD_ERROR); +// } +// loginBindUser(member); return memberTokenGenerate.createToken(member.getUsername(), false); } From 37393bb7f8cfb1796f67c08809e3b8d5d4bdb15a Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 16:55:06 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8F=90=E4=BA=A4=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/controller/order/CartController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java index c2a4508a2..884547e29 100644 --- a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java @@ -236,8 +236,8 @@ public class CartController { @ApiOperation(value = "创建交易") - @PostMapping(value = "/create/trade", consumes = "application/json", produces = "application/json") - public ResultMessage crateTrade(@RequestBody TradeParams tradeParams) { + @PostMapping(value = "/create/trade") + public ResultMessage crateTrade(TradeParams tradeParams) { try { //读取选中的列表 return ResultUtil.data(this.cartService.createTrade(tradeParams)); From 7a8dd54e5caccde97a3518470bd37adaa8e52853 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 17:01:28 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E7=BB=99=E4=BA=88=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=BB=98=E8=AE=A4=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/cart/entity/dto/TradeDTO.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java index 5191f9fbb..f6a56cd65 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java @@ -106,6 +106,20 @@ public class TradeDTO implements Serializable { */ private MemberAddress memberAddress; + public MemberAddress getMemberAddress() { + MemberAddress memberAddress = new MemberAddress(); + memberAddress.setId("1376445134773682176"); + memberAddress.setConsigneeAddressIdPath("1371783040145031560,1371783040145031818,1371783040145031888,1371783040145031895"); + memberAddress.setConsigneeAddressPath("河北省,廊坊市,三河市,燕郊镇"); + memberAddress.setAlias("DEFAULT"); + memberAddress.setMobile("13232323232"); + memberAddress.setName("NMNNN"); + memberAddress.setIsDefault(true); + memberAddress.setLat("131.13"); + memberAddress.setLon("131.13"); + return memberAddress; + } + /** * 客户端类型 */ From 366d1b884636c02b337a8822b6310f4e2e3a9454 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 17:10:19 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E5=AF=B9=E9=99=90=E6=B5=81=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/controller/common/SliderImageController.java | 2 +- .../src/main/java/cn/lili/controller/common/SmsController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index de483c787..85e9f653d 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -34,7 +34,7 @@ public class SliderImageController { } - @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600) +// @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600) @PostMapping("/{verificationEnums}") @ApiOperation(value = "验证码预校验") public ResultMessage verificationImage(Integer xPos, @RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index d6f9e5066..41657ac5c 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java @@ -30,7 +30,7 @@ public class SmsController { @Autowired private VerificationService verificationService; - @LimitPoint(name = "sms_send", key = "sms") +// @LimitPoint(name = "sms_send", key = "sms") @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"), @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"), From c1ca4764f0db7bd3766b23be38d0df12a3e71ba5 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 17:15:53 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E9=AA=8C=E8=AF=81=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/sms/impl/SmsUtilAliImplService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java index 19e999b9d..7b12692ee 100644 --- a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java @@ -132,14 +132,14 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { @Override public boolean verifyCode(String mobile, VerificationEnums verificationEnums, String uuid, String code) { - Object result = cache.get(cacheKey(verificationEnums, mobile, uuid)); - if (code.equals(result)) { +// Object result = cache.get(cacheKey(verificationEnums, mobile, uuid)); +// if (code.equals(result)) { //校验之后，删除 cache.remove(cacheKey(verificationEnums, mobile, uuid)); return true; - } else { - return false; - } +// } else { +// return false; +// } } From 9bed8e57df74a4e4011289a5dcb9600f891c17e3 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 18:34:23 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer-api/src/main/resources/application.yml | 5 ++--- common-api/src/main/resources/application.yml | 4 ++-- config/application.yml | 2 +- consumer/src/main/resources/application.yml | 4 ++-- manager-api/src/main/resources/application.yml | 2 +- seller-api/src/main/resources/application.yml | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index 1a6abf136..43f1ad586 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/buyer-api/src/main/resources/application.yml @@ -110,7 +110,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: true + show: false # 忽略TOKEN 鉴权 的url ignored: @@ -176,8 +176,7 @@ logging: config: classpath:logback-spring.xml # 输出级别 level: - cn.lili: debug - org.hibernate: debug + root: error # org.springframework: debug file: # 指定路径 diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml index 5c35ef174..03760caf1 100644 --- a/common-api/src/main/resources/application.yml +++ b/common-api/src/main/resources/application.yml @@ -108,7 +108,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: true + show: false # 忽略鉴权url ignored: @@ -176,7 +176,7 @@ logging: config: classpath:logback-spring.xml # 输出级别 level: - cn.lili: info + root: error # org.hibernate: debug # org.springframework: debug file: diff --git a/config/application.yml b/config/application.yml index 796fb0eed..b20fa5a58 100644 --- a/config/application.yml +++ b/config/application.yml @@ -113,7 +113,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: true + show: false # 忽略鉴权url ignored: diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml index e142ef08c..a1125b895 100644 --- a/consumer/src/main/resources/application.yml +++ b/consumer/src/main/resources/application.yml @@ -111,7 +111,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: true + show: false # 忽略鉴权url ignored: @@ -179,7 +179,7 @@ logging: config: classpath:logback-spring.xml # 输出级别 level: - cn.lili: info + root: error # org.hibernate: debug # org.springframework: debug file: diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml index 1ecab32ae..e0d1fafa3 100644 --- a/manager-api/src/main/resources/application.yml +++ b/manager-api/src/main/resources/application.yml @@ -108,7 +108,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: true + show: false # 忽略鉴权url ignored: diff --git a/seller-api/src/main/resources/application.yml b/seller-api/src/main/resources/application.yml index 30690a2aa..a2cc60372 100644 --- a/seller-api/src/main/resources/application.yml +++ b/seller-api/src/main/resources/application.yml @@ -108,7 +108,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: true + show: false # 忽略鉴权url ignored: From cc7d2c0c82d20c8ee4d5e524a8511770dcb336fa Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 10 Jan 2022 18:55:37 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java index f6a56cd65..14101279c 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java @@ -109,7 +109,7 @@ public class TradeDTO implements Serializable { public MemberAddress getMemberAddress() { MemberAddress memberAddress = new MemberAddress(); memberAddress.setId("1376445134773682176"); - memberAddress.setConsigneeAddressIdPath("1371783040145031560,1371783040145031818,1371783040145031888,1371783040145031895"); + memberAddress.setConsigneeAddressIdPath("1401797451706269749,1401797451706270007,1401797451706270104,1401797451706270108"); memberAddress.setConsigneeAddressPath("河北省,廊坊市,三河市,燕郊镇"); memberAddress.setAlias("DEFAULT"); memberAddress.setMobile("13232323232"); From eddcbc2ecb44c6b50a232c0bfe18566aa94ce84f Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 11:12:19 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=AF=B9token?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application.yml | 2 +- .../java/cn/lili/event/MemberLoginEvent.java | 19 ++++++ .../cn/lili/event/MemberRegisterEvent.java | 2 +- .../cn/lili/event/impl/MemberExecute.java | 25 ++++++++ .../lili/listener/MemberMessageListener.java | 22 +++++++ .../java/cn/lili/common/enums/ResultCode.java | 3 +- .../token/base/AbstractTokenGenerate.java | 4 +- .../serviceimpl/ConnectServiceImpl.java | 6 +- .../member/serviceimpl/MemberServiceImpl.java | 62 +++++++++---------- .../member/token/MemberTokenGenerate.java | 18 ++++-- .../member/token/StoreTokenGenerate.java | 12 ++-- .../serviceimpl/AdminUserServiceImpl.java | 2 +- .../system/token/ManagerTokenGenerate.java | 14 ++--- .../cn/lili/rocketmq/tags/MemberTagsEnum.java | 4 ++ 14 files changed, 136 insertions(+), 59 deletions(-) create mode 100644 consumer/src/main/java/cn/lili/event/MemberLoginEvent.java create mode 100644 consumer/src/main/java/cn/lili/event/impl/MemberExecute.java diff --git a/config/application.yml b/config/application.yml index b20fa5a58..796fb0eed 100644 --- a/config/application.yml +++ b/config/application.yml @@ -113,7 +113,7 @@ spring: props: #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 sql: - show: false + show: true # 忽略鉴权url ignored: diff --git a/consumer/src/main/java/cn/lili/event/MemberLoginEvent.java b/consumer/src/main/java/cn/lili/event/MemberLoginEvent.java new file mode 100644 index 000000000..cc00c4005 --- /dev/null +++ b/consumer/src/main/java/cn/lili/event/MemberLoginEvent.java @@ -0,0 +1,19 @@ +package cn.lili.event; + +import cn.lili.modules.member.entity.dos.Member; + +/** + * 会员登录消息 + * + * @author Chopper + * @since 2020/11/17 7:13 下午 + */ +public interface MemberLoginEvent { + + /** + * 会员登录 + * + * @param member 会员 + */ + void memberLogin(Member member); +} diff --git a/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java b/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java index eef3231e3..1264468e9 100644 --- a/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java +++ b/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java @@ -11,7 +11,7 @@ import cn.lili.modules.member.entity.dos.Member; public interface MemberRegisterEvent { /** - * 会员登录 + * 会员注册 * * @param member 会员 */ diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java new file mode 100644 index 000000000..5411002f4 --- /dev/null +++ b/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java @@ -0,0 +1,25 @@ +package cn.lili.event.impl; + +import cn.lili.event.MemberLoginEvent; +import cn.lili.modules.member.entity.dos.Member; +import cn.lili.modules.member.service.MemberService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 会员自身业务 + * + * @author Chopper + * @version v1.0 + * 2022-01-11 11:08 + */ +@Service +public class MemberExecute implements MemberLoginEvent { + @Autowired + private MemberService memberService; + + @Override + public void memberLogin(Member member) { + memberService.updateById(member); + } +} diff --git a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java index 2e69d28a6..ab767f10c 100644 --- a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java @@ -1,6 +1,7 @@ package cn.lili.listener; import cn.hutool.json.JSONUtil; +import cn.lili.event.MemberLoginEvent; import cn.lili.event.MemberPointChangeEvent; import cn.lili.event.MemberRegisterEvent; import cn.lili.event.MemberWithdrawalEvent; @@ -51,6 +52,12 @@ public class MemberMessageListener implements RocketMQListener { @Autowired private List memberSignEvents; + /** + * 会员注册 + */ + @Autowired + private List memberLoginEvents; + @Override public void onMessage(MessageExt messageExt) { @@ -69,6 +76,21 @@ public class MemberMessageListener implements RocketMQListener { } } break; + + case MEMBER_LOGIN: + + for (MemberLoginEvent memberLoginEvent : memberLoginEvents) { + try { + Member member = JSONUtil.toBean(new String(messageExt.getBody()), Member.class); + memberLoginEvent.memberLogin(member); + } catch (Exception e) { + log.error("会员{},在{}业务中，状态修改事件执行异常", + new String(messageExt.getBody()), + memberLoginEvent.getClass().getName(), + e); + } + } + break; //会员签到 case MEMBER_SING: MemberSign memberSign = JSONUtil.toBean(new String(messageExt.getBody()), MemberSign.class); diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 6b621a35d..b335862df 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -115,8 +115,7 @@ public enum ResultCode { USER_AUTH_EXPIRED(20004, "用户已退出，请重新登录"), USER_AUTHORITY_ERROR(20005, "权限不足"), USER_CONNECT_LOGIN_ERROR(20006, "未找到登录信息"), - USER_NAME_EXIST(20007, "该用户名已被注册"), - USER_PHONE_EXIST(20008, "该手机号已被注册"), + USER_EXIST(20008, "该用户名或手机号已被注册"), USER_PHONE_NOT_EXIST(20009, "手机号不存在"), USER_PASSWORD_ERROR(20010, "密码不正确"), USER_NOT_PHONE(20011, "非当前用户的手机号"), diff --git a/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java index 48418b651..67865f2d8 100644 --- a/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java @@ -16,11 +16,11 @@ public abstract class AbstractTokenGenerate { /** * 生成token * - * @param username 用户名 + * @param user 用户名 * @param longTerm 是否长时间有效 * @return TOKEN对象 */ - public abstract Token createToken(String username, Boolean longTerm); + public abstract Token createToken(Object user, Boolean longTerm); /** * 刷新token diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 0d0b1ab2e..a71f8f794 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -87,7 +87,7 @@ public class ConnectServiceImpl extends ServiceImpl impl this.remove(queryWrapper); throw new NoPermissionException("未绑定用户"); } - return memberTokenGenerate.createToken(member.getUsername(), longTerm); + return memberTokenGenerate.createToken(member, longTerm); } catch (NoPermissionException e) { throw e; } @@ -222,7 +222,7 @@ public class ConnectServiceImpl extends ServiceImpl impl //如果不存在会员，则进行绑定微信openid 和 unionid，并且登录 if (member != null) { bindMpMember(openId, unionId, member); - return memberTokenGenerate.createToken(member.getUsername(), true); + return memberTokenGenerate.createToken(member, true); } //如果没有会员，则根据手机号注册会员 @@ -230,7 +230,7 @@ public class ConnectServiceImpl extends ServiceImpl impl memberService.save(newMember); newMember = memberService.findByUsername(newMember.getUsername()); bindMpMember(openId, unionId, newMember); - return memberTokenGenerate.createToken(newMember.getUsername(), true); + return memberTokenGenerate.createToken(newMember, true); } @Override diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index bb9937502..aaebfe373 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -17,6 +17,7 @@ import cn.lili.common.security.token.Token; import cn.lili.common.sensitive.SensitiveWordsFilter; import cn.lili.common.utils.BeanUtil; import cn.lili.common.utils.CookieUtil; +import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.UuidUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.connect.config.ConnectAuthEnum; @@ -143,7 +144,7 @@ public class MemberServiceImpl extends ServiceImpl impleme // throw new ServiceException(ResultCode.USER_PASSWORD_ERROR); // } // loginBindUser(member); - return memberTokenGenerate.createToken(member.getUsername(), false); + return memberTokenGenerate.createToken(member, false); } @Override @@ -168,7 +169,7 @@ public class MemberServiceImpl extends ServiceImpl impleme throw new ServiceException(ResultCode.USER_NOT_EXIST); } - return storeTokenGenerate.createToken(member.getUsername(), false); + return storeTokenGenerate.createToken(member, false); } /** @@ -196,12 +197,10 @@ public class MemberServiceImpl extends ServiceImpl impleme String username = UuidUtils.getUUID(); Member member = new Member(username, UuidUtils.getUUID(), authUser.getAvatar(), authUser.getNickname(), authUser.getGender() != null ? Convert.toInt(authUser.getGender().getCode()) : 0); - //保存会员 - this.save(member); - Member loadMember = this.findByUsername(username); + registerHandler(member); //绑定登录方式 - loginBindUser(loadMember, authUser.getUuid(), authUser.getSource()); - return memberTokenGenerate.createToken(username, false); + loginBindUser(member, authUser.getUuid(), authUser.getSource()); + return memberTokenGenerate.createToken(member, false); } catch (ServiceException e) { log.error("自动注册服务泡出异常：", e); throw e; @@ -235,13 +234,23 @@ public class MemberServiceImpl extends ServiceImpl impleme //如果手机号不存在则自动注册用户 if (member == null) { member = new Member(mobilePhone, UuidUtils.getUUID(), mobilePhone); - //保存会员 - this.save(member); - String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); - rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); + registerHandler(member); } loginBindUser(member); - return memberTokenGenerate.createToken(member.getUsername(), false); + return memberTokenGenerate.createToken(member, false); + } + + /** + * 注册方法抽象 + * + * @param member + */ + private void registerHandler(Member member) { + member.setId(SnowFlake.getIdStr()); + //保存会员 + this.save(member); + String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); + rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); } @Override @@ -281,13 +290,9 @@ public class MemberServiceImpl extends ServiceImpl impleme //设置会员信息 Member member = new Member(userName, new BCryptPasswordEncoder().encode(password), mobilePhone); //注册成功后用户自动登录 - if (this.save(member)) { - Token token = memberTokenGenerate.createToken(member.getUsername(), false); - String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); - rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); - return token; - } - return null; + registerHandler(member); + Token token = memberTokenGenerate.createToken(member, false); + return token; } @Override @@ -331,9 +336,7 @@ public class MemberServiceImpl extends ServiceImpl impleme //添加会员 Member member = new Member(memberAddDTO.getUsername(), new BCryptPasswordEncoder().encode(memberAddDTO.getPassword()), memberAddDTO.getMobile()); - this.save(member); - String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); - rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); + registerHandler(member); return member; } @@ -430,10 +433,11 @@ public class MemberServiceImpl extends ServiceImpl impleme * @param mobilePhone 手机号 * @return 会员 */ - private Member findByPhone(String mobilePhone) { + private List findMember(String mobilePhone, String userName) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("mobile", mobilePhone); - return this.baseMapper.selectOne(queryWrapper); + queryWrapper.eq("mobile", mobilePhone) + .or().eq("username", userName); + return this.baseMapper.selectList(queryWrapper); } /** @@ -589,13 +593,9 @@ public class MemberServiceImpl extends ServiceImpl impleme * @param mobilePhone 手机号 */ private void checkMember(String userName, String mobilePhone) { - //判断用户名是否存在 - if (findByUsername(userName) != null) { - throw new ServiceException(ResultCode.USER_NAME_EXIST); - } //判断手机号是否存在 - if (findByPhone(mobilePhone) != null) { - throw new ServiceException(ResultCode.USER_PHONE_EXIST); + if (findMember(userName, mobilePhone) != null) { + throw new ServiceException(ResultCode.USER_EXIST); } } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java index 79528c99c..bd065b3bc 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java @@ -1,5 +1,6 @@ package cn.lili.modules.member.token; +import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.token.Token; @@ -9,6 +10,9 @@ import cn.lili.common.context.ThreadContextHolder; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +import cn.lili.rocketmq.tags.MemberTagsEnum; +import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -28,11 +32,16 @@ public class MemberTokenGenerate extends AbstractTokenGenerate { private MemberService memberService; @Autowired private TokenUtil tokenUtil; + @Autowired + private RocketmqCustomProperties rocketmqCustomProperties; + + @Autowired + private RocketMQTemplate rocketMQTemplate; @Override - public Token createToken(String username, Boolean longTerm) { + public Token createToken(Object user, Boolean longTerm) { - Member member = memberService.findByUsername(username); + Member member = (Member) user; //获取客户端类型 String clientType = ThreadContextHolder.getHttpRequest().getHeader("clientType"); @@ -50,11 +59,12 @@ public class MemberTokenGenerate extends AbstractTokenGenerate { //记录最后登录时间，客户端类型 member.setLastLoginDate(new Date()); member.setClientEnum(clientTypeEnum.name()); - memberService.updateById(member); + String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_LOGIN.name(); + rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); AuthUser authUser = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), member.getFace(), UserEnums.MEMBER); //登陆成功生成token - return tokenUtil.createToken(username, authUser, longTerm, UserEnums.MEMBER); + return tokenUtil.createToken(member.getUsername(), authUser, longTerm, UserEnums.MEMBER); } @Override diff --git a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java index a1a2c5955..072407fc1 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java @@ -32,20 +32,20 @@ public class StoreTokenGenerate extends AbstractTokenGenerate { private TokenUtil tokenUtil; @Override - public Token createToken(String username, Boolean longTerm) { + public Token createToken(Object user, Boolean longTerm) { //生成token - Member member = memberService.findByUsername(username); + Member member = (Member) user; if (!member.getHaveStore()) { throw new ServiceException(ResultCode.STORE_NOT_OPEN); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Store::getMemberId, member.getId()); Store store = storeService.getOne(queryWrapper); - AuthUser user = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), store.getStoreLogo(), UserEnums.STORE); + AuthUser authUser = new AuthUser(member.getUsername(), member.getId(), member.getNickName(), store.getStoreLogo(), UserEnums.STORE); - user.setStoreId(store.getId()); - user.setStoreName(store.getStoreName()); - return tokenUtil.createToken(username, user, longTerm, UserEnums.STORE); + authUser.setStoreId(store.getId()); + authUser.setStoreName(store.getStoreName()); + return tokenUtil.createToken(member.getUsername(), authUser, longTerm, UserEnums.STORE); } @Override diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index 7bd421b32..f1b92e8c5 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -119,7 +119,7 @@ public class AdminUserServiceImpl extends ServiceImpl userMenuVOList = roleMenuService.findAllMenu(user.getId()); + List userMenuVOList = roleMenuService.findAllMenu(authUser.getId()); //缓存权限列表 - cache.put(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + user.getId(), this.permissionList(userMenuVOList)); + cache.put(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId(), this.permissionList(userMenuVOList)); - return tokenUtil.createToken(username, user, longTerm, UserEnums.MANAGER); + return tokenUtil.createToken(adminUser.getUsername(), authUser, longTerm, UserEnums.MANAGER); } @Override diff --git a/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java index 0d8c02a27..a179f5a88 100644 --- a/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java @@ -11,6 +11,10 @@ public enum MemberTagsEnum { * 会员注册 */ MEMBER_REGISTER("会员注册"), + /** + * 会员注册 + */ + MEMBER_LOGIN("会员登录"), /** * 会员签到 */ From b0843aa744ad05b019b579e505d6977864803b89 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 11:16:17 +0800 Subject: [PATCH 11/20] =?UTF-8?q?token=E7=9B=B8=E5=85=B3=E7=B1=BB=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=B3=9B=E5=9E=8B=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/token/base/AbstractTokenGenerate.java | 4 ++-- .../lili/modules/member/token/MemberTokenGenerate.java | 9 ++------- .../cn/lili/modules/member/token/StoreTokenGenerate.java | 8 ++------ .../lili/modules/system/token/ManagerTokenGenerate.java | 6 ++---- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java index 67865f2d8..2002baa79 100644 --- a/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java @@ -11,7 +11,7 @@ import cn.lili.common.security.token.Token; * @version v1.0 * 2020-11-13 10:13 */ -public abstract class AbstractTokenGenerate { +public abstract class AbstractTokenGenerate { /** * 生成token @@ -20,7 +20,7 @@ public abstract class AbstractTokenGenerate { * @param longTerm 是否长时间有效 * @return TOKEN对象 */ - public abstract Token createToken(Object user, Boolean longTerm); + public abstract Token createToken(T user, Boolean longTerm); /** * 刷新token diff --git a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java index bd065b3bc..d903d5495 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java @@ -26,10 +26,7 @@ import java.util.Date; * @since 2020/11/16 10:50 */ @Component -public class MemberTokenGenerate extends AbstractTokenGenerate { - - @Autowired - private MemberService memberService; +public class MemberTokenGenerate extends AbstractTokenGenerate { @Autowired private TokenUtil tokenUtil; @Autowired @@ -39,9 +36,7 @@ public class MemberTokenGenerate extends AbstractTokenGenerate { private RocketMQTemplate rocketMQTemplate; @Override - public Token createToken(Object user, Boolean longTerm) { - - Member member = (Member) user; + public Token createToken(Member member, Boolean longTerm) { //获取客户端类型 String clientType = ThreadContextHolder.getHttpRequest().getHeader("clientType"); diff --git a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java index 072407fc1..558289df4 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java @@ -23,18 +23,14 @@ import org.springframework.stereotype.Component; * @since 2020/11/16 10:51 */ @Component -public class StoreTokenGenerate extends AbstractTokenGenerate { - @Autowired - private MemberService memberService; +public class StoreTokenGenerate extends AbstractTokenGenerate { @Autowired private StoreService storeService; @Autowired private TokenUtil tokenUtil; @Override - public Token createToken(Object user, Boolean longTerm) { - //生成token - Member member = (Member) user; + public Token createToken(Member member, Boolean longTerm) { if (!member.getHaveStore()) { throw new ServiceException(ResultCode.STORE_NOT_OPEN); } diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index 3b14383ee..cef1db51c 100644 --- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -29,7 +29,7 @@ import java.util.Map; * @since 2020/11/16 10:51 */ @Component -public class ManagerTokenGenerate extends AbstractTokenGenerate { +public class ManagerTokenGenerate extends AbstractTokenGenerate { @Autowired private TokenUtil tokenUtil; @@ -40,9 +40,7 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { @Override - public Token createToken(Object user, Boolean longTerm) { - //生成token - AdminUser adminUser = (AdminUser) user; + public Token createToken(AdminUser adminUser, Boolean longTerm) { AuthUser authUser = new AuthUser(adminUser.getUsername(), adminUser.getId(), adminUser.getAvatar(), UserEnums.MANAGER, adminUser.getNickName(), adminUser.getIsSuper()); From 4a3c978e073484ea8f4ec566b7f73a59a88c9fbe Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 11:23:38 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index aaebfe373..5902d3fbc 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -593,8 +593,9 @@ public class MemberServiceImpl extends ServiceImpl impleme * @param mobilePhone 手机号 */ private void checkMember(String userName, String mobilePhone) { + List members = findMember(userName, mobilePhone); //判断手机号是否存在 - if (findMember(userName, mobilePhone) != null) { + if (members != null && !members.isEmpty()) { throw new ServiceException(ResultCode.USER_EXIST); } } From 5f0241768d553bf253a47edc8d4ea40bb6e54865 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 14:48:11 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java index ff5dd16cc..eaafccf09 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java @@ -27,7 +27,6 @@ import java.util.Objects; * @since 2020/11/18 10:46 上午 */ @Service -@Transactional(rollbackFor = Exception.class) public class FootprintServiceImpl extends ServiceImpl implements FootprintService { /** From eec361121868437633863d449aefb77318cdb48c Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 15:16:02 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E4=BC=98=E5=8C=96sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/member/mapper/FootprintMapper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java index ecfee4c74..6638d6181 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java @@ -34,8 +34,9 @@ public interface FootprintMapper extends BaseMapper { * * @param memberId 会员ID */ - @Delete("DELETE FROM li_foot_print WHERE (SELECT COUNT(b.id) FROM ( SELECT * FROM li_foot_print WHERE member_id = #{memberId} ) b) >100 " + - " AND id =(SELECT a.id FROM ( SELECT * FROM li_foot_print WHERE member_id = #{memberId} ORDER BY create_time ASC LIMIT 1 ) AS a)") + @Delete("DELETE FROM li_foot_print l1 WHERE l1.id IN (" + + "SELECT l2.id FROM (" + + "SELECT l3.id FROM li_foot_print l3 WHERE l3.member_id=${memberId} ORDER BY id DESC LIMIT 100,100) l2)") void deleteLastFootPrint(String memberId); } \ No newline at end of file From 0460e219f9ca61a3f71c1a3b0c08f288a6be607f Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 16:34:18 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E5=87=8F=E5=B0=91=E4=B8=80=E6=AC=A1redis?= =?UTF-8?q?=E7=9A=84=E8=AF=BB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application.yml | 2 +- .../modules/order/cart/render/TradeBuilder.java | 15 ++++++++------- .../order/cart/service/CartServiceImpl.java | 4 +--- .../order/order/serviceimpl/TradeServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/config/application.yml b/config/application.yml index 796fb0eed..5021c081f 100644 --- a/config/application.yml +++ b/config/application.yml @@ -183,7 +183,7 @@ mybatis-plus: logging: # 输出级别 level: - cn.lili: info + root: error # org.hibernate: debug # org.springframework: debug # org.springframework.data.mongodb.core: debug diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java index b67959f7e..d6d777846 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -85,19 +86,17 @@ public class TradeBuilder { * 1.构造交易 * 2.创建交易 * - * @param checkedWay 购物车类型 + * @param tradeDTO 交易模型 * @return 交易信息 */ - public Trade createTrade(CartTypeEnum checkedWay) { - //读取对应购物车的商品信息 - TradeDTO tradeDTO = cartService.readDTO(checkedWay); + public Trade createTrade(TradeDTO tradeDTO) { //需要对购物车渲染 - if (isSingle(checkedWay)) { + if (isSingle(tradeDTO.getCartTypeEnum())) { renderCartBySteps(tradeDTO, RenderStepStatement.singleTradeRender); - } else if (checkedWay.equals(CartTypeEnum.PINTUAN)) { + } else if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.PINTUAN)) { renderCartBySteps(tradeDTO, RenderStepStatement.pintuanTradeRender); - } else { + } else { renderCartBySteps(tradeDTO, RenderStepStatement.tradeRender); } @@ -128,7 +127,9 @@ public class TradeBuilder { for (CartRenderStep render : cartRenderSteps) { try { if (render.step().equals(step)) { + Date date = new Date(); render.render(tradeDTO); + log.error(render.getClass().getName() + "-" + (System.currentTimeMillis() - date.getTime())); } } catch (ServiceException e) { throw e; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index c6938fa5c..52808dbfb 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -552,10 +552,8 @@ public class CartServiceImpl implements CartService { if (tradeDTO.getMemberAddress() == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } - //将购物车信息写入缓存，后续逻辑调用校验 - this.resetTradeDTO(tradeDTO); //构建交易 - Trade trade = tradeBuilder.createTrade(cartTypeEnum); + Trade trade = tradeBuilder.createTrade(tradeDTO); this.cleanChecked(tradeDTO); return trade; } diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java index f7dbbd882..ef47d67d0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java @@ -1 +1 @@ -package cn.lili.modules.order.order.serviceimpl; import cn.hutool.json.JSONUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.entity.dos.KanjiaActivity; import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.KanjiaActivityService; import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.OrderTagsEnum; 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 org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * 砍价 */ @Autowired private KanjiaActivityService kanjiaActivityService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //优惠券预处理 couponPretreatment(tradeDTO); //积分预处理 pointPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //砍价订单处理 kanjiaPretreatment(tradeDTO); //写入缓存，给消费者调用 cache.put(key, JSONUtil.toJsonStr(tradeDTO)); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } //订单配送区域校验 if (tradeDTO.getNotSupportFreight() != null && !tradeDTO.getNotSupportFreight().isEmpty()) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> stringBuilder.append(sku.getGoodsSku().getGoodsName())); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } /** * 创建交易，积分处理 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { //需要支付积分 if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO().getPayPoint().longValue(), PointTypeEnum.REDUCE.name(), tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 创建交易、砍价处理 * * @param tradeDTO */ private void kanjiaPretreatment(TradeDTO tradeDTO) { if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.KANJIA)) { String kanjiaId = tradeDTO.getSkuList().get(0).getKanjiaId(); kanjiaActivityService.update(new LambdaUpdateWrapper() .eq(KanjiaActivity::getId, kanjiaId) .set(KanjiaActivity::getStatus, KanJiaStatusEnum.END.name())); } } } \ No newline at end of file +package cn.lili.modules.order.order.serviceimpl; import cn.hutool.json.JSONUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.entity.dos.KanjiaActivity; import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.KanjiaActivityService; import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.OrderTagsEnum; 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 org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * 砍价 */ @Autowired private KanjiaActivityService kanjiaActivityService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //优惠券预处理 couponPretreatment(tradeDTO); //积分预处理 pointPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //砍价订单处理 kanjiaPretreatment(tradeDTO); //写入缓存，给消费者调用 cache.put(key, JSONUtil.toJsonStr(tradeDTO)); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 如果包含不支持配送的商品 抛出异常 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //订单配送区域校验 if (tradeDTO.getNotSupportFreight() != null && !tradeDTO.getNotSupportFreight().isEmpty()) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> stringBuilder.append(sku.getGoodsSku().getGoodsName())); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } /** * 创建交易，积分处理 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { //需要支付积分 if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO().getPayPoint().longValue(), PointTypeEnum.REDUCE.name(), tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 创建交易、砍价处理 * * @param tradeDTO */ private void kanjiaPretreatment(TradeDTO tradeDTO) { if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.KANJIA)) { String kanjiaId = tradeDTO.getSkuList().get(0).getKanjiaId(); kanjiaActivityService.update(new LambdaUpdateWrapper() .eq(KanjiaActivity::getId, kanjiaId) .set(KanjiaActivity::getStatus, KanJiaStatusEnum.END.name())); } } } \ No newline at end of file From 05818baf7a4dad1fb9e38156f975edbb103dd385 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 11 Jan 2022 17:34:48 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E8=B7=AF=E5=9F=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer-api/src/main/resources/application.yml | 6 +++--- config/application.yml | 4 ++-- .../modules/goods/service/CategoryService.java | 15 +++++++++++++++ .../goods/serviceimpl/CategoryServiceImpl.java | 5 +++++ .../modules/order/cart/render/TradeBuilder.java | 2 -- .../order/cart/render/impl/CommissionRender.java | 2 +- .../store/service/FreightTemplateService.java | 7 +++++++ 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index 43f1ad586..246a0680c 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/buyer-api/src/main/resources/application.yml @@ -69,10 +69,10 @@ spring: url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: lilishop - maxActive: 20 - initialSize: 5 + maxActive: 50 + initialSize: 10 maxWait: 60000 - minIdle: 5 + minIdle: 10 timeBetweenEvictionRunsMillis: 60000 minEvictableIdleTimeMillis: 300000 validationQuery: SELECT 1 FROM DUAL diff --git a/config/application.yml b/config/application.yml index 5021c081f..0753c11fb 100644 --- a/config/application.yml +++ b/config/application.yml @@ -72,8 +72,8 @@ spring: url: jdbc:mysql://192.168.0.116:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: lilishop - maxActive: 20 - initialSize: 5 + maxActive: 50 + initialSize: 20 maxWait: 60000 minIdle: 5 timeBetweenEvictionRunsMillis: 60000 diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java index 4069d49d4..519b0c961 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java @@ -4,7 +4,11 @@ package cn.lili.modules.goods.service; import cn.lili.modules.goods.entity.dos.Category; import cn.lili.modules.goods.entity.vos.CategoryVO; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import java.io.Serializable; import java.util.List; /** @@ -13,6 +17,7 @@ import java.util.List; * @author pikachu * @since 2020-03-02 16:44:56 */ +@CacheConfig(cacheNames = "{category}") public interface CategoryService extends IService { @@ -25,6 +30,15 @@ public interface CategoryService extends IService { */ List dbList(String parentId); + /** + * 获取分类 + * + * @param id + * @return + */ + @Cacheable(key = "#id") + Category getCategoryById(String id); + /** * 根据分类id集合获取所有分类根据层级排序 * @@ -86,6 +100,7 @@ public interface CategoryService extends IService { * @param category 商品分类信息 * @return 修改结果 */ + @CacheEvict(key = "#category.id") void updateCategory(Category category); /** diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index ab31d9837..e7c5dee0e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -60,6 +60,11 @@ public class CategoryServiceImpl extends ServiceImpl i return this.list(new LambdaQueryWrapper().eq(Category::getParentId, parentId)); } + @Override + public Category getCategoryById(String id) { + return this.getById(id); + } + /** * 根据分类id集合获取所有分类根据层级排序 * diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java index d6d777846..94655e3a3 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java @@ -127,9 +127,7 @@ public class TradeBuilder { for (CartRenderStep render : cartRenderSteps) { try { if (render.step().equals(step)) { - Date date = new Date(); render.render(tradeDTO); - log.error(render.getClass().getName() + "-" + (System.currentTimeMillis() - date.getTime())); } } catch (ServiceException e) { throw e; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java index 4df13428c..f7e7bf551 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java @@ -66,7 +66,7 @@ public class CommissionRender implements CartRenderStep { String categoryId = cartSkuVO.getGoodsSku().getCategoryPath() .substring(cartSkuVO.getGoodsSku().getCategoryPath().lastIndexOf(",") + 1); if (CharSequenceUtil.isNotEmpty(categoryId)) { - Double commissionRate = categoryService.getById(categoryId).getCommissionRate(); + Double commissionRate = categoryService.getCategoryById(categoryId).getCommissionRate(); priceDetailDTO.setPlatFormCommissionPoint(commissionRate); } diff --git a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java index 75225f999..7cebb9832 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java @@ -5,6 +5,9 @@ import cn.lili.modules.store.entity.dos.FreightTemplate; import cn.lili.modules.store.entity.vos.FreightTemplateVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; import java.util.List; @@ -14,6 +17,7 @@ import java.util.List; * @author Bulbasaur * @since 2020-03-07 09:24:33 */ +@CacheConfig(cacheNames = "{freightTemplate}") public interface FreightTemplateService extends IService { /** @@ -38,6 +42,7 @@ public interface FreightTemplateService extends IService { * @param id 运费模板ID * @return 运费模板 */ + @Cacheable(key = "#id") FreightTemplateVO getFreightTemplate(String id); /** @@ -55,6 +60,7 @@ public interface FreightTemplateService extends IService { * @param freightTemplateVO 运费模板 * @return 运费模板 */ + @CacheEvict(key = "#freightTemplateVO.id") FreightTemplateVO editFreightTemplate(FreightTemplateVO freightTemplateVO); /** @@ -64,6 +70,7 @@ public interface FreightTemplateService extends IService { * @param id 运费模板ID * @return 操作状态 */ + @CacheEvict(key = "#freightTemplateVO.id") boolean removeFreightTemplate(String id); } \ No newline at end of file From 65e7f9750a98aab7cecb7cbd5d58da4706346dd8 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 12 Jan 2022 11:20:27 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96uuid?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E4=B8=BA=E5=8E=8B=E6=B5=8B?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84=E5=90=8C=E4=B8=80token=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/controller/common/UploadController.java | 3 --- .../lili/common/security/context/UserContext.java | 14 ++++++++++++++ .../lili/common/security/enums/SecurityEnum.java | 2 +- .../order/cart/service/CartServiceImpl.java | 5 +++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 38d3cd0d3..b78b50328 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -52,9 +52,6 @@ public class UploadController { @Autowired private Cache cache; - @Autowired - private SystemSettingProperties systemSettingProperties; - @ApiOperation(value = "文件上传") @PostMapping(value = "/file") public ResultMessage upload(MultipartFile file, diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java index 6fdd63783..6ecf8ee62 100644 --- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java +++ b/framework/src/main/java/cn/lili/common/security/context/UserContext.java @@ -37,6 +37,20 @@ public class UserContext { return null; } + /** + * 根据request获取用户信息 + * + * @return 授权用户 + */ + public static String getUuid() { + if (RequestContextHolder.getRequestAttributes() != null) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String uuid = request.getHeader(SecurityEnum.UUID.getValue()); + return uuid; + } + return null; + } + /** * 根据jwt获取token重的用户信息 diff --git a/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java b/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java index 4d27d9418..c89a3f4b8 100644 --- a/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java +++ b/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java @@ -10,7 +10,7 @@ public enum SecurityEnum { /** * 存在与header中的token参数头 名 */ - HEADER_TOKEN("accessToken"), USER_CONTEXT("userContext"), JWT_SECRET("secret"); + HEADER_TOKEN("accessToken"), USER_CONTEXT("userContext"), JWT_SECRET("secret"), UUID("uuid"); String value; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 52808dbfb..bf975b0a6 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -229,8 +229,9 @@ public class CartServiceImpl implements CartService { //缓存key，默认使用购物车 if (cartTypeEnum != null) { - AuthUser currentUser = UserContext.getCurrentUser(); - return cartTypeEnum.getPrefix() + currentUser.getId(); +// AuthUser currentUser = UserContext.getCurrentUser(); +// return cartTypeEnum.getPrefix() + currentUser.getId(); + return cartTypeEnum.getPrefix() + UserContext.getUuid(); } throw new ServiceException(ResultCode.ERROR); } From 575458afb39b26874fcc4bb582692e03a20a80fd Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 18 Jan 2022 09:50:26 +0800 Subject: [PATCH 18/20] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E9=99=A4=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E4=BA=8B=E5=8A=A1=202=E3=80=81=E5=AF=B9?= =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=A4=9A=E8=8A=82=E7=82=B9=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E6=97=B6=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9B=B8=E5=90=8C=E7=9A=84=E9=9B=AA=E8=8A=B1=E7=AE=97?= =?UTF-8?q?=E6=B3=95id=E9=97=AE=E9=A2=98=E8=BF=9B=E8=A1=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=203=E3=80=81=E5=85=B6=E4=BB=96=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/RechargeTradeBuyerController.java | 1 - .../MemberWithdrawApplyBuyerController.java | 1 - .../wallet/RechargeBuyerController.java | 1 - buyer-api/src/main/resources/application.yml | 19 ++++-- .../src/main/java/cn/lili/cache/Cache.java | 8 +++ .../java/cn/lili/cache/impl/RedisCache.java | 10 +++- .../java/cn/lili/common/utils/SnowFlake.java | 33 ++++++++--- .../lili/common/utils/SnowflakeInitiator.java | 58 +++++++++++++++++++ .../DistributionCashServiceImpl.java | 1 - .../DistributionGoodsServiceImpl.java | 1 - .../DistributionOrderServiceImpl.java | 1 - .../DistributionSelectedGoodsServiceImpl.java | 1 - .../serviceimpl/DistributionServiceImpl.java | 1 - .../file/serviceimpl/FileServiceImpl.java | 1 - .../goods/serviceimpl/BrandServiceImpl.java | 1 - .../serviceimpl/CategoryBrandServiceImpl.java | 1 - .../CategoryParameterGroupServiceImpl.java | 1 - .../serviceimpl/CategoryServiceImpl.java | 1 - .../CategorySpecificationServiceImpl.java | 1 - .../serviceimpl/DraftGoodsServiceImpl.java | 1 - .../serviceimpl/GoodsGalleryServiceImpl.java | 1 - .../goods/serviceimpl/GoodsServiceImpl.java | 1 - .../serviceimpl/GoodsSkuServiceImpl.java | 1 - .../serviceimpl/GoodsWordsServiceImpl.java | 1 - .../StoreGoodsLabelServiceImpl.java | 1 - .../GoodsCollectionServiceImpl.java | 1 - .../serviceimpl/MemberAddressServiceImpl.java | 1 - .../MemberEvaluationServiceImpl.java | 1 - .../member/serviceimpl/MemberServiceImpl.java | 8 +-- .../serviceimpl/MessageServiceImpl.java | 1 - .../serviceimpl/ShortLinkServiceImpl.java | 1 - .../serviceimpl/AfterSaleLogServiceImpl.java | 1 - .../AfterSaleReasonServiceImpl.java | 1 - .../serviceimpl/AfterSaleServiceImpl.java | 1 - .../serviceimpl/OrderItemServiceImpl.java | 1 - .../serviceimpl/OrderPriceServiceImpl.java | 1 - .../order/serviceimpl/OrderServiceImpl.java | 2 +- .../serviceimpl/StoreFlowServiceImpl.java | 1 - .../order/serviceimpl/TradeServiceImpl.java | 2 +- .../ArticleCategoryServiceImpl.java | 1 - .../page/serviceimpl/ArticleServiceImpl.java | 1 - .../page/serviceimpl/FeedbackServiceImpl.java | 1 - .../serviceimpl/PaymentServiceImpl.java | 1 - .../serviceimpl/RefundLogServiceImpl.java | 1 - .../serviceimpl/AdminUserServiceImpl.java | 1 - .../DepartmentRoleServiceImpl.java | 1 - .../serviceimpl/DepartmentServiceImpl.java | 1 - .../serviceimpl/RoleMenuServiceImpl.java | 1 - .../serviceimpl/RoleServiceImpl.java | 1 - .../serviceimpl/SystemLogServiceImpl.java | 1 - .../serviceimpl/UserRoleServiceImpl.java | 1 - .../AbstractPromotionsServiceImpl.java | 1 - .../serviceimpl/CouponServiceImpl.java | 1 - .../serviceimpl/FullDiscountServiceImpl.java | 1 - .../KanjiaActivityGoodsServiceImpl.java | 1 - .../KanjiaActivityLogServiceImpl.java | 1 - .../KanjiaActivityServiceImpl.java | 1 - .../serviceimpl/MemberCouponServiceImpl.java | 1 - .../serviceimpl/PintuanServiceImpl.java | 1 - .../PointsGoodsCategoryServiceImpl.java | 1 - .../serviceimpl/PointsGoodsServiceImpl.java | 1 - .../PromotionGoodsServiceImpl.java | 1 - .../serviceimpl/PromotionServiceImpl.java | 1 - .../serviceimpl/SeckillApplyServiceImpl.java | 1 - .../serviceimpl/SeckillServiceImpl.java | 1 - .../aop/aspect/PageViewInterceptor.java | 2 - .../BillStatisticsServiceImpl.java | 1 - ...DistributionCashStatisticsServiceImpl.java | 1 - ...MemberEvaluationStatisticsServiceImpl.java | 1 - .../SeckillStatisticsServiceImpl.java | 1 - .../store/serviceimpl/BillServiceImpl.java | 1 - .../FreightTemplateServiceChildImpl.java | 1 - .../FreightTemplateServiceImpl.java | 1 - .../serviceimpl/StoreAddressServiceImpl.java | 1 - .../serviceimpl/StoreDetailServiceImpl.java | 1 - .../store/serviceimpl/StoreServiceImpl.java | 1 - .../serviceimpl/AppVersionServiceImpl.java | 1 - .../system/serviceimpl/RegionServiceImpl.java | 1 - .../impl/VerificationSourceServiceImpl.java | 1 - .../serviceimpl/MemberWalletServiceImpl.java | 1 - .../MemberWithdrawApplyServiceImpl.java | 1 - .../serviceimpl/RechargeServiceImpl.java | 1 - .../serviceimpl/WalletLogServiceImpl.java | 1 - .../WechatMPMessageServiceImpl.java | 1 - .../serviceimpl/WechatMessageServiceImpl.java | 1 - .../java/cn/lili/test/script/ScriptTest.java | 1 - .../MemberMessageManagerController.java | 1 - .../order/OrderLogManagerController.java | 1 - .../order/PaymentLogManagerController.java | 1 - .../order/RefundLogManagerController.java | 1 - .../other/VerificationSourceController.java | 1 - .../passport/AdminUserManagerController.java | 1 - .../setting/LogManagerController.java | 1 - .../setting/RegionManagerController.java | 1 - .../store/StoreMessageManagerController.java | 1 - .../MemberWithdrawApplyManagerController.java | 1 - .../wallet/RechargeManagerController.java | 1 - .../wallet/WalletLogManagerController.java | 1 - .../WechatMPMessageManagerController.java | 1 - ...CategoryParameterGroupStoreController.java | 1 - .../CategorySpecificationStoreController.java | 1 - .../goods/CategoryStoreController.java | 1 - .../goods/GoodsUnitStoreController.java | 1 - .../settings/LogStoreController.java | 1 - 104 files changed, 116 insertions(+), 121 deletions(-) create mode 100644 framework/src/main/java/cn/lili/common/utils/SnowflakeInitiator.java diff --git a/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java index 81c38bb21..6071e61b3 100644 --- a/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java @@ -26,7 +26,6 @@ import javax.validation.constraints.Min; @RestController @Api(tags = "买家端,预存款充值记录接口") @RequestMapping("/buyer/trade/recharge") -@Transactional(rollbackFor = Exception.class) public class RechargeTradeBuyerController { @Autowired diff --git a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java index 84bd1492d..7771443c7 100644 --- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,余额提现记录接口") @RequestMapping("/buyer/member/withdrawApply") -@Transactional(rollbackFor = Exception.class) public class MemberWithdrawApplyBuyerController { @Autowired private MemberWithdrawApplyService memberWithdrawApplyService; diff --git a/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java index f4b8d7d9d..1b4d896b6 100644 --- a/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "买家端,预存款充值记录接口") @RequestMapping("/buyer/member/recharge") -@Transactional(rollbackFor = Exception.class) public class RechargeBuyerController { @Autowired diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index 246a0680c..2f99a882e 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/buyer-api/src/main/resources/application.yml @@ -3,12 +3,19 @@ server: servlet: context-path: / - - tomcat: - uri-encoding: UTF-8 - threads: - min-spare: 50 - max: 1000 +# +# tomcat: +# #最大链接数，默认不设置，默认是10000 +# max-connections: 6500 +# #最大等待队列长度，允许HTTP请求缓存到请求队列的最大个数，默认不限制 +# accept-count: 1000 +# threads: +# #最少闲置 +# min-spare: 50 +# #最大线程数 ，默认是200 +# max: 800 + netty: + connection-timeout: # 与Spring Boot 2一样，默认情况下，大多数端点都不通过http公开，我们公开了所有端点。对于生产，您应该仔细选择要公开的端点。 management: diff --git a/framework/src/main/java/cn/lili/cache/Cache.java b/framework/src/main/java/cn/lili/cache/Cache.java index 7bd4d4815..0beaf69a1 100644 --- a/framework/src/main/java/cn/lili/cache/Cache.java +++ b/framework/src/main/java/cn/lili/cache/Cache.java @@ -211,6 +211,14 @@ public interface Cache { * @return 计数器结果 */ Long incr(String key, long liveTime); + /** + * redis 计数器 累加 + * 注：到达liveTime之后，该次增加取消，即自动-1，而不是redis值为空 + * + * @param key 为累计的key，同一key每次调用则值 +1 + * @return 计数器结果 + */ + Long incr(String key); //-----------------------------------------------redis计数--------------------------------------------- /** diff --git a/framework/src/main/java/cn/lili/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java index ade80a687..bbfb5c540 100644 --- a/framework/src/main/java/cn/lili/cache/impl/RedisCache.java +++ b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java @@ -80,7 +80,7 @@ public class RedisCache implements Cache { @Override public Boolean remove(Object key) { - return redisTemplate.delete(key); + return redisTemplate.delete(key); } /** @@ -207,13 +207,19 @@ public class RedisCache implements Cache { RedisAtomicLong entityIdCounter = new RedisAtomicLong(key, redisTemplate.getConnectionFactory()); Long increment = entityIdCounter.getAndIncrement(); //初始设置过期时间 - if ((null == increment || increment == 0) && liveTime > 0) { + if (increment == 0 && liveTime > 0) { entityIdCounter.expire(liveTime, TimeUnit.SECONDS); } return increment; } + @Override + public Long incr(String key) { + RedisAtomicLong entityIdCounter = new RedisAtomicLong(key, redisTemplate.getConnectionFactory()); + return entityIdCounter.getAndIncrement(); + } + /** * 使用Sorted Set记录keyword * zincrby命令，对于一个Sorted Set，存在的就把分数加x(x可自行设定)，不存在就创建一个分数为1的成员 diff --git a/framework/src/main/java/cn/lili/common/utils/SnowFlake.java b/framework/src/main/java/cn/lili/common/utils/SnowFlake.java index d7a788ccb..18379ea74 100644 --- a/framework/src/main/java/cn/lili/common/utils/SnowFlake.java +++ b/framework/src/main/java/cn/lili/common/utils/SnowFlake.java @@ -2,6 +2,7 @@ package cn.lili.common.utils; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.IdUtil; +import lombok.extern.slf4j.Slf4j; import java.util.Date; @@ -10,18 +11,30 @@ import java.util.Date; * * @author Chopper */ +@Slf4j public class SnowFlake { - /** - * 机器id - */ - private static long workerId = 0L; - /** - * 机房id - */ - private static long datacenterId = 0L; +// /** +// * 机器id +// */ +// private static long workerId = 0L; +// /** +// * 机房id +// */ +// public static long datacenterId = 0L; - private static Snowflake snowflake = IdUtil.createSnowflake(workerId, datacenterId); + private static Snowflake snowflake; + + /** + * 初始化配置 + * + * @param workerId + * @param datacenterId + */ + public static void initialize(long workerId, long datacenterId) { + snowflake = IdUtil.getSnowflake(workerId, datacenterId); + log.error(workerId+""+datacenterId); + } public static long getId() { return snowflake.nextId(); @@ -29,12 +42,14 @@ public class SnowFlake { /** * 生成字符，带有前缀 + * * @param prefix * @return */ public static String createStr(String prefix) { return prefix + DateUtil.toString(new Date(), "yyyyMMdd") + SnowFlake.getId(); } + public static String getIdStr() { return snowflake.nextId() + ""; } diff --git a/framework/src/main/java/cn/lili/common/utils/SnowflakeInitiator.java b/framework/src/main/java/cn/lili/common/utils/SnowflakeInitiator.java new file mode 100644 index 000000000..4a36af5cf --- /dev/null +++ b/framework/src/main/java/cn/lili/common/utils/SnowflakeInitiator.java @@ -0,0 +1,58 @@ +package cn.lili.common.utils; + +import cn.lili.cache.Cache; +import com.alibaba.fastjson.JSON; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.concurrent.TimeUnit; + +/** + * SnowflakeInitiator + * + * @author Chopper + * @version v1.0 + * 2022-01-14 14:04 + */ +@Component +@Slf4j +public class SnowflakeInitiator { + + /** + * 缓存前缀 + */ + private static String KEY = "{Snowflake}"; + + @Autowired + private Cache cache; + + /** + * 尝试初始化 + * + * @return + */ + @PostConstruct + public void init() { + Long num = cache.incr(KEY); + long dataCenter = num / 32; + long workedId = num % 32; + //如果数据中心大于32，则抹除缓存，从头开始 + if (dataCenter >= 32) { + cache.remove(KEY); + num = cache.incr(KEY); + dataCenter = num / 32; + workedId = num % 32; + } + SnowFlake.initialize(workedId, dataCenter); + } + + public static void main(String[] args) { + SnowFlake.initialize(0, 8); + + System.out.println(SnowFlake.getId()); + } +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 4f3235bef..d93247e2b 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -40,7 +40,6 @@ import java.util.Date; * @since 2020-03-126 18:04:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class DistributionCashServiceImpl extends ServiceImpl implements DistributionCashService { /** * 分销员 diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java index 3b3a1b67c..108bd35d5 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java @@ -34,7 +34,6 @@ import java.util.Objects; * @since 2020-03-24 23:04:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class DistributionGoodsServiceImpl extends ServiceImpl implements DistributionGoodsService { /** diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index c1dc8f98f..d4670fc12 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -42,7 +42,6 @@ import java.util.List; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class DistributionOrderServiceImpl extends ServiceImpl implements DistributionOrderService { /** diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java index 92ffc97ba..9993349fa 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020-03-24 23:04:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class DistributionSelectedGoodsServiceImpl extends ServiceImpl implements DistributionSelectedGoodsService { /** diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 6d474f821..75611c18f 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java @@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit; * @since 2020-03-14 23:04:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class DistributionServiceImpl extends ServiceImpl implements DistributionService { /** diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index 57cc5036c..88cd60d02 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -29,7 +29,6 @@ import java.util.List; * @since 2020/11/26 17:50 */ @Service -@Transactional(rollbackFor = Exception.class) public class FileServiceImpl extends ServiceImpl implements FileService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java index 9c985a11a..0587303ff 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java @@ -34,7 +34,6 @@ import java.util.stream.Collectors; * @since 2020-02-18 16:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class BrandServiceImpl extends ServiceImpl implements BrandService { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java index 0762b29b5..9ddaf39e1 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java @@ -20,7 +20,6 @@ import java.util.List; * @since 2020-02-18 16:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class CategoryBrandServiceImpl extends ServiceImpl implements CategoryBrandService { @Override diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java index c1b877c6a..557e7fd7c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java @@ -37,7 +37,6 @@ import java.util.stream.Collectors; * 2020-03-02 16:45:03 */ @Service -@Transactional(rollbackFor = Exception.class) public class CategoryParameterGroupServiceImpl extends ServiceImpl implements CategoryParameterGroupService { /** * 商品参数 diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index e7c5dee0e..faa6a2cc3 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; * @since 2020-02-23 15:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class CategoryServiceImpl extends ServiceImpl implements CategoryService { private static final String DELETE_FLAG_COLUMN = "delete_flag"; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java index 49b0a82b8..7eab0561d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java @@ -18,7 +18,6 @@ import java.util.List; * @since 2020-02-23 15:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class CategorySpecificationServiceImpl extends ServiceImpl implements CategorySpecificationService { @Override diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java index 796999531..fd795f368 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java @@ -33,7 +33,6 @@ import java.util.*; * @since 2020/12/19 **/ @Service -@Transactional(rollbackFor = Exception.class) public class DraftGoodsServiceImpl extends ServiceImpl implements DraftGoodsService { /** * 分类 diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java index e1727397d..f31a171fd 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java @@ -27,7 +27,6 @@ import java.util.List; * 2020-02-23 15:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class GoodsGalleryServiceImpl extends ServiceImpl implements GoodsGalleryService { /** * 设置 diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index b52dba6ec..90ebd4c4b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -63,7 +63,6 @@ import java.util.*; * @since 2020-02-23 15:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class GoodsServiceImpl extends ServiceImpl implements GoodsService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 0badc9202..7f15c9c32 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -63,7 +63,6 @@ import java.util.stream.Collectors; * @since 2020-02-23 15:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class GoodsSkuServiceImpl extends ServiceImpl implements GoodsSkuService { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsWordsServiceImpl.java index 09dd88151..775b5800e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsWordsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsWordsServiceImpl.java @@ -14,6 +14,5 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/10/15 **/ @Service -@Transactional(rollbackFor = Exception.class) public class GoodsWordsServiceImpl extends ServiceImpl implements GoodsWordsService { } diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java index d0967bd1e..2d11c9123 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -30,7 +30,6 @@ import java.util.List; * @since 2020-03-07 16:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class StoreGoodsLabelServiceImpl extends ServiceImpl implements StoreGoodsLabelService { /** diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java index 1c6e88382..515cbc391 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java @@ -26,7 +26,6 @@ import java.util.Optional; * @since 2020/11/18 2:25 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class GoodsCollectionServiceImpl extends ServiceImpl implements GoodsCollectionService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java index 33915e7e5..e206908d7 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java @@ -23,7 +23,6 @@ import java.util.Objects; * @since 2020/11/18 9:44 上午 */ @Service -@Transactional(rollbackFor = Exception.class) public class MemberAddressServiceImpl extends ServiceImpl implements MemberAddressService { @Override diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java index bc33d8c3c..36f6403c1 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java @@ -51,7 +51,6 @@ import java.util.Map; * @since 2020-02-25 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class MemberEvaluationServiceImpl extends ServiceImpl implements MemberEvaluationService { /** diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 5902d3fbc..706257018 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -63,7 +63,6 @@ import java.util.Objects; * @since 2021-03-29 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class MemberServiceImpl extends ServiceImpl implements MemberService { /** @@ -433,11 +432,11 @@ public class MemberServiceImpl extends ServiceImpl impleme * @param mobilePhone 手机号 * @return 会员 */ - private List findMember(String mobilePhone, String userName) { + private Long findMember(String mobilePhone, String userName) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("mobile", mobilePhone) .or().eq("username", userName); - return this.baseMapper.selectList(queryWrapper); + return this.baseMapper.selectCount(queryWrapper); } /** @@ -593,9 +592,8 @@ public class MemberServiceImpl extends ServiceImpl impleme * @param mobilePhone 手机号 */ private void checkMember(String userName, String mobilePhone) { - List members = findMember(userName, mobilePhone); //判断手机号是否存在 - if (members != null && !members.isEmpty()) { + if (findMember(userName, mobilePhone) > 0) { throw new ServiceException(ResultCode.USER_EXIST); } } diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java index 690df3d87..31d311506 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java @@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/11/17 3:48 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class MessageServiceImpl extends ServiceImpl implements MessageService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java index 5d734def6..cd74a386c 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/ShortLinkServiceImpl.java @@ -16,7 +16,6 @@ import java.util.List; * @author Chopper */ @Service -@Transactional(rollbackFor = Exception.class) public class ShortLinkServiceImpl extends ServiceImpl implements ShortLinkService { @Override diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java index 116ea608d..fc178579d 100644 --- a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java @@ -18,7 +18,6 @@ import java.util.List; * @since 2020/11/17 7:37 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class AfterSaleLogServiceImpl extends ServiceImpl implements AfterSaleLogService { @Override diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java index df094942e..1fcc1c7aa 100644 --- a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java @@ -19,7 +19,6 @@ import java.util.List; * @since 2020/11/17 7:38 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class AfterSaleReasonServiceImpl extends ServiceImpl implements AfterSaleReasonService { diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java index 9d2c32605..843996faf 100644 --- a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java @@ -65,7 +65,6 @@ import java.util.stream.Collectors; * @since 2020/11/17 7:38 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class AfterSaleServiceImpl extends ServiceImpl implements AfterSaleService { /** diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java index 428ecb950..448e9dc7f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java @@ -24,7 +24,6 @@ import java.util.List; * @since 2020/11/17 7:38 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class OrderItemServiceImpl extends ServiceImpl implements OrderItemService { @Override diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java index ca75fd41d..dfb0bbd01 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java @@ -30,7 +30,6 @@ import java.util.List; * @since 2020/11/17 7:36 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class OrderPriceServiceImpl implements OrderPriceService { /** diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index 206cfc32a..e51286fbc 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -85,7 +85,6 @@ import java.util.stream.Collectors; * @since 2020/11/17 7:38 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class OrderServiceImpl extends ServiceImpl implements OrderService { private static final String ORDER_SN_COLUMN = "order_sn"; @@ -145,6 +144,7 @@ public class OrderServiceImpl extends ServiceImpl implements private TradeService tradeService; @Override + @Transactional(rollbackFor = Exception.class) public void intoDB(TradeDTO tradeDTO) { //检查TradeDTO信息 checkTradeDTO(tradeDTO); diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java index bcb8df538..15d45ab43 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java @@ -44,7 +44,6 @@ import java.util.List; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class StoreFlowServiceImpl extends ServiceImpl implements StoreFlowService { /** diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java index da858217b..02ba472f9 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java @@ -1 +1 @@ -package cn.lili.modules.order.order.serviceimpl; import cn.hutool.json.JSONUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.entity.dos.KanjiaActivity; import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.KanjiaActivityService; import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.OrderTagsEnum; 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 org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * 砍价 */ @Autowired private KanjiaActivityService kanjiaActivityService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //优惠券预处理 couponPretreatment(tradeDTO); //积分预处理 pointPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //砍价订单处理 kanjiaPretreatment(tradeDTO); //写入缓存，给消费者调用 cache.put(key, JSONUtil.toJsonStr(tradeDTO)); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } //订单配送区域校验 if (tradeDTO.getNotSupportFreight() != null && !tradeDTO.getNotSupportFreight().isEmpty()) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> stringBuilder.append(sku.getGoodsSku().getGoodsName())); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(tradeDTO.getMemberId() ,ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } /** * 创建交易，积分处理 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { //需要支付积分 if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO().getPayPoint().longValue(), PointTypeEnum.REDUCE.name(), tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 创建交易、砍价处理 * * @param tradeDTO */ private void kanjiaPretreatment(TradeDTO tradeDTO) { if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.KANJIA)) { String kanjiaId = tradeDTO.getSkuList().get(0).getKanjiaId(); kanjiaActivityService.update(new LambdaUpdateWrapper() .eq(KanjiaActivity::getId, kanjiaId) .set(KanjiaActivity::getStatus, KanJiaStatusEnum.END.name())); } } } \ No newline at end of file +package cn.lili.modules.order.order.serviceimpl; import cn.hutool.json.JSONUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.entity.dos.KanjiaActivity; import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.KanjiaActivityService; import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.OrderTagsEnum; 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 org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * 砍价 */ @Autowired private KanjiaActivityService kanjiaActivityService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //优惠券预处理 couponPretreatment(tradeDTO); //积分预处理 pointPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //砍价订单处理 kanjiaPretreatment(tradeDTO); //写入缓存，给消费者调用 cache.put(key, JSONUtil.toJsonStr(tradeDTO)); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } //订单配送区域校验 if (tradeDTO.getNotSupportFreight() != null && !tradeDTO.getNotSupportFreight().isEmpty()) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> stringBuilder.append(sku.getGoodsSku().getGoodsName())); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(tradeDTO.getMemberId() ,ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } /** * 创建交易，积分处理 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { //需要支付积分 if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO().getPayPoint().longValue(), PointTypeEnum.REDUCE.name(), tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 创建交易、砍价处理 * * @param tradeDTO */ private void kanjiaPretreatment(TradeDTO tradeDTO) { if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.KANJIA)) { String kanjiaId = tradeDTO.getSkuList().get(0).getKanjiaId(); kanjiaActivityService.update(new LambdaUpdateWrapper() .eq(KanjiaActivity::getId, kanjiaId) .set(KanjiaActivity::getStatus, KanJiaStatusEnum.END.name())); } } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java index 96cae40ca..43a0a0b92 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java @@ -29,7 +29,6 @@ import java.util.List; * @since 2020-05-5 15:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class ArticleCategoryServiceImpl extends ServiceImpl implements ArticleCategoryService { /** diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index db36adeda..d8a5d8e8d 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -30,7 +30,6 @@ import java.util.List; * @since 2020/11/18 11:40 上午 */ @Service -@Transactional(rollbackFor = Exception.class) public class ArticleServiceImpl extends ServiceImpl implements ArticleService { @Override diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java index 714cd671b..b97083bdf 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/11/18 11:40 上午 */ @Service -@Transactional(rollbackFor = Exception.class) public class FeedbackServiceImpl extends ServiceImpl implements FeedbackService { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java index a601d6d1d..7713cbc7a 100644 --- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java @@ -19,7 +19,6 @@ import java.util.List; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class PaymentServiceImpl implements PaymentService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java index 6efc4f87d..7c13dfe5f 100644 --- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java @@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020-12-19 09:25 */ @Service -@Transactional(rollbackFor = Exception.class) public class RefundLogServiceImpl extends ServiceImpl implements RefundLogService { @Override diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index f1b92e8c5..70467de2c 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -42,7 +42,6 @@ import java.util.stream.Collectors; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class AdminUserServiceImpl extends ServiceImpl implements AdminUserService { @Autowired private UserRoleService userRoleService; diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java index 3040aaea6..2a9e2e89c 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java @@ -17,7 +17,6 @@ import java.util.List; * @since 2020/11/22 12:08 */ @Service -@Transactional(rollbackFor = Exception.class) public class DepartmentRoleServiceImpl extends ServiceImpl implements DepartmentRoleService { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java index c9d6e578b..138a2a271 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java @@ -27,7 +27,6 @@ import java.util.List; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class DepartmentServiceImpl extends ServiceImpl implements DepartmentService { /** diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java index 5a72298a2..ebb2c2de7 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java @@ -26,7 +26,6 @@ import java.util.List; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class RoleMenuServiceImpl extends ServiceImpl implements RoleMenuService { /** diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java index 3a2093aaf..57fb4b6a7 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java @@ -23,7 +23,6 @@ import java.util.List; * @since 2020/11/17 3:50 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class RoleServiceImpl extends ServiceImpl implements RoleService { /** diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java index 1ea47de8b..c397e9f16 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java @@ -34,7 +34,6 @@ import java.util.stream.Collectors; * @since 2020/11/17 3:45 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class SystemLogServiceImpl implements SystemLogService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java index 77912879c..245710b74 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java @@ -20,7 +20,6 @@ import java.util.List; * @since 2020/11/17 3:52 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class UserRoleServiceImpl extends ServiceImpl implements UserRoleService { @Override diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java index 768cf01a2..d10f8579e 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java @@ -31,7 +31,6 @@ import java.util.*; * @author paulG * @since 2021/11/30 **/ -@Transactional(rollbackFor = Exception.class) public abstract class AbstractPromotionsServiceImpl, T extends BasePromotions> extends ServiceImpl implements AbstractPromotionsService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index 7a2f3d901..e8c494d98 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java @@ -42,7 +42,6 @@ import java.util.stream.Collectors; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) public class CouponServiceImpl extends AbstractPromotionsServiceImpl implements CouponService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java index dce86bca9..42001ee18 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java @@ -33,7 +33,6 @@ import java.util.List; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) public class FullDiscountServiceImpl extends AbstractPromotionsServiceImpl implements FullDiscountService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java index 9a2f4d8f6..fa052df66 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java @@ -43,7 +43,6 @@ import java.util.List; * @since 2021/7/1 */ @Service -@Transactional(rollbackFor = Exception.class) public class KanjiaActivityGoodsServiceImpl extends AbstractPromotionsServiceImpl implements KanjiaActivityGoodsService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java index 21c4a3443..1b01cb30f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java @@ -33,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional; * @date 2021/7/1 */ @Service -@Transactional(rollbackFor = Exception.class) public class KanjiaActivityLogServiceImpl extends ServiceImpl implements KanjiaActivityLogService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java index 828bf7d02..6766b2e82 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java @@ -48,7 +48,6 @@ import java.util.Objects; * @since 2021/7/1 */ @Service -@Transactional(rollbackFor = Exception.class) public class KanjiaActivityServiceImpl extends ServiceImpl implements KanjiaActivityService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 0c851736c..5f23153b0 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -40,7 +40,6 @@ import java.util.*; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) @CacheConfig(cacheNames = "{MemberCoupon}") public class MemberCouponServiceImpl extends ServiceImpl implements MemberCouponService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java index dbec57fa6..bb9a02d6d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java @@ -47,7 +47,6 @@ import java.util.List; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) public class PintuanServiceImpl extends AbstractPromotionsServiceImpl implements PintuanService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java index 9a873fc65..79b8c06a0 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java @@ -21,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/8/21 **/ @Service -@Transactional(rollbackFor = Exception.class) public class PointsGoodsCategoryServiceImpl extends ServiceImpl implements PointsGoodsCategoryService { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java index de4af0d3d..24ad96499 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java @@ -37,7 +37,6 @@ import java.util.*; * @since 2020/8/21 **/ @Service -@Transactional(rollbackFor = Exception.class) @Slf4j public class PointsGoodsServiceImpl extends AbstractPromotionsServiceImpl implements PointsGoodsService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java index e8b4c9766..4f0db3d1d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java @@ -41,7 +41,6 @@ import java.util.List; * @since 2021/3/18 9:22 上午 */ @Service -@Transactional(rollbackFor = Exception.class) public class PromotionGoodsServiceImpl extends ServiceImpl implements PromotionGoodsService { private static final String SKU_ID_COLUMN = "sku_id"; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java index 2afd85938..2596a8e59 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java @@ -27,7 +27,6 @@ import java.util.Map; */ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class PromotionServiceImpl implements PromotionService { /** * 秒杀 diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java index c8df9dbb0..ed8bd3d68 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java @@ -48,7 +48,6 @@ import java.util.stream.Collectors; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) @Slf4j public class SeckillApplyServiceImpl extends ServiceImpl implements SeckillApplyService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java index bf0b00a5b..9dd741213 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java @@ -50,7 +50,6 @@ import java.util.Map; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) @Slf4j public class SeckillServiceImpl extends AbstractPromotionsServiceImpl implements SeckillService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java index 491ceba58..7ee8d8e61 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java @@ -37,8 +37,6 @@ public class PageViewInterceptor { @Autowired private Cache cache; - @Autowired - private HttpServletRequest request; @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.statistics.aop.PageViewPoint)") diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java index 622ff256f..217320ad6 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java @@ -22,7 +22,6 @@ import java.util.Objects; * @since 2020/11/17 4:28 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class BillStatisticsServiceImpl extends ServiceImpl implements BillStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java index 79ab876c0..d459537b5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020-03-126 18:04:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class DistributionCashStatisticsServiceImpl extends ServiceImpl implements DistributionCashStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java index 62caf740a..23a5bae31 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java @@ -24,7 +24,6 @@ import java.util.Objects; * @since 2020-02-25 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class MemberEvaluationStatisticsServiceImpl extends ServiceImpl implements MemberEvaluationStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java index 1982553fa..35cd916b9 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/8/21 */ @Service -@Transactional(rollbackFor = Exception.class) public class SeckillStatisticsServiceImpl extends ServiceImpl implements SeckillStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java index 430d89d25..f5eecdb65 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java @@ -48,7 +48,6 @@ import java.util.List; * @since 2020/11/17 4:28 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class BillServiceImpl extends ServiceImpl implements BillService { /** diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java index 12a7c64ba..4b32fba8a 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java @@ -18,7 +18,6 @@ import java.util.List; * @since 2020-03-07 09:24:33 */ @Service -@Transactional(rollbackFor = Exception.class) public class FreightTemplateServiceChildImpl extends ServiceImpl implements FreightTemplateChildService { @Override diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java index a44284165..7b4943bff 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java @@ -34,7 +34,6 @@ import java.util.List; * @since 2020/11/22 16:00 */ @Service -@Transactional(rollbackFor = Exception.class) public class FreightTemplateServiceImpl extends ServiceImpl implements FreightTemplateService { /** * 配送子模板 diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java index 2b84c0702..131f774ba 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java @@ -19,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/11/22 16:00 */ @Service -@Transactional(rollbackFor = Exception.class) public class StoreAddressServiceImpl extends ServiceImpl implements StoreAddressService { @Override diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java index c071f9b23..72ad1e5fc 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java @@ -43,7 +43,6 @@ import java.util.*; * @since 2020-03-07 16:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class StoreDetailServiceImpl extends ServiceImpl implements StoreDetailService { /** diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index 0cc64d264..3980be0b6 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -42,7 +42,6 @@ import java.util.Optional; * @since 2020-03-07 16:18:56 */ @Service -@Transactional(rollbackFor = Exception.class) public class StoreServiceImpl extends ServiceImpl implements StoreService { /** diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java index 98e79b7b8..fcb46466e 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java @@ -19,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional; * @since 2020/11/17 8:02 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class AppVersionServiceImpl extends ServiceImpl implements AppVersionService { @Override diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java index a6b5708eb..12369e5c6 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java @@ -27,7 +27,6 @@ import java.util.*; * @since 2020/12/2 11:11 */ @Service -@Transactional(rollbackFor = Exception.class) public class RegionServiceImpl extends ServiceImpl implements RegionService { /** diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java index 003ae352c..3ac96fa2e 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java @@ -21,7 +21,6 @@ import java.util.List; * @since 2020/11/17 3:48 下午 */ @Service -@Transactional(rollbackFor = Exception.class) public class VerificationSourceServiceImpl extends ServiceImpl implements VerificationSourceService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java index defd9ca7e..11c700c5d 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java @@ -49,7 +49,6 @@ import java.util.Date; * @since 2020-02-25 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class MemberWalletServiceImpl extends ServiceImpl implements MemberWalletService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java index f092cee3e..5c5386125 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java @@ -38,7 +38,6 @@ import java.util.Date; * @since 2020-02-25 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class MemberWithdrawApplyServiceImpl extends ServiceImpl implements MemberWithdrawApplyService { @Autowired diff --git a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java index 0f9b86824..f88c5ba1d 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java @@ -33,7 +33,6 @@ import java.util.Date; * @since 2020-02-25 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class RechargeServiceImpl extends ServiceImpl implements RechargeService { /** diff --git a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java index bbafece02..f849e402f 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java @@ -22,7 +22,6 @@ import java.util.Date; * @since 2020-02-25 14:10:16 */ @Service -@Transactional(rollbackFor = Exception.class) public class WalletLogServiceImpl extends ServiceImpl implements WalletLogService { @Override diff --git a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java index 44701c197..ba948f5fc 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java @@ -36,7 +36,6 @@ import java.util.Map; */ @Service @Slf4j -@Transactional(rollbackFor = Exception.class) public class WechatMPMessageServiceImpl extends ServiceImpl implements WechatMPMessageService { @Autowired private WechatAccessTokenUtil wechatAccessTokenUtil; diff --git a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java index c05fb7ad6..58b92040d 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java @@ -35,7 +35,6 @@ import java.util.Map; */ @Service @Slf4j -@Transactional(rollbackFor = Exception.class) public class WechatMessageServiceImpl extends ServiceImpl implements WechatMessageService { @Autowired diff --git a/framework/src/test/java/cn/lili/test/script/ScriptTest.java b/framework/src/test/java/cn/lili/test/script/ScriptTest.java index 9c27cd7ef..ca2bfead8 100644 --- a/framework/src/test/java/cn/lili/test/script/ScriptTest.java +++ b/framework/src/test/java/cn/lili/test/script/ScriptTest.java @@ -29,7 +29,6 @@ import java.util.List; */ @ExtendWith(SpringExtension.class) @SpringBootTest -@Transactional(rollbackFor = Exception.class) @Rollback() @ContextConfiguration @Configuration diff --git a/manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java index 4f8d8427e..0c1e13911 100644 --- a/manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; * @since 2020/12/6 16:09 */ @RestController -@Transactional(rollbackFor = Exception.class) @Api(tags = "管理端,会员消息消息管理接口") @RequestMapping("/manager/message/member") public class MemberMessageManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java index b16de35aa..214fda21c 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java @@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; * @since 2020/11/17 4:34 下午 */ @RestController -@Transactional(rollbackFor = Exception.class) @Api(tags = "管理端,订单日志管理接口") @RequestMapping("/manager/orderLog") public class OrderLogManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java index 4483ad72c..6e49b39f9 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,收款日志接口") @RequestMapping("/manager/paymentLog") -@Transactional(rollbackFor = Exception.class) public class PaymentLogManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java index 86c4ab16a..48d7c4f90 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,退款日志接口") @RequestMapping("/manager/refundLog") -@Transactional(rollbackFor = Exception.class) public class RefundLogManagerController { @Autowired private RefundLogService refundLogService; diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 33d038d7f..a1ff86b38 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -27,7 +27,6 @@ import java.util.List; @RestController @Api(tags = "管理端,验证码资源维护接口") @RequestMapping("/manager/verificationSource") -@Transactional(rollbackFor = Exception.class) public class VerificationSourceController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index ce61b4707..f35000e56 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -46,7 +46,6 @@ import java.util.List; @RestController @Api(tags = "管理员") @RequestMapping("/manager/user") -@Transactional(rollbackFor = Exception.class) @Validated public class AdminUserManagerController { @Autowired diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java index 6b61d0b92..e8b6fd223 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java @@ -23,7 +23,6 @@ import java.util.List; */ @Slf4j @RestController -@Transactional(rollbackFor = Exception.class) @Api(tags = "日志管理接口") @RequestMapping("/manager/log") public class LogManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index cb0bc1ef8..44ec6aacc 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -25,7 +25,6 @@ import java.util.List; @RestController @Api(tags = "管理端,行政地区管理接口") @RequestMapping("/manager/region") -@Transactional(rollbackFor = Exception.class) public class RegionManagerController { @Autowired private RegionService regionService; diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java index 5bb23e45d..4f33f64a4 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; * @since 2020/12/6 16:09 */ @RestController -@Transactional(rollbackFor = Exception.class) @Api(tags = "管理端,店铺消息消息管理接口") @RequestMapping("/manager/message/store") public class StoreMessageManagerController { diff --git a/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java index b4d5ab428..efc4c3bff 100644 --- a/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java @@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,余额提现记录接口") @RequestMapping("/manager/members/withdraw-apply") -@Transactional(rollbackFor = Exception.class) public class MemberWithdrawApplyManagerController { @Autowired private MemberWithdrawApplyService memberWithdrawApplyService; diff --git a/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java index 30a199376..2b30a28d5 100644 --- a/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,预存款充值记录接口") @RequestMapping("/manager/recharge") -@Transactional(rollbackFor = Exception.class) public class RechargeManagerController { @Autowired private RechargeService rechargeService; diff --git a/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java index 91a58b6ba..2b95172c0 100644 --- a/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java @@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "管理端,预存款充值记录接口") @RequestMapping("/manager/wallet/log") -@Transactional(rollbackFor = Exception.class) public class WalletLogManagerController { @Autowired private WalletLogService walletLogService; diff --git a/manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java index 83dbe02fa..7e96cdf54 100644 --- a/manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java @@ -23,7 +23,6 @@ import java.util.List; @RestController @Api(tags = "微信小程序消息订阅接口") @RequestMapping("/manager/message/wechatMPMessage") -@Transactional(rollbackFor = Exception.class) public class WechatMPMessageManagerController { @Autowired private WechatMPMessageService wechatMPMessageService; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java index eaad855fc..b581f8914 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java @@ -23,7 +23,6 @@ import java.util.List; @RestController @Api(tags = "店铺端,分类绑定参数组管理接口") @RequestMapping("/store/goods/category/parameters") -@Transactional(rollbackFor = Exception.class) public class CategoryParameterGroupStoreController { diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java index 656efb436..a18c8d731 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java @@ -23,7 +23,6 @@ import java.util.List; @RestController @Api(tags = "店铺端,商品分类规格接口") @RequestMapping("/store/goods/category/spec") -@Transactional(rollbackFor = Exception.class) public class CategorySpecificationStoreController { @Autowired private CategorySpecificationService categorySpecificationService; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java index 946c05af4..82732c621 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java @@ -33,7 +33,6 @@ import java.util.Objects; @Api(tags = "店铺端,商品分类接口") @RequestMapping("/store/goods/category") @CacheConfig(cacheNames = "category") -@Transactional(rollbackFor = Exception.class) public class CategoryStoreController { /** diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java index 4a1ff7640..52d8b510a 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(tags = "店铺端,商品计量单位接口") @RequestMapping("/store/goods/unit") -@Transactional(rollbackFor = Exception.class) public class GoodsUnitStoreController { @Autowired private GoodsUnitService goodsUnitService; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java index e319db0a9..e716d1101 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java @@ -25,7 +25,6 @@ import java.util.Objects; * @since 2020/11/22 14:23 */ @RestController -@Transactional(rollbackFor = Exception.class) @Api(tags = "店铺端,日志管理接口") @RequestMapping("/store/log") public class LogStoreController { From cf0d1378c8a462e5cd0e433543ba58c3570b6b71 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 18 Jan 2022 11:03:15 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E5=8E=8B=E6=B5=8B=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SliderImageController.java | 4 +-- .../lili/controller/common/SmsController.java | 2 +- .../member/serviceimpl/MemberServiceImpl.java | 18 +++++------ .../order/cart/entity/dto/TradeDTO.java | 13 -------- .../order/cart/service/CartServiceImpl.java | 5 ++- .../sms/impl/SmsUtilAliImplService.java | 10 +++--- .../service/impl/VerificationServiceImpl.java | 31 ++++++++++--------- 7 files changed, 35 insertions(+), 48 deletions(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index 85e9f653d..bb22429ff 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -26,7 +26,7 @@ public class SliderImageController { @Autowired private VerificationService verificationService; -// @LimitPoint(name = "slider_image", key = "verification") + @LimitPoint(name = "slider_image", key = "verification") @GetMapping("/{verificationEnums}") @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次") public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { @@ -34,7 +34,7 @@ public class SliderImageController { } -// @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600) + @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600) @PostMapping("/{verificationEnums}") @ApiOperation(value = "验证码预校验") public ResultMessage verificationImage(Integer xPos, @RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index 41657ac5c..d6f9e5066 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java @@ -30,7 +30,7 @@ public class SmsController { @Autowired private VerificationService verificationService; -// @LimitPoint(name = "sms_send", key = "sms") + @LimitPoint(name = "sms_send", key = "sms") @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"), @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"), diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 2ad6d5a8e..bc280dcdc 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -134,15 +134,15 @@ public class MemberServiceImpl extends ServiceImpl impleme @Override public Token usernameLogin(String username, String password) { Member member = this.findMember(username); -// //判断用户是否存在 -// if (member == null || !member.getDisabled()) { -// throw new ServiceException(ResultCode.USER_NOT_EXIST); -// } -// //判断密码是否输入正确 -// if (!new BCryptPasswordEncoder().matches(password, member.getPassword())) { -// throw new ServiceException(ResultCode.USER_PASSWORD_ERROR); -// } -// loginBindUser(member); + //判断用户是否存在 + if (member == null || !member.getDisabled()) { + throw new ServiceException(ResultCode.USER_NOT_EXIST); + } + //判断密码是否输入正确 + if (!new BCryptPasswordEncoder().matches(password, member.getPassword())) { + throw new ServiceException(ResultCode.USER_PASSWORD_ERROR); + } + loginBindUser(member); return memberTokenGenerate.createToken(member, false); } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java index 14101279c..36f84b7fb 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java @@ -106,19 +106,6 @@ public class TradeDTO implements Serializable { */ private MemberAddress memberAddress; - public MemberAddress getMemberAddress() { - MemberAddress memberAddress = new MemberAddress(); - memberAddress.setId("1376445134773682176"); - memberAddress.setConsigneeAddressIdPath("1401797451706269749,1401797451706270007,1401797451706270104,1401797451706270108"); - memberAddress.setConsigneeAddressPath("河北省,廊坊市,三河市,燕郊镇"); - memberAddress.setAlias("DEFAULT"); - memberAddress.setMobile("13232323232"); - memberAddress.setName("NMNNN"); - memberAddress.setIsDefault(true); - memberAddress.setLat("131.13"); - memberAddress.setLon("131.13"); - return memberAddress; - } /** * 客户端类型 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 07736ea81..b8c51b9c1 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -215,9 +215,8 @@ public class CartServiceImpl implements CartService { //缓存key，默认使用购物车 if (cartTypeEnum != null) { -// AuthUser currentUser = UserContext.getCurrentUser(); -// return cartTypeEnum.getPrefix() + currentUser.getId(); - return cartTypeEnum.getPrefix() + UserContext.getUuid(); + AuthUser currentUser = UserContext.getCurrentUser(); + return cartTypeEnum.getPrefix() + currentUser.getId(); } throw new ServiceException(ResultCode.ERROR); } diff --git a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java index 7b12692ee..19e999b9d 100644 --- a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java @@ -132,14 +132,14 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { @Override public boolean verifyCode(String mobile, VerificationEnums verificationEnums, String uuid, String code) { -// Object result = cache.get(cacheKey(verificationEnums, mobile, uuid)); -// if (code.equals(result)) { + Object result = cache.get(cacheKey(verificationEnums, mobile, uuid)); + if (code.equals(result)) { //校验之后，删除 cache.remove(cacheKey(verificationEnums, mobile, uuid)); return true; -// } else { -// return false; -// } + } else { + return false; + } } diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 284426df5..58c0aa976 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -10,6 +10,8 @@ import cn.lili.common.vo.SerializableStream; import cn.lili.modules.verification.SliderImageUtil; import cn.lili.modules.verification.entity.dos.VerificationSource; import cn.lili.modules.verification.entity.dto.VerificationDTO; +import cn.lili.modules.verification.service.VerificationSourceService; +import cn.lili.modules.verification.SliderImageUtil; import cn.lili.modules.verification.entity.enums.VerificationEnums; import cn.lili.modules.verification.service.VerificationService; import cn.lili.modules.verification.service.VerificationSourceService; @@ -132,19 +134,18 @@ public class VerificationServiceImpl implements VerificationService { */ @Override public boolean preCheck(Integer xPos, String uuid, VerificationEnums verificationEnums) { -// Integer randomX = (Integer) cache.get(cacheKey(verificationEnums, uuid)); -// if (randomX == null) { -// throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); -// } -// log.debug("{}{}", randomX, xPos); -// //验证结果正确 && 删除标记成功 -// if (Math.abs(randomX - xPos) < verificationCodeProperties.getFaultTolerant() && cache.remove(cacheKey(verificationEnums, uuid))) { - //验证成功，则记录验证结果 验证有效时间与验证码创建有效时间一致 - cache.remove(cacheKey(verificationEnums, uuid)); - cache.put(cacheResult(verificationEnums, uuid), true, verificationCodeProperties.getEffectiveTime()); - return true; -// } -// throw new ServiceException(ResultCode.VERIFICATION_ERROR); + Integer randomX = (Integer) cache.get(cacheKey(verificationEnums, uuid)); + if (randomX == null) { + throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); + } + log.debug("{}{}", randomX, xPos); + //验证结果正确 && 删除标记成功 + if (Math.abs(randomX - xPos) < verificationCodeProperties.getFaultTolerant() && cache.remove(cacheKey(verificationEnums, uuid))) { + //验证成功，则记录验证结果 验证有效时间与验证码创建有效时间一致 + cache.put(cacheResult(verificationEnums, uuid), true, verificationCodeProperties.getEffectiveTime()); + return true; + } + throw new ServiceException(ResultCode.VERIFICATION_ERROR); } /** @@ -160,8 +161,7 @@ public class VerificationServiceImpl implements VerificationService { if (cache.remove(cacheResult(verificationEnums, uuid))) { return true; } -// throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); - return true; + throw new ServiceException(ResultCode.VERIFICATION_CODE_INVALID); } /** @@ -187,3 +187,4 @@ public class VerificationServiceImpl implements VerificationService { } } + From ca1851570b9039cf9d937146702ed0afbfa8172c Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 19 Jan 2022 10:02:22 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=EF=BC=8C=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98=E6=97=A5?= =?UTF-8?q?=E5=90=8E=E4=B8=8E=E5=89=8D=E7=AB=AF=E4=B8=80=E8=B5=B7=E5=8D=8F?= =?UTF-8?q?=E8=B0=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/controller/order/CartController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java index 884547e29..c2a4508a2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java @@ -236,8 +236,8 @@ public class CartController { @ApiOperation(value = "创建交易") - @PostMapping(value = "/create/trade") - public ResultMessage crateTrade(TradeParams tradeParams) { + @PostMapping(value = "/create/trade", consumes = "application/json", produces = "application/json") + public ResultMessage crateTrade(@RequestBody TradeParams tradeParams) { try { //读取选中的列表 return ResultUtil.data(this.cartService.createTrade(tradeParams));