From d2a65425646e33c26b8a98c394c7990a6bfb6b03 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 九月 2025 18:57:32 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 94a9293..64e3635 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -2256,8 +2256,15 @@
// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public MerVerifyOrderVo sureVerifyOrderDouYin(MerVerifyOrderDto merVerifyOrderDto) {
String phone = merVerifyOrderDto.getPhone();
+ String name = merVerifyOrderDto.getName();
String orderId = merVerifyOrderDto.getOrderId();
Long shopId = merVerifyOrderDto.getShopId();
+ if(StringUtils.isEmpty(phone)){
+ throw new ServiceException("请填写核销用户电话号码");
+ }
+ if(StringUtils.isEmpty(name)){
+ throw new ServiceException("请填写核销用户姓名");
+ }
//获取核销商户
Shop shop = remoteShopService.getShop(shopId).getData();
CertificatePrepareResponseData data = VerifyUtil.certificatePrepare(orderId);
@@ -2289,7 +2296,6 @@
}
Member member = remoteMemberService.getMemberByMobile(phone).getData();//绑定用户判断核销商户
if(null == member){
- String name = merVerifyOrderDto.getName();
//创建新用户
String memberId = IdUtils.simpleUUID();
SysUser sysUser = new SysUser();
@@ -2568,8 +2574,15 @@
// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public MerVerifyOrderVo sureVerifyOrderKuaiShou(MerVerifyOrderDto merVerifyOrderDto) {
String phone = merVerifyOrderDto.getPhone();
+ String name = merVerifyOrderDto.getName();
String orderId = merVerifyOrderDto.getOrderId();
Long shopId = merVerifyOrderDto.getShopId();
+ if(StringUtils.isEmpty(phone)){
+ throw new ServiceException("请填写核销用户电话号码");
+ }
+ if(StringUtils.isEmpty(name)){
+ throw new ServiceException("请填写核销用户姓名");
+ }
//获取核销商户
Shop shop = remoteShopService.getShop(shopId).getData();
VerifyPrepareDataNew data = KSVerifyUtil.certificatePrepare(redisService, orderId);
--
Gitblit v1.7.1