实体类提出共通 提交

alien-store/src/main/java/shop/alien/store/controller/StoreActivityController.java

@@ -5,8 +5,8 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.dto.StoreActivityDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.LifeUserVo;
 import shop.alien.store.entity.vo.StoreActivityVo;
 import shop.alien.store.entity.vo.StoreInfoVo;

alien-store/src/main/java/shop/alien/store/controller/StoreAppVersionController.java

@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import shop.alien.store.entity.StoreAppVersion;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreAppVersion;
 import shop.alien.store.service.StoreAppVersionService;
 
 /**

alien-store/src/main/java/shop/alien/store/controller/StoreBusinessInfoController.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreBusinessInfo;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreBusinessInfo;
 import shop.alien.store.service.StoreBusinessInfoService;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/StoreCashOutRecordController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreCashOutRecordVo;
 import shop.alien.store.service.StoreCashOutRecordService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreClassManageController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeClassManage;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeClassManage;
 import shop.alien.store.service.StoreClassManageService;
 
 import java.util.ArrayList;

alien-store/src/main/java/shop/alien/store/controller/StoreClockInController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreClockIn;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreClockIn;
 import shop.alien.store.entity.vo.StoreClockInVo;
 import shop.alien.store.service.StoreClockInService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreCommentAppealController.java

@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreCommentAppealVo;
 import shop.alien.store.service.StoreCommentAppealService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreCommentController.java

@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreCommentVo;
 import shop.alien.store.entity.vo.StoreCommitPercentVo;
 import shop.alien.store.service.StoreCommentService;

alien-store/src/main/java/shop/alien/store/controller/StoreCustomerServiceController.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreCustomerService;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreCustomerService;
 import shop.alien.store.service.StoreCustomerServiceService;
 
 /**

alien-store/src/main/java/shop/alien/store/controller/StoreDictController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreDictionary;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreDictionary;
 import shop.alien.store.service.StoreDictService;
 
 import java.util.Date;

alien-store/src/main/java/shop/alien/store/controller/StoreDynamicDiscountController.java

@@ -6,8 +6,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreDynamicDiscount;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreDynamicDiscount;
 import shop.alien.store.entity.vo.StoreDynamicDiscountInviteLogVo;
 import shop.alien.store.entity.vo.StoreDynamicDiscountVo;
 import shop.alien.store.service.StoreDynamicDiscountInviteLogService;

alien-store/src/main/java/shop/alien/store/controller/StoreEvaluationController.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreEvaluation;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreEvaluation;
 import shop.alien.store.entity.dto.GroupRes;
 import shop.alien.store.entity.dto.StoreEvaluationDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.service.StoreEvaluationService;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/StoreFileUploadController.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.util.FileUploadUtil;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/StoreGroupPackageController.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreGroupPackageVO;
 import shop.alien.store.service.StoreGroupPackageService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreImgController.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreImg;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreImg;
 import shop.alien.store.entity.vo.StoreImgTypeVo;
 import shop.alien.store.service.StoreImgService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreIncomeDetailsRecordController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreIncomeDetailsRecord;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreIncomeDetailsRecord;
 import shop.alien.store.entity.vo.StoreIncomeDetailsRecordVo;
 import shop.alien.store.service.StoreIncomeDetailsRecordService;
 import shop.alien.store.task.ScheduledTask;

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -7,10 +7,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.StoreInfo;
-import shop.alien.store.entity.StoreInfoDraft;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreInfo;
+import shop.alien.entity.store.StoreInfoDraft;
 import shop.alien.store.entity.dto.StoreInfoDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.*;
 import shop.alien.store.service.StoreInfoService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreLabelController.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreLabel;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreLabel;
 import shop.alien.store.service.StoreLabelService;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/StoreMembershipCardOrderController.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreMembershipCardOrderVo;
 import shop.alien.store.service.StoreMembershipCardOrderService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreMenuController.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreMenu;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreMenu;
 import shop.alien.store.entity.vo.StoreMenuVo;
 import shop.alien.store.service.StoreMenuService;
 

alien-store/src/main/java/shop/alien/store/controller/StorePersonalCustomizedController.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiOperationSupport;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StorePersonalCustomizedVo;
 import shop.alien.store.service.StorePersonalCustomizedService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreSalesDetailsController.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiSort;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreSalesDetailsVo;
 import shop.alien.store.service.StoreSalesDetailsService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreStaffConfigController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreStaffConfig;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreStaffConfig;
 import shop.alien.store.service.StoreStaffConfigService;
 
 import java.io.IOException;

alien-store/src/main/java/shop/alien/store/controller/StoreUserController.java

@@ -6,9 +6,9 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.StoreImg;
-import shop.alien.store.entity.StoreUser;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreImg;
+import shop.alien.entity.store.StoreUser;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.entity.vo.StoreUserVo;
 import shop.alien.store.mapper.StoreImgMapper;

alien-store/src/main/java/shop/alien/store/controller/StoreUserExpertController.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperationSupport;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.LifeUserExpertVo;
 import shop.alien.store.service.StoreUserExpertService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreUserExpertOrderController.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperationSupport;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.LifeUserExpertOrderVo;
 import shop.alien.store.service.LifeUserExpertOrderService;
 

alien-store/src/main/java/shop/alien/store/controller/StoreVipLogController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreVipLogVo;
 import shop.alien.store.service.StoreVipLogService;
 

alien-store/src/main/java/shop/alien/store/controller/SystemController.java

@@ -4,9 +4,9 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.SystemLoginDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.SystemLoginVo;
 import shop.alien.store.service.SystemService;
 import shop.alien.store.util.TokenInfo;

alien-store/src/main/java/shop/alien/store/controller/TestInfoController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.util.CommendUtil;
 
 /**

alien-store/src/main/java/shop/alien/store/controller/UserBrandedCardController.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.service.LifeUserBrandedCardService;
 
 import java.text.ParseException;

alien-store/src/main/java/shop/alien/store/controller/UserCarouselImageController.java

@@ -8,8 +8,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeCarouselImage;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeCarouselImage;
 import shop.alien.store.mapper.LifeCarouselImageMapper;
 
 @Api(tags = {"一期-用户轮播图"})

alien-store/src/main/java/shop/alien/store/controller/UserOrderController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeRefundOrder;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeRefundOrder;
 import shop.alien.store.service.LifeUserOrderService;
 import shop.alien.store.util.ListToPage;
 

alien-store/src/main/java/shop/alien/store/controller/UserStoreController.java

@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.service.LifeUserStoreService;
 import shop.alien.store.util.AlipayTradeAppPay;
 import shop.alien.store.util.ListToPage;

alien-store/src/main/java/shop/alien/store/controller/UserViolationController.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeUserViolation;
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeUserViolation;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeUserViolationDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.service.LifeUserViolationService;
 import shop.alien.store.util.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;

alien-store/src/main/java/shop/alien/store/controller/WebAuditController.java

@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.WebAudit;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.WebAudit;
 import shop.alien.store.entity.vo.WebAuditVo;
 import shop.alien.store.service.WebAuditService;
 

alien-store/src/main/java/shop/alien/store/controller/WebSocketController.java

@@ -5,9 +5,9 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeMessage;
 import shop.alien.store.config.WebSocketProcess;
-import shop.alien.store.entity.LifeMessage;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.WebsocketVo;
 import shop.alien.store.mapper.LifeMessageMapper;
 

alien-store/src/main/java/shop/alien/store/service/impl/PlatformBrandedCardServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.store.LifeBrandedCard;
 import shop.alien.entity.store.LifeCoupon;
 import shop.alien.entity.store.StoreImg;
+import shop.alien.entity.store.StoreInfo;
 import shop.alien.store.entity.vo.LifeBrandedCardVo;
 import shop.alien.store.entity.vo.LifeCouponVo;
 import shop.alien.store.mapper.LifeBrandedCardMapper;

alien-store/src/main/java/shop/alien/store/service/impl/StoreActivityServiceImpl.java

@@ -11,10 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import shop.alien.entity.store.LifeUser;
-import shop.alien.entity.store.StoreActivity;
-import shop.alien.entity.store.StoreActivityRule;
-import shop.alien.entity.store.StoreActivityRuleDetail;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.dto.StoreActivityDto;
 import shop.alien.store.entity.excelVo.StoreActivityExcelVo;
 import shop.alien.store.entity.vo.LifeUserVo;

alien-store/src/main/java/shop/alien/store/service/impl/StoreMembershipCardOrderServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import shop.alien.entity.store.StoreInfo;
 import shop.alien.entity.store.StoreMembershipCard;
 import shop.alien.entity.store.StoreMembershipCardOrder;
 import shop.alien.store.entity.vo.StoreMembershipCardOrderVo;

alien-store/src/main/java/shop/alien/store/service/impl/StorePersonalCustomizedServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.StoreInfo;
 import shop.alien.entity.store.StorePersonalCustomized;
 import shop.alien.store.entity.vo.StorePersonalCustomizedVo;
 import shop.alien.store.mapper.LifeCouponMapper;