pmd

gic-store-api/pom.xml

@@ -47,6 +47,12 @@
             <version>1.2.12</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-commons</artifactId>
+            <version>${gic-commons}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-store-api/src/main/java/com/gic/store/dto/ClerkOfflineDTO.java

 package com.gic.store.dto;
 
 import java.io.Serializable;
-
+/**
+ * 导购下线
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:20 PM

+ */
 public class ClerkOfflineDTO implements Serializable {
     private Integer delClerkId;
     private Integer addClerkId;
@@ -21,4 +27,12 @@ public class ClerkOfflineDTO implements Serializable {
     public void setAddClerkId(Integer addClerkId) {
         this.addClerkId = addClerkId;
     }
+
+    @Override
+    public String toString() {
+        return "ClerkOfflineDTO{" +
+                "delClerkId=" + delClerkId +
+                ", addClerkId=" + addClerkId +
+                '}';
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandChangeDTO.java

@@ -2,7 +2,13 @@ package com.gic.store.dto;
 
 import java.io.Serializable;
 import java.util.List;
-
+/**
+ * 门店品牌
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:20 PM

+ */
 public class StoreBrandChangeDTO implements Serializable {
     private List<Integer> storeInfoIdList;
     private List<Integer> add;
@@ -40,4 +46,14 @@ public class StoreBrandChangeDTO implements Serializable {
     public void setStoreInfoIdList(List<Integer> storeInfoIdList) {
         this.storeInfoIdList = storeInfoIdList;
     }
+
+    @Override
+    public String toString() {
+        return "StoreBrandChangeDTO{" +
+                "storeInfoIdList=" + storeInfoIdList +
+                ", add=" + add +
+                ", del=" + del +
+                ", change=" + change +
+                '}';
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java

@@ -11,6 +11,11 @@ public class StoreBrandDTO implements Serializable {
     private static final long serialVersionUID = -1958432666455074669L;
 
     /**
+     * 共享商户类型
+     */
+    private static final int OTHER_ENTERPRISE_TYPE = 2;
+
+    /**
      *
      */
     private Integer storeBrandId;
@@ -167,7 +172,7 @@ public class StoreBrandDTO implements Serializable {
     }
 
     public Integer getOwnerFlag() {
-        if (type != null && type == 2) {
+        if (type != null && type == OTHER_ENTERPRISE_TYPE) {
             return 0;
         }
         return 1;

gic-store-api/src/main/java/com/gic/store/dto/StoreInfoDTO.java

 package com.gic.store.dto;
 
+import com.gic.commons.annotation.SkipNamingCheck;
 import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
@@ -10,6 +11,7 @@ import java.util.List;
  * @author zhiwj
  * @date 2019/6/24
  */
+@SkipNamingCheck
 public class StoreInfoDTO implements Serializable {
     private static final long serialVersionUID = -6360038263126373120L;
     /**
@@ -116,6 +118,10 @@ public class StoreInfoDTO implements Serializable {
     private Integer createType;
     private List<StoreExtendDTO> storeExtendList;
     private Long indexId;
+
+    /**
+     * 自定义字段取值，最多10个
+     */
     private String c1;
     private String c2;
     private String c3;

gic-store-api/src/main/java/com/gic/store/dto/StoreWidgetDTO.java

@@ -3,9 +3,6 @@ package com.gic.store.dto;
 import java.io.Serializable;
 
 /**
- * tab_store_widget
- */
-/**
  * 
  * @ClassName: StoreWidgetDTO
  * @Description:  
@@ -68,7 +65,7 @@ public class StoreWidgetDTO implements Serializable {
     /**
      * 操作类型：权限范围变更/条件筛选（走不同的接口）
      */
-    private boolean isAuthChangeType;
+    private boolean authChangeType;
 
     public Integer getStoreWidgetId() {
         return storeWidgetId;
@@ -176,11 +173,11 @@ public class StoreWidgetDTO implements Serializable {
     }
 
     public boolean isAuthChangeType() {
-        return isAuthChangeType;
+        return authChangeType;
     }
 
     public StoreWidgetDTO setAuthChangeType(boolean authChangeType) {
-        isAuthChangeType = authChangeType;
+        this.authChangeType = authChangeType;
         return this;
     }
 

gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java

@@ -491,5 +491,10 @@ public interface ClerkApiService {
      */
     ServiceResponse<List<Integer>> listClerkId(List<Integer> storeInfoIdList);
 
+    /**
+     * 查询导购
+     * @param storeInfoIdList
+     * @return
+     */
     ServiceResponse<List<ClerkDTO>> listClerk(List<Integer> storeInfoIdList);
 }

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -376,6 +376,7 @@ public interface StoreApiService {
      * @author taogs
      * @Date 11:26 2019/8/23
      * @param searchJson
+     * @param enterpriseId
      * @return
     */
     ServiceResponse<JSONObject> parseStoreSelectJson(String searchJson, Integer enterpriseId);
@@ -553,6 +554,10 @@ public interface StoreApiService {
      */
     ServiceResponse<Boolean> hasUnCompleteStatusStore(Integer enterpriseId);
 
-
+    /**
+     * 测试
+     * @param params
+     * @return
+     */
     ServiceResponse<Void> testReceiveMessage(String params);
 }

gic-store-api/src/main/java/com/gic/store/service/UnionStoreChangeApiService.java

 package com.gic.store.service;
 
 import com.gic.api.base.commons.ServiceResponse;
-
+/**
+ * 门店授权
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:21 PM

+ */
 public interface UnionStoreChangeApiService {
     /**
      * save

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkMapper.java

@@ -133,6 +133,7 @@ public interface TabClerkMapper {
      * @param storeClerkIds
      * @param search
      * @param status
+     * @param clerkIdList
      * @return java.lang.Integer
      * @throws
      * @Title: getTotalClerk

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBrandRefMapper.java

@@ -4,7 +4,13 @@ import com.gic.store.entity.TabStoreBrandRef;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 门店品牌
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:20 PM

+ */
 public interface TabStoreBrandRefMapper {
     /**
      * 根据主键删除
@@ -105,6 +111,11 @@ public interface TabStoreBrandRefMapper {
      */
     Integer updateSort(@Param("enterpriseId") Integer enterpriseId, @Param("storeBrandId") Integer storeBrandId, @Param("sort") Double sort);
 
+    /**
+     * 批量插入
+     * @param list
+     * @return
+     */
     Integer insertList(@Param("list") List<TabStoreBrandRef> list);
 
     /**

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreWidgetMapper.java

@@ -61,5 +61,10 @@ public interface TabStoreWidgetMapper {
      */
     int updateByPrimaryKey(TabStoreWidget record);
 
+    /**
+     * 查询门店筛选器数据
+     * @param storeWidgetIdList
+     * @return
+     */
     List<TabStoreWidget> listStoreWidget(@Param("storeWidgetIdList") List<Integer> storeWidgetIdList);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabUnionStoreChangeLogMapper.java

@@ -2,7 +2,13 @@ package com.gic.store.dao.mapper;
 
 import com.gic.store.entity.TabUnionStoreChangeLog;
 import org.apache.ibatis.annotations.Param;
-
+/**
+ * 门店联合日志
+ * @ClassName:  
+ * @Description: 

+ * @author guojuxing
  
+ * @date 2021/7/26 3:22 PM
 
+ */
 public interface TabUnionStoreChangeLogMapper {
     /**
      * 根据主键删除

gic-store-service/src/main/java/com/gic/store/entity/TabStoreBrandRef.java

@@ -3,7 +3,11 @@ package com.gic.store.entity;
 import java.util.Date;
 
 /**
- * tab_store_brand_ref
+ * 门店品牌
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:20 PM

  */
 public class TabStoreBrandRef {
     /**

gic-store-service/src/main/java/com/gic/store/entity/TabUnionStoreChangeLog.java

@@ -3,7 +3,11 @@ package com.gic.store.entity;
 import java.util.Date;
 
 /**
- * tab_union_store_change_log
+ * 门店联合日志
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:21 PM

  */
 public class TabUnionStoreChangeLog {
     /**

gic-store-service/src/main/java/com/gic/store/service/impl/UnionStoreChangeServiceImpl.java

@@ -7,7 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-
+/**
+ * 门店授权日志
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/7/26 3:21 PM

+ */
 @Service("unionStoreChangeService")
 public class UnionStoreChangeServiceImpl implements UnionStoreChangeService {
     @Autowired

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -315,13 +315,13 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum) {
         return saveStoreForOrder(enterpriseId, storeCode, storeName, regionId, orderNum, null);
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum, Integer storeBrandId) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         Integer storeLicenseNum = 0;
@@ -354,13 +354,13 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo) {
         return saveStoreForPosMember(enterpriseId, storeCode, storeName, regionId, cardNo, null);
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo, Integer storeBrandId) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         Integer storeLicenseNum = 0;
@@ -398,7 +398,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> tranOverFlow(Integer enterpriseId, String storeIds) {
         ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
         if (listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())) {
@@ -1094,7 +1094,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<String> importStoreForOperation(ProcessBatchStoreDTO processBatchStoreDTO) {
         logger.info("批量处理门店:{}", JSON.toJSONString(processBatchStoreDTO));
         StoreDTO storeDTO = new StoreDTO();
@@ -1269,7 +1269,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
         logger.info("saveStoreAndClerkForBulkOrder:{}", params);
         Map<String, Object> message = new HashMap<>();

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreAuthorizationApiServiceImpl.java

@@ -205,11 +205,11 @@ public class StoreAuthorizationApiServiceImpl implements StoreAuthorizationApiSe
         Set<Integer> storeInfoIdSet = new HashSet<>(existStoreInfoIdList);
         int total = 0;
         for(int page = 1; page <= pages; page++){
-            Page<StoreDTO> storeDTOPage = this.storeApiService.listStore(storeSearchDTO, page, PAGE_SIZE).getResult();
-            if(storeDTOPage == null){
+            Page<StoreDTO> storeDtoPage = this.storeApiService.listStore(storeSearchDTO, page, PAGE_SIZE).getResult();
+            if(storeDtoPage == null){
                 break;
             }
-            List<StoreDTO> list = storeDTOPage.getResult();
+            List<StoreDTO> list = storeDtoPage.getResult();
             if(CollectionUtils.isEmpty(list)){
                 break;
             }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreBrandApiServiceImpl.java

@@ -140,12 +140,16 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
 
             Map<Integer, String> finalEnterpriseMap = enterpriseMap;
             Map<Integer, Integer> finalBrandIdMap = brandIdMap;
+
+            //共享类型
+            Integer otherType = 2;
+
             voList = storeBrandList.stream()
                     .map(e -> {
                         StoreBrandShareDTO vo = new StoreBrandShareDTO();
                         vo.setStoreBrandId(e.getStoreBrandId());
                         //共享类型
-                        if (Objects.equals(e.getType(), 2)) {
+                        if (Objects.equals(e.getType(), otherType)) {
                             Integer tempEnterpriseId = finalBrandIdMap.get(e.getStoreBrandId());
                             vo.setOwnerEntName(finalEnterpriseMap.get(tempEnterpriseId));
                             vo.setOwnerFlag(0);