商家注册

src/main/java/com/izouma/dingdong/domain/OrderInfo.java

@@ -1,7 +1,5 @@
 package com.izouma.dingdong.domain;
 
-import com.izouma.dingdong.domain.merchant.Goods;
-import com.izouma.dingdong.dto.GoodsSpecDTO;
 import com.izouma.dingdong.enums.MerchantStatus;
 import com.izouma.dingdong.enums.OrderStatus;
 import com.izouma.dingdong.enums.PayMethod;
@@ -13,7 +11,6 @@ import lombok.*;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.List;
 
 @EqualsAndHashCode(callSuper = false)
 @Data

src/main/java/com/izouma/dingdong/domain/User.java

@@ -16,7 +16,7 @@ import javax.persistence.*;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.HashSet;
 import java.util.Set;
 

src/main/java/com/izouma/dingdong/domain/backstage/BlackList.java

@@ -8,7 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 import javax.persistence.EnumType;

src/main/java/com/izouma/dingdong/domain/merchant/AutomaticResponse.java

@@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -2,7 +2,6 @@ package com.izouma.dingdong.domain.merchant;
 
 import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.backstage.Category;
-import com.izouma.dingdong.domain.backstage.Tag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -14,7 +13,6 @@ import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Set;
 

src/main/java/com/izouma/dingdong/domain/merchant/Sales.java

@@ -2,7 +2,6 @@ package com.izouma.dingdong.domain.merchant;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.izouma.dingdong.domain.BaseEntity;
-import com.izouma.dingdong.domain.OrderInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,7 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @Data

src/main/java/com/izouma/dingdong/domain/user/Coupon.java

@@ -3,7 +3,6 @@ package com.izouma.dingdong.domain.user;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.User;
-import com.izouma.dingdong.enums.CouponType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;

src/main/java/com/izouma/dingdong/dto/CategoryDTO.java

@@ -1,7 +1,5 @@
 package com.izouma.dingdong.dto;
 
-import cn.hutool.core.collection.CollUtil;
-import com.izouma.dingdong.domain.backstage.Category;
 import com.izouma.dingdong.domain.merchant.Merchant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/izouma/dingdong/dto/MerchantClassificationDTO.java

@@ -1,6 +1,5 @@
 package com.izouma.dingdong.dto;
 
-import com.izouma.dingdong.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Set;

src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -2,7 +2,6 @@ package com.izouma.dingdong.dto;
 
 import com.izouma.dingdong.annotations.Searchable;
 import com.izouma.dingdong.domain.backstage.Category;
-import com.izouma.dingdong.domain.backstage.Tag;
 import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.merchant.MerchantSettings;
 import com.izouma.dingdong.enums.ApplyStatus;

src/main/java/com/izouma/dingdong/dto/UserOrderDTO.java

@@ -8,10 +8,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/dingdong/enums/ApplyStatus.java

@@ -3,5 +3,5 @@ package com.izouma.dingdong.enums;
 public enum  ApplyStatus {
     PASS,
     DENY,
-    PENDING;
+    PENDING
 }

src/main/java/com/izouma/dingdong/repo/OrderRefundApplyRepo.java

@@ -3,7 +3,6 @@ package com.izouma.dingdong.repo;
 
 import com.izouma.dingdong.domain.OrderRefundApply;
 import com.izouma.dingdong.enums.RefundStatus;
-import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/dingdong/repo/ShoppingCartRepo.java

@@ -1,10 +1,12 @@
 package com.izouma.dingdong.repo;
 
 import com.izouma.dingdong.domain.ShoppingCart;
-import com.sun.tools.javac.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 public interface ShoppingCartRepo extends JpaRepository<ShoppingCart, Long>, JpaSpecificationExecutor<ShoppingCart> {
 
     //按用户和商户查找

src/main/java/com/izouma/dingdong/repo/backstage/CategoryRepo.java

@@ -1,7 +1,6 @@
 package com.izouma.dingdong.repo.backstage;
 
 import com.izouma.dingdong.domain.backstage.Category;
-import com.izouma.dingdong.domain.merchant.Merchant;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/dingdong/repo/merchant/GoodsRepo.java

@@ -27,12 +27,12 @@ public interface GoodsRepo extends JpaRepository<Goods, Long>, JpaSpecificationE
     @Query("update Goods t set t.likes = t.likes + 1 where t.id = ?1")
     @Modifying
     @Transactional
-    Goods updateLikesById(Long id);
+    void updateLikesById(Long id);
 
     @Query("update Goods t set t.bad = t.bad + 1 where t.id = ?1")
     @Modifying
     @Transactional
-    Goods updateBadById(Long id);
+    void updateBadById(Long id);
 
     @Query(nativeQuery = true, value = "SELECT ifnull(max(sort + 1),1) FROM menu")
     int nextSort();

src/main/java/com/izouma/dingdong/repo/merchant/MerchantRepo.java

@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
-import java.util.List;
 import java.util.Optional;
 
 public interface MerchantRepo extends JpaRepository<Merchant, Long>, JpaSpecificationExecutor<Merchant> {

src/main/java/com/izouma/dingdong/service/backstage/BlackListService.java

@@ -4,7 +4,6 @@ import com.izouma.dingdong.domain.User;
 import com.izouma.dingdong.domain.backstage.BlackList;
 import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.rider.Rider;
-import com.izouma.dingdong.enums.Identity;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.backstage.BlackListRepo;

src/main/java/com/izouma/dingdong/service/backstage/CategoryService.java

@@ -2,19 +2,13 @@ package com.izouma.dingdong.service.backstage;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.izouma.dingdong.domain.backstage.Category;
 import com.izouma.dingdong.dto.CategoryDTO;
 import com.izouma.dingdong.repo.backstage.CategoryRepo;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service

src/main/java/com/izouma/dingdong/service/merchant/GoodsService.java

@@ -11,7 +11,6 @@ import com.izouma.dingdong.repo.merchant.GoodsRepo;
 import com.izouma.dingdong.repo.merchant.MerchantClassificationRepo;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.repo.merchant.SalesRepo;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -50,7 +50,6 @@ public class MerchantService {
     /*
     商户注册申请
      */
-    @Transactional
     public MerchantDTO registerApply(MerchantDTO merchantDTO) {
         //注册商家用户
         User user = userService.register(merchantDTO.getPhone(), merchantDTO.getPassword());

src/main/java/com/izouma/dingdong/web/AuthenticationController.java

@@ -11,13 +11,13 @@ import com.izouma.dingdong.service.merchant.MerchantService;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.method.P;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -112,7 +112,7 @@ public class AuthenticationController {
 
     @PostMapping("/merchantRegister")
     @ApiOperation("注册登录")
-    public String registerMerchant(MerchantDTO merchantDTO) {
+    public String registerMerchant( MerchantDTO merchantDTO) {
         try {
             User user = userService.register(merchantDTO.getPhone(),merchantDTO.getPassword());
             //商家信息