fix

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -146,7 +146,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 	@Override
 	public User webLogin(LoginReq loginReq) throws Exception {
 		LambdaQueryWrapper<User> wrapper = Wrappers.lambdaQuery(User.class).last("limit 1");
-		if (loginReq.getType() == null || loginReq.getType() < 1 && loginReq.getType() > 3) {
+		if (loginReq.getType() == null || loginReq.getType() < 1 || loginReq.getType() > 3) {
 			throw BusinessRuntimeException.getInstance(I18nMessageUtil.getI18nMsg("sys_error"));
 		}
 		if (loginReq.getType() == 1) {
@@ -233,8 +233,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 						.setCallbackType(callbackType);
 				redisService.set(RedisService.key.ORDER_DON_POST_DATA_USER_KEY.getName() + user.getId(), Jsons.toJson(orderDonPostDataDto));
 			}
-			//发放新用户福利
-			final Long fUid = user.getId();
 			final String login_email = user.getEmail();
 			final String login_phone = user.getLoginPhone();
 			UserBindDetail bindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
@@ -254,6 +252,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		if (StrUtil.isEmpty(user.getShowId())) {
 			user.setShowId(getUserShowId(user.getId()));
 		}
+		Optional.ofNullable(user.getIsBlack())
+				.ifPresent(black -> {
+					if (black) {
+						throw BusinessRuntimeException.getInstance("user_black_error");
+					}
+				});
 		return user;
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/user/AddressController.java

@@ -1,75 +0,0 @@
-package com.cyksj.web.controller.user;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.cyksj.common.exception.BusinessRuntimeException;
-import com.cyksj.dto.Result;
-import com.cyksj.enums.GatewayResponse;
-import com.cyksj.model.entity.Address;
-import com.cyksj.service.user.AddressService;
-import com.cyksj.web.util.StpUserUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author chan
- * @date 2022/10/13 3:07 PM
- */
-@RestController
-@RequestMapping("/applets/address")
-@RequiredArgsConstructor
-public class AddressController {
-
-    private final AddressService addressService;
-
-    @GetMapping("/get")
-    public Result<List<Address>> get(){
-        long userId = StpUserUtil.getLoginIdAsLong();
-        List<Address> addressList = addressService.list(Wrappers.lambdaQuery(Address.class).eq(Address::getUserId, userId));
-        return GatewayResponse.SUCCESS.newBuilder().toResult(addressList);
-    }
-
-    @Transactional(rollbackFor = Throwable.class)
-    @PostMapping("/post")
-    public Result<Address> save(@RequestBody Address address){
-        long userId = StpUserUtil.getLoginIdAsLong();
-        int count = addressService.count(Wrappers.lambdaQuery(Address.class).eq(Address::getUserId, userId));
-        if (count >= 20) {
-            throw new BusinessRuntimeException("收货地址最多可添加20条, 请清理后再添加.");
-        }
-        if (count == 0) {
-            // 当前新增的地址是唯一一个地址时 无论用户是否设为默认地址 都设为默认地址
-            address.setIsDefault(true);
-        }
-
-        if(address.getIsDefault() != null && address.getIsDefault() ){
-            addressService.update(Wrappers.lambdaUpdate(Address.class).eq(Address::getUserId,userId).set(Address::getIsDefault,false));
-        }
-        address.setUserId(userId);
-        addressService.save(address);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(address);
-    }
-
-    @Transactional(rollbackFor = Throwable.class)
-    @PutMapping("/update")
-    public Result<Address> update(@RequestBody Address address){
-
-        long userId = StpUserUtil.getLoginIdAsLong();
-        if(address.getIsDefault() != null && address.getIsDefault() ){
-            addressService.update(Wrappers.lambdaUpdate(Address.class).eq(Address::getUserId,userId).set(Address::getIsDefault,false));
-        }
-
-        addressService.updateById(address);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(address);
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public Result<String> delete(@PathVariable Long id){
-        addressService.removeById(id);
-        return GatewayResponse.SUCCESS.newBuilder().toResult();
-    }
-
-
-}