Преглед изворни кода

实体类提出共通 提交

zjy пре 1 месец
родитељ
комит
640e4854a1
100 измењених фајлова са 135 додато и 136 уклоњено
  1. 1 1
      alien-store/src/main/java/shop/alien/store/config/GaoDeMapUtil.java
  2. 1 1
      alien-store/src/main/java/shop/alien/store/config/JWTInterceptor.java
  3. 1 1
      alien-store/src/main/java/shop/alien/store/config/TokenInfoArgumentResolver.java
  4. 1 1
      alien-store/src/main/java/shop/alien/store/service/EssentialCityCodeService.java
  5. 1 1
      alien-store/src/main/java/shop/alien/store/service/EssentialHolidayComparisonService.java
  6. 1 1
      alien-store/src/main/java/shop/alien/store/service/EssentialModuleInformationService.java
  7. 1 1
      alien-store/src/main/java/shop/alien/store/service/EvaluationLabelService.java
  8. 4 4
      alien-store/src/main/java/shop/alien/store/service/LifeAppealManageService.java
  9. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeBlacklistService.java
  10. 2 2
      alien-store/src/main/java/shop/alien/store/service/LifeBrandedCardService.java
  11. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeBrowseRecordService.java
  12. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeClassManageService.java
  13. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeCommentService.java
  14. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeCouponService.java
  15. 2 2
      alien-store/src/main/java/shop/alien/store/service/LifeDictService.java
  16. 2 2
      alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponService.java
  17. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponStoreFriendSendRecordService.java
  18. 3 3
      alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponStoreFriendService.java
  19. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponUnavailableRulesService.java
  20. 2 2
      alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponUserService.java
  21. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeFansService.java
  22. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeGroupPackageService.java
  23. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeMessageService.java
  24. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeNoticeService.java
  25. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeReverseGroupBiddingService.java
  26. 2 2
      alien-store/src/main/java/shop/alien/store/service/LifeReverseGroupBuyingService.java
  27. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeStoreOrderService.java
  28. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeStoreService.java
  29. 3 3
      alien-store/src/main/java/shop/alien/store/service/LifeUserBrandedCardService.java
  30. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java
  31. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserExpertOrderService.java
  32. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserExpertPurchaseService.java
  33. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserExpertService.java
  34. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserExpertWorksService.java
  35. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java
  36. 3 3
      alien-store/src/main/java/shop/alien/store/service/LifeUserService.java
  37. 1 1
      alien-store/src/main/java/shop/alien/store/service/LifeUserStoreService.java
  38. 2 2
      alien-store/src/main/java/shop/alien/store/service/LifeUserViolationService.java
  39. 1 1
      alien-store/src/main/java/shop/alien/store/service/ManagementInfoService.java
  40. 2 2
      alien-store/src/main/java/shop/alien/store/service/PlatformBrandedCardService.java
  41. 1 1
      alien-store/src/main/java/shop/alien/store/service/PlatformClassService.java
  42. 1 1
      alien-store/src/main/java/shop/alien/store/service/PlatformStoreCouponService.java
  43. 1 1
      alien-store/src/main/java/shop/alien/store/service/PromotionPackageService.java
  44. 1 1
      alien-store/src/main/java/shop/alien/store/service/RestRankingListService.java
  45. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreActivityRuleDetailService.java
  46. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreActivityRuleService.java
  47. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreActivityService.java
  48. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreAliPayLogService.java
  49. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreAppVersionService.java
  50. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreBusinessInfoService.java
  51. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreCashOutRecordService.java
  52. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreClassManageService.java
  53. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreClockInService.java
  54. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreCommentAppealService.java
  55. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreCommentService.java
  56. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreCustomerServiceService.java
  57. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreDictService.java
  58. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreDynamicDiscountInviteLogService.java
  59. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreDynamicDiscountReceiveLogService.java
  60. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreDynamicDiscountService.java
  61. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreEvaluationService.java
  62. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreGroupInfoService.java
  63. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreGroupPackageService.java
  64. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreImgService.java
  65. 1 2
      alien-store/src/main/java/shop/alien/store/service/StoreIncomeDetailsRecordService.java
  66. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreInfoDraftService.java
  67. 2 2
      alien-store/src/main/java/shop/alien/store/service/StoreInfoService.java
  68. 1 2
      alien-store/src/main/java/shop/alien/store/service/StoreLabelService.java
  69. 2 3
      alien-store/src/main/java/shop/alien/store/service/StoreMembershipCardOrderService.java
  70. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreMembershipCardService.java
  71. 1 2
      alien-store/src/main/java/shop/alien/store/service/StoreMenuService.java
  72. 1 1
      alien-store/src/main/java/shop/alien/store/service/StorePersonalCustomizedService.java
  73. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreStaffConfigService.java
  74. 1 2
      alien-store/src/main/java/shop/alien/store/service/StoreUserExpertService.java
  75. 2 3
      alien-store/src/main/java/shop/alien/store/service/StoreUserService.java
  76. 1 1
      alien-store/src/main/java/shop/alien/store/service/StoreVipLogService.java
  77. 1 1
      alien-store/src/main/java/shop/alien/store/service/SystemService.java
  78. 1 1
      alien-store/src/main/java/shop/alien/store/service/WebAuditService.java
  79. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/EssentialCityCodeServiceImpl.java
  80. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/EssentialHolidayComparisonServiceImpl.java
  81. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/EssentialModuleInformationServiceImpl.java
  82. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/EvaluationLabelServiceImpl.java
  83. 4 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeBlacklistServiceImpl.java
  84. 4 4
      alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java
  85. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java
  86. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponStoreFriendSendRecordServiceImpl.java
  87. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponStoreFriendServiceImpl.java
  88. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponUnavailableRulesServiceImpl.java
  89. 3 3
      alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponUserServiceImpl.java
  90. 2 2
      alien-store/src/main/java/shop/alien/store/service/impl/LifeFansServiceImpl.java
  91. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupPackageServiceImpl.java
  92. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java
  93. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeNoticeServiceImpl.java
  94. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeReverseGroupBuyingServiceImpl.java
  95. 3 3
      alien-store/src/main/java/shop/alien/store/service/impl/LifeStoreOrderServiceImpl.java
  96. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeUserExpertOrderServiceImpl.java
  97. 4 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeUserExpertPurchaseServiceImpl.java
  98. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/LifeUserViolationServiceImpl.java
  99. 1 1
      alien-store/src/main/java/shop/alien/store/service/impl/ManagementInfoServiceImpl.java
  100. 3 4
      alien-store/src/main/java/shop/alien/store/service/impl/PlatformBrandedCardServiceImpl.java

