From 95044dd4dacee5f7ecb081af5d557d14fad83c24 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 22 八月 2023 18:39:47 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 3c83650..d9ee052 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
@@ -1629,7 +1629,7 @@
// 调用remoteMemberService的getMember方法获取Member对象
Member member = remoteMemberService.getMember(userId).getData();
//如果是商户优惠券，验证商户一致
- if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
+ if (memberCoupon.getCouponFrom() == 2) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
@@ -1642,6 +1642,7 @@
/*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}*/
+ //判断绑定商户是否和核销商户一致
if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
@@ -3265,7 +3266,7 @@
Long userId = verifyCouponGetVo.getUserId();
Member member = remoteMemberService.getMember(userId).getData();
//如果是商户优惠券，验证商户一致
- if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
+ if (memberCoupon.getCouponFrom() == 2) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
@@ -3278,6 +3279,7 @@
/*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}*/
+ //判断绑定商户是否和核销商户一致
if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
@@ -4530,10 +4532,6 @@
orderFromDesc = "商城订单";
}
merOrderPageVo.setOrderFromDesc(orderFromDesc);
- merOrderPageVo.setUnPaidMoney(merOrderPageVo.getPayMoney().subtract(merOrderPageVo.getReceiveMoney()));
- if (merOrderPageVo.getUnPaidMoney() == null) {
- merOrderPageVo.setUnPaidMoney(zeroBig);
- }
if(merOrderPageVo.getUnPaidMoney().compareTo(zeroBig)<0){
merOrderPageVo.setUnPaidMoney(zeroBig);
}
--
Gitblit v1.7.1