zwhui před 1 rokem
rodič
revize
e78668f51e

+ 12 - 9
wholesale/src/main/java/com/yhlxj/service/code/impl/ExchangeCodeServiceImpl.java

@@ -5,14 +5,8 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.StringUtil;
-import com.yhlxj.dao.mapper.ExchangeCodeMapper;
-import com.yhlxj.dao.mapper.WebWholeSaleOrderDonMapper;
-import com.yhlxj.dao.mapper.WebWholesaleOrderDonCodeRelateMapper;
-import com.yhlxj.dao.mapper.WholesaleUserMapper;
-import com.yhlxj.dao.model.entity.ExchangeCode;
-import com.yhlxj.dao.model.entity.WebWholesaleOrderDon;
-import com.yhlxj.dao.model.entity.WebWholesaleOrderDonCodeRelate;
-import com.yhlxj.dao.model.entity.WholesaleUser;
+import com.yhlxj.dao.mapper.*;
+import com.yhlxj.dao.model.entity.*;
 import com.yhlxj.dao.model.request.ExchangeCodeTicket;
 import com.yhlxj.service.code.ExchangeCodeService;
 import lombok.RequiredArgsConstructor;
@@ -40,12 +34,22 @@ public class ExchangeCodeServiceImpl implements ExchangeCodeService {
 
 	private final WholesaleUserMapper wholesaleUserMapper;
 
+	private final WebInfoMapper webInfoMapper;
+
 
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void exchangeCode(ExchangeCodeTicket exchangeCodeTicket) throws Exception {
 		Long userId = exchangeCodeTicket.getUserId();
 		String code = exchangeCodeTicket.getCode();
+		WholesaleUser wholesaleUser = wholesaleUserMapper.selectById(userId);
+		WebInfo webInfo = webInfoMapper.selectById(wholesaleUser.getWholesaleId());
+		if (webInfo == null) {
+			throw BusinessRuntimeException.getInstance("店铺不存在");
+		}
+		if (!webInfo.getStatus()){
+			throw BusinessRuntimeException.getInstance("店铺已关闭");
+		}
 		WebWholesaleOrderDonCodeRelate webWholesaleOrderDonCodeRelate = webWholesaleOrderDonCodeRelateMapper.selectOne(Wrappers.lambdaQuery(WebWholesaleOrderDonCodeRelate.class)
 				.eq(WebWholesaleOrderDonCodeRelate::getCode, code)
 				.last("limit 1"));
@@ -77,7 +81,6 @@ public class ExchangeCodeServiceImpl implements ExchangeCodeService {
 			exchangeCodeMapper.updateById(exchangeCode);
 		}
 		//兑换
-		WholesaleUser wholesaleUser = wholesaleUserMapper.selectById(userId);
 		if (StringUtil.isBlank(wholesaleUser.getToken())) {
 			wholesaleUser.setToken(UUID.randomUUID().toString());
 		}

+ 0 - 3
wholesale/src/main/java/com/yhlxj/web/controller/login/WholesaleUserController.java

@@ -112,9 +112,6 @@ public class WholesaleUserController {
         if (webInfo == null) {
             throw new BusinessRuntimeException("店铺不存在.");
         }
-        if (!webInfo.getStatus()) {
-            throw new BusinessRuntimeException("店铺已关闭.");
-        }
         WebInfoView view = new WebInfoView();
         BeanUtil.copyProperties(webInfo, view);
         return view;

+ 0 - 3
wholesale/src/main/java/com/yhlxj/web/controller/manage/WholesaleController.java

@@ -148,9 +148,6 @@ public class WholesaleController {
         if (webInfo == null) {
             throw new BusinessRuntimeException("店铺不存在.");
         }
-        if (!webInfo.getStatus()){
-            throw new BusinessRuntimeException("店铺已关闭.");
-        }
         WebInfoView view = new WebInfoView();
         BeanUtil.copyProperties(webInfo, view);
         return view;