+ 1 - 1
alien-store/src/main/java/shop/alien/store/config/GaoDeMapUtil.java

@@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import shop.alien.store.entity.EssentialCityCode;
+import shop.alien.entity.store.EssentialCityCode;
 import shop.alien.store.mapper.EssentialCityCodeMapper;
 
 import java.io.BufferedReader;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/config/JWTInterceptor.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.cors.CorsUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
-import shop.alien.store.entity.StoreUser;
+import shop.alien.entity.store.StoreUser;
 import shop.alien.store.mapper.StoreUserMapper;
 
 import javax.servlet.http.HttpServletRequest;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/config/TokenInfoArgumentResolver.java

@@ -9,7 +9,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 
 import javax.servlet.http.HttpServletRequest;
 
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.util.TokenInfo;
 
 public class TokenInfoArgumentResolver implements HandlerMethodArgumentResolver {

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/EssentialCityCodeService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.EssentialCityCode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.EssentialCityCode;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/EssentialHolidayComparisonService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.EssentialHolidayComparison;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.EssentialHolidayComparison;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/EssentialModuleInformationService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.EssentialModuleInformation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.EssentialModuleInformation;
 import shop.alien.store.entity.vo.EssentialModuleInformationVo;
 
 import java.util.List;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/EvaluationLabelService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.EvaluationLabel;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.EvaluationLabel;
 
 import java.util.List;
 import java.util.Set;

+ 4 - 4
alien-store/src/main/java/shop/alien/store/service/LifeAppealManageService.java

@@ -10,10 +10,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-import shop.alien.store.entity.LifeAppealManage;
-import shop.alien.store.entity.LifeNotice;
-import shop.alien.store.entity.StoreComment;
-import shop.alien.store.entity.StoreCommentAppeal;
+import shop.alien.entity.store.LifeAppealManage;
+import shop.alien.entity.store.LifeNotice;
+import shop.alien.entity.store.StoreComment;
+import shop.alien.entity.store.StoreCommentAppeal;
 import shop.alien.store.entity.dto.LifeAppealManageDto;
 import shop.alien.store.entity.excelVo.LifeAppealManageExcelVo;
 import shop.alien.store.entity.vo.LifeAppealManageVo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeBlacklistService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeBlacklist;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeBlacklist;
 import shop.alien.store.entity.vo.LifeBlacklistVo;
 
 import java.util.List;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/LifeBrandedCardService.java

@@ -8,8 +8,8 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-import shop.alien.store.entity.LifeBrandedCard;
-import shop.alien.store.entity.LifeCoupon;
+import shop.alien.entity.store.LifeBrandedCard;
+import shop.alien.entity.store.LifeCoupon;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.LifeBrandedCardMapper;
 import shop.alien.store.mapper.LifeCouponMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeBrowseRecordService.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import shop.alien.store.entity.LifeBrowseRecord;
+import shop.alien.entity.store.LifeBrowseRecord;
 import shop.alien.store.mapper.LifeBrowseRecordMapper;
 
 import java.time.LocalDate;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeClassManageService.java

@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import shop.alien.store.entity.LifeClassManage;
+import shop.alien.entity.store.LifeClassManage;
 import shop.alien.store.mapper.LifeClassManageMapper;
 
 import java.util.Date;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeCommentService.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.vo.LifePinglunVo;
 import shop.alien.store.mapper.*;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeCouponService.java

@@ -2,7 +2,7 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeCoupon;
+import shop.alien.entity.store.LifeCoupon;
 
 import java.util.Map;
 

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/LifeDictService.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.LifeDict;
-import shop.alien.store.entity.StoreDictionary;
+import shop.alien.entity.store.LifeDict;
+import shop.alien.entity.store.StoreDictionary;
 import shop.alien.store.entity.vo.StoreDictionaryVo;
 import shop.alien.store.mapper.LifeDictMapper;
 import shop.alien.store.mapper.StoreDictionaryMapper;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponService.java

@@ -2,9 +2,9 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RequestParam;
-import shop.alien.store.entity.LifeDiscountCoupon;
+import shop.alien.entity.store.LifeDiscountCoupon;
+import shop.alien.entity.store.UserLoginInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeDiscountCouponDto;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponStoreFriendSendRecordService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeDiscountCouponStoreFriendSendRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeDiscountCouponStoreFriendSendRecord;
 
 /**
  * <p>

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponStoreFriendService.java

@@ -1,8 +1,8 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeDiscountCouponStoreFriend;
+import shop.alien.entity.store.LifeDiscountCouponStoreFriend;
+import shop.alien.entity.store.UserLoginInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeDiscountCouponStoreFriendDto;
 import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 
@@ -21,7 +21,7 @@ public interface LifeDiscountCouponStoreFriendService extends IService<LifeDisco
     /**
      * 获取该店铺的好友及其可用优惠券列表
      * */
-    public List<LifeDiscountCouponStoreFriendVo> getFriendCouponList(UserLoginInfo userLoginInfo,String friendUserId);
+    public List<LifeDiscountCouponStoreFriendVo> getFriendCouponList(UserLoginInfo userLoginInfo, String friendUserId);
 
 
     /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponUnavailableRulesService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeDiscountCouponUnavailableRules;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeDiscountCouponUnavailableRules;
 
 /**
  * <p>

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/LifeDiscountCouponUserService.java

@@ -1,9 +1,9 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeDiscountCouponUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeDiscountCouponUser;
 import shop.alien.store.entity.dto.LifeDiscountCouponUserDto;
-import shop.alien.store.entity.result.R;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeFansService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeFans;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeFans;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeGroupPackageService.java

@@ -2,7 +2,7 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeGroupPackage;
+import shop.alien.entity.store.LifeGroupPackage;
 import shop.alien.store.entity.vo.LifeCouponVo;
 import shop.alien.store.entity.vo.LifeTuanGouParamVo;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeMessageService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
-import shop.alien.store.entity.LifeMessage;
+import shop.alien.entity.store.LifeMessage;
 import shop.alien.store.entity.vo.LifeMessageVo;
 
 import java.util.List;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeNoticeService.java

@@ -3,7 +3,7 @@ package shop.alien.store.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeNotice;
+import shop.alien.entity.store.LifeNotice;
 import shop.alien.store.entity.vo.LifeNoticeVo;
 
 public interface LifeNoticeService extends IService<LifeNotice> {

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeReverseGroupBiddingService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeReverseGroupBidding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeReverseGroupBidding;
 
 /**
  * 用户反向团购竞价表 服务类

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/LifeReverseGroupBuyingService.java

@@ -3,8 +3,8 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestBody;
-import shop.alien.store.entity.LifeReverseGroupBidding;
-import shop.alien.store.entity.LifeReverseGroupBuying;
+import shop.alien.entity.store.LifeReverseGroupBidding;
+import shop.alien.entity.store.LifeReverseGroupBuying;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingStoreVo;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingUserVo;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeStoreOrderService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeUserOrder;
+import shop.alien.entity.store.LifeUserOrder;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeStoreService.java

@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.vo.LifeFansVo;
 import shop.alien.store.entity.vo.LifeStoreVo;
 import shop.alien.store.entity.vo.LifeUserVo;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/LifeUserBrandedCardService.java

@@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.LifeBrandedCard;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.LifeUserOrder;
+import shop.alien.entity.store.LifeBrandedCard;
+import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.LifeUserOrder;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.LifeBrandedCardMapper;
 import shop.alien.store.mapper.LifeCouponMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -11,7 +11,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.vo.LifePinglunVo;
 import shop.alien.store.entity.vo.LifeUserDynamicsVo;
 import shop.alien.store.mapper.*;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserExpertOrderService.java

@@ -1,8 +1,8 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.LifeUserExpertOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeUserExpertOrder;
 import shop.alien.store.entity.vo.LifeUserExpertOrderVo;
 
 import java.util.List;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserExpertPurchaseService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeUserExpertPurchase;
+import shop.alien.entity.store.LifeUserExpertPurchase;
 
 import java.util.Map;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserExpertService.java

@@ -1,8 +1,8 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.LifeUserExpert;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeUserExpert;
 import shop.alien.store.entity.vo.ExpertGoodsTypeVo;
 import shop.alien.store.entity.vo.LifeUserExpertOrderVo;
 import shop.alien.store.entity.vo.LifeUserExpertVo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserExpertWorksService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeUserExpertWorks;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.LifeUserExpertWorks;
 
 import java.util.Map;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import shop.alien.entity.store.*;
 import shop.alien.store.config.GaoDeMapUtil;
-import shop.alien.store.entity.*;
 import shop.alien.store.entity.excelVo.LifeUserOrderExcelVo;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.*;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/LifeUserService.java

@@ -13,11 +13,11 @@ import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import shop.alien.entity.store.LifeFans;
+import shop.alien.entity.store.LifeNotice;
+import shop.alien.entity.store.LifeUser;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.config.JWTUtils;
-import shop.alien.store.entity.LifeFans;
-import shop.alien.store.entity.LifeNotice;
-import shop.alien.store.entity.LifeUser;
 import shop.alien.store.entity.vo.LifeMessageVo;
 import shop.alien.store.entity.vo.LifeUserVo;
 import shop.alien.store.mapper.LifeFansMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserStoreService.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import shop.alien.entity.store.*;
 import shop.alien.store.config.GaoDeMapUtil;
-import shop.alien.store.entity.*;
 import shop.alien.store.entity.vo.LifeUserDynamicsVo;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.*;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/LifeUserViolationService.java

@@ -2,8 +2,8 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeUserViolation;
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.store.LifeUserViolation;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeUserViolationDto;
 
 import java.io.IOException;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/ManagementInfoService.java

@@ -2,7 +2,7 @@ package shop.alien.store.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.ManagementInfo;
+import shop.alien.entity.store.ManagementInfo;
 import shop.alien.store.entity.vo.ManagementInfoVo;
 
 import java.util.HashMap;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/PlatformBrandedCardService.java

@@ -2,8 +2,8 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.LifeBrandedCard;
-import shop.alien.store.entity.StoreInfo;
+import shop.alien.entity.store.LifeBrandedCard;
+import shop.alien.entity.store.StoreInfo;
 import shop.alien.store.entity.vo.LifeBrandedCardVo;
 import shop.alien.store.entity.vo.LifeCouponVo;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/PlatformClassService.java

@@ -3,7 +3,7 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.LifeClassManage;
+import shop.alien.entity.store.LifeClassManage;
 
 import java.io.IOException;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/PlatformStoreCouponService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.LifeCoupon;
+import shop.alien.entity.store.LifeCoupon;
 import shop.alien.store.entity.vo.LifeCouponVo;
 
 import java.io.IOException;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/PromotionPackageService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifePromotionPackage;
+import shop.alien.entity.store.LifePromotionPackage;
 import shop.alien.store.entity.vo.LifePromotionPackageVo;
 
 import java.util.List;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/RestRankingListService.java

@@ -2,7 +2,7 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.RestRankingList;
+import shop.alien.entity.store.RestRankingList;
 
 public interface RestRankingListService extends IService<RestRankingList> {
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreActivityRuleDetailService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreActivityRuleDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreActivityRuleDetail;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreActivityRuleService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreActivityRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreActivityRule;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreActivityService.java

@@ -3,8 +3,8 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RequestParam;
-import shop.alien.store.entity.StoreActivity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreActivity;
 import shop.alien.store.entity.dto.StoreActivityDto;
 import shop.alien.store.entity.vo.LifeUserVo;
 import shop.alien.store.entity.vo.StoreActivityVo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreAliPayLogService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreAliPayLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreAliPayLog;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreAppVersionService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreAppVersion;
+import shop.alien.entity.store.StoreAppVersion;
 
 /**
  * App版本表 服务类

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreBusinessInfoService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreBusinessInfo;
+import shop.alien.entity.store.StoreBusinessInfo;
 
 import java.util.List;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreCashOutRecordService.java

@@ -2,7 +2,7 @@ package shop.alien.store.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreCashOutRecord;
+import shop.alien.entity.store.StoreCashOutRecord;
 import shop.alien.store.entity.vo.StoreCashOutRecordVo;
 
 import java.util.Date;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreClassManageService.java

@@ -1,6 +1,6 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.LifeClassManage;
+import shop.alien.entity.store.LifeClassManage;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreClockInService.java

@@ -1,8 +1,8 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.StoreClockIn;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreClockIn;
 import shop.alien.store.entity.vo.StoreClockInVo;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreCommentAppealService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.StoreCommentAppeal;
+import shop.alien.entity.store.StoreCommentAppeal;
 import shop.alien.store.entity.vo.StoreCommentAppealVo;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreCommentService.java

@@ -3,7 +3,7 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.StoreComment;
+import shop.alien.entity.store.StoreComment;
 import shop.alien.store.entity.vo.StoreCommentVo;
 import shop.alien.store.entity.vo.StoreCommitPercentVo;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreCustomerServiceService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreCustomerService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreCustomerService;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreDictService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreDictionary;
+import shop.alien.entity.store.StoreDictionary;
 
 import java.util.List;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreDynamicDiscountInviteLogService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreDynamicDiscountInviteLog;
+import shop.alien.entity.store.StoreDynamicDiscountInviteLog;
 import shop.alien.store.entity.vo.StoreDynamicDiscountInviteLogVo;
 
 import java.util.List;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreDynamicDiscountReceiveLogService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreDynamicDiscountReceiveLog;
+import shop.alien.entity.store.StoreDynamicDiscountReceiveLog;
 
 /**
  * 商户动态折扣领取记录 服务类

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreDynamicDiscountService.java

@@ -3,7 +3,7 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.http.ResponseEntity;
-import shop.alien.store.entity.StoreDynamicDiscount;
+import shop.alien.entity.store.StoreDynamicDiscount;
 import shop.alien.store.entity.vo.StoreDynamicDiscountVo;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreEvaluationService.java

@@ -3,7 +3,7 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
-import shop.alien.store.entity.StoreEvaluation;
+import shop.alien.entity.store.StoreEvaluation;
 import shop.alien.store.entity.dto.GroupRes;
 import shop.alien.store.entity.dto.StoreEvaluationDto;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreGroupInfoService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreGroupInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreGroupInfo;
 
 /**
  * <p>

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreGroupPackageService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreGroupPackage;
+import shop.alien.entity.store.StoreGroupPackage;
 import shop.alien.store.entity.vo.StoreGroupPackageVO;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreImgService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreImg;
+import shop.alien.entity.store.StoreImg;
 import shop.alien.store.entity.vo.StoreImgTypeVo;
 
 import java.util.List;

+ 1 - 2
alien-store/src/main/java/shop/alien/store/service/StoreIncomeDetailsRecordService.java

@@ -2,9 +2,8 @@ package shop.alien.store.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreIncomeDetailsRecord;
+import shop.alien.entity.store.StoreIncomeDetailsRecord;
 import shop.alien.store.entity.vo.StoreIncomeDetailsRecordVo;
-
 import java.util.Map;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreInfoDraftService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreInfoDraft;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreInfoDraft;
 
 /**
  * <p>

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/StoreInfoService.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.StoreInfo;
-import shop.alien.store.entity.StoreInfoDraft;
+import shop.alien.entity.store.StoreInfo;
+import shop.alien.entity.store.StoreInfoDraft;
 import shop.alien.store.entity.dto.StoreInfoDto;
 import shop.alien.store.entity.vo.*;
 

+ 1 - 2
alien-store/src/main/java/shop/alien/store/service/StoreLabelService.java

@@ -1,8 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreLabel;
-
+import shop.alien.entity.store.StoreLabel;
 import java.util.List;
 
 /**

+ 2 - 3
alien-store/src/main/java/shop/alien/store/service/StoreMembershipCardOrderService.java

@@ -1,12 +1,11 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.StoreMembershipCard;
-import shop.alien.store.entity.StoreMembershipCardOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreMembershipCard;
+import shop.alien.entity.store.StoreMembershipCardOrder;
 import shop.alien.store.entity.vo.StoreMembershipCardOrderVo;
 import shop.alien.store.entity.vo.StoreMembershipCardVo;
-
 import java.util.List;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreMembershipCardService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.StoreMembershipCard;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StoreMembershipCard;
 
 /**
  * <p>

+ 1 - 2
alien-store/src/main/java/shop/alien/store/service/StoreMenuService.java

@@ -1,9 +1,8 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreMenu;
+import shop.alien.entity.store.StoreMenu;
 import shop.alien.store.entity.vo.StoreMenuVo;
-
 import java.util.List;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StorePersonalCustomizedService.java

@@ -2,8 +2,8 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import shop.alien.store.entity.StorePersonalCustomized;
 import com.baomidou.mybatisplus.extension.service.IService;
+import shop.alien.entity.store.StorePersonalCustomized;
 import shop.alien.store.entity.vo.StorePersonalCustomizedVo;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreStaffConfigService.java

@@ -1,7 +1,7 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import shop.alien.store.entity.StoreStaffConfig;
+import shop.alien.entity.store.StoreStaffConfig;
 
 import java.io.IOException;
 

+ 1 - 2
alien-store/src/main/java/shop/alien/store/service/StoreUserExpertService.java

@@ -1,9 +1,8 @@
 package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.LifeUserExpert;
+import shop.alien.entity.store.LifeUserExpert;
 import shop.alien.store.entity.vo.LifeUserExpertVo;
-
 import java.util.List;
 import java.util.Map;
 

+ 2 - 3
alien-store/src/main/java/shop/alien/store/service/StoreUserService.java

@@ -3,10 +3,9 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
-import shop.alien.store.entity.StoreUser;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreUser;
 import shop.alien.store.entity.vo.StoreUserVo;
-
 import java.io.IOException;
 import java.util.List;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreVipLogService.java

@@ -2,7 +2,7 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.StoreVipLog;
+import shop.alien.entity.store.StoreVipLog;
 import shop.alien.store.entity.vo.StoreVipLogVo;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/SystemService.java

@@ -1,6 +1,6 @@
 package shop.alien.store.service;
 
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.vo.SystemLoginVo;
 
 /**

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/WebAuditService.java

@@ -3,7 +3,7 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.store.entity.WebAudit;
+import shop.alien.entity.store.WebAudit;
 import shop.alien.store.entity.vo.WebAuditVo;
 
 import java.util.List;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/EssentialCityCodeServiceImpl.java

@@ -1,6 +1,6 @@
 package shop.alien.store.service.impl;
 
-import shop.alien.store.entity.EssentialCityCode;
+import shop.alien.entity.store.EssentialCityCode;
 import shop.alien.store.mapper.EssentialCityCodeMapper;
 import shop.alien.store.service.EssentialCityCodeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/EssentialHolidayComparisonServiceImpl.java

@@ -1,6 +1,6 @@
 package shop.alien.store.service.impl;
 
-import shop.alien.store.entity.EssentialHolidayComparison;
+import shop.alien.entity.store.EssentialHolidayComparison;
 import shop.alien.store.mapper.EssentialHolidayComparisonMapper;
 import shop.alien.store.service.EssentialHolidayComparisonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/EssentialModuleInformationServiceImpl.java

@@ -6,7 +6,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.store.entity.EssentialModuleInformation;
+import shop.alien.entity.store.EssentialModuleInformation;
 import shop.alien.store.entity.vo.EssentialModuleInformationVo;
 import shop.alien.store.mapper.EssentialModuleInformationMapper;
 import shop.alien.store.service.EssentialModuleInformationService;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/EvaluationLabelServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.EvaluationLabel;
+import shop.alien.entity.store.EvaluationLabel;
 import shop.alien.store.mapper.EvaluationLabelMapper;
 import shop.alien.store.service.EvaluationLabelService;
 

+ 4 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeBlacklistServiceImpl.java

@@ -3,7 +3,10 @@ package shop.alien.store.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.LifeBlacklist;
+import shop.alien.entity.store.LifeUser;
+import shop.alien.entity.store.StoreImg;
+import shop.alien.entity.store.StoreUser;
 import shop.alien.store.entity.vo.LifeBlacklistVo;
 import shop.alien.store.mapper.LifeBlacklistMapper;
 import shop.alien.store.mapper.LifeUserMapper;

+ 4 - 4
alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -9,10 +9,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.LifeUserOrder;
-import shop.alien.store.entity.StoreDictionary;
-import shop.alien.store.entity.StoreIncomeDetailsRecord;
+import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.LifeUserOrder;
+import shop.alien.entity.store.StoreDictionary;
+import shop.alien.entity.store.StoreIncomeDetailsRecord;
 import shop.alien.store.entity.dto.LifeDiscountCouponStoreFriendDto;
 import shop.alien.store.mapper.LifeCouponMapper;
 import shop.alien.store.mapper.LifeUserOrderMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.dto.LifeDiscountCouponDto;
 import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponStoreFriendSendRecordServiceImpl.java

@@ -1,6 +1,6 @@
 package shop.alien.store.service.impl;
 
-import shop.alien.store.entity.LifeDiscountCouponStoreFriendSendRecord;
+import shop.alien.entity.store.LifeDiscountCouponStoreFriendSendRecord;
 import shop.alien.store.mapper.LifeDiscountCouponStoreFriendSendRecordMapper;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendSendRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponStoreFriendServiceImpl.java

@@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.dto.LifeDiscountCouponStoreFriendDto;
 import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponUnavailableRulesServiceImpl.java

@@ -1,6 +1,6 @@
 package shop.alien.store.service.impl;
 
-import shop.alien.store.entity.LifeDiscountCouponUnavailableRules;
+import shop.alien.entity.store.LifeDiscountCouponUnavailableRules;
 import shop.alien.store.mapper.LifeDiscountCouponUnavailableRulesMapper;
 import shop.alien.store.service.LifeDiscountCouponUnavailableRulesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponUserServiceImpl.java

@@ -5,10 +5,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.LifeDiscountCoupon;
-import shop.alien.store.entity.LifeDiscountCouponUser;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeDiscountCoupon;
+import shop.alien.entity.store.LifeDiscountCouponUser;
 import shop.alien.store.entity.dto.LifeDiscountCouponUserDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.mapper.LifeDiscountCouponMapper;
 import shop.alien.store.mapper.LifeDiscountCouponUserMapper;
 import shop.alien.store.service.LifeDiscountCouponUserService;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/impl/LifeFansServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.LifeFans;
-import shop.alien.store.entity.LifeUser;
+import shop.alien.entity.store.LifeFans;
+import shop.alien.entity.store.LifeUser;
 import shop.alien.store.mapper.LifeFansMapper;
 import shop.alien.store.mapper.LifeUserMapper;
 import shop.alien.store.mapper.StoreUserMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupPackageServiceImpl.java

@@ -10,7 +10,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.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.vo.LifeCouponVo;
 import shop.alien.store.entity.vo.LifeTuanGouParamVo;
 import shop.alien.store.mapper.*;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.vo.LifeFansVo;
 import shop.alien.store.entity.vo.LifeMessageVo;
 import shop.alien.store.mapper.LifeFansMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeNoticeServiceImpl.java

@@ -9,7 +9,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.store.entity.LifeNotice;
+import shop.alien.entity.store.LifeNotice;
 import shop.alien.store.entity.vo.LifeMessageVo;
 import shop.alien.store.entity.vo.LifeNoticeVo;
 import shop.alien.store.mapper.LifeMessageMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeReverseGroupBuyingServiceImpl.java

@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import shop.alien.entity.store.*;
 import shop.alien.store.config.GaoDeMapUtil;
-import shop.alien.store.entity.*;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingStoreVo;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingUserVo;
 import shop.alien.store.mapper.LifeReverseGroupBuyingMapper;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/impl/LifeStoreOrderServiceImpl.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.LifeUser;
-import shop.alien.store.entity.LifeUserOrder;
+import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.LifeUser;
+import shop.alien.entity.store.LifeUserOrder;
 import shop.alien.store.mapper.LifeCouponMapper;
 import shop.alien.store.mapper.LifeUserOrderMapper;
 import shop.alien.store.mapper.StoreInfoMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeUserExpertOrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
-import shop.alien.store.entity.LifeUserExpertOrder;
+import shop.alien.entity.store.LifeUserExpertOrder;
 import shop.alien.store.entity.vo.LifeUserExpertOrderVo;
 import shop.alien.store.mapper.LifeUserExpertOrderMapper;
 import shop.alien.store.service.LifeUserExpertOrderService;

+ 4 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeUserExpertPurchaseServiceImpl.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.LifeUserExpertOrder;
+import shop.alien.entity.store.LifeUserExpertPurchase;
+import shop.alien.entity.store.LifeUserExpertWorks;
+import shop.alien.entity.store.StoreAliPayLog;
 import shop.alien.store.entity.vo.LifeUserExpertVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.LifeUserExpertPurchaseService;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeUserViolationServiceImpl.java

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.dto.LifeUserViolationDto;
 import shop.alien.store.entity.excelVo.LifeUserViolationExcelVO;
 import shop.alien.store.entity.vo.LifeUserViolationVo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/ManagementInfoServiceImpl.java

@@ -12,7 +12,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import shop.alien.store.entity.*;
+import shop.alien.entity.store.*;
 import shop.alien.store.entity.vo.ManagementInfoVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.ManagementInfoService;

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

@@ -10,10 +10,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
-import shop.alien.store.entity.LifeBrandedCard;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.StoreImg;
-import shop.alien.store.entity.StoreInfo;
+import shop.alien.entity.store.LifeBrandedCard;
+import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.StoreImg;
 import shop.alien.store.entity.vo.LifeBrandedCardVo;
 import shop.alien.store.entity.vo.LifeCouponVo;
 import shop.alien.store.mapper.LifeBrandedCardMapper;

Неке датотеке нису приказане због велике количине промена