Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

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

@@ -58,7 +58,7 @@ public class StoreInfoDTO implements Serializable {
      */
     private String areaId;
 
-    private String countyId;
+//    private String countyId;
 
     /**
      * 经度
@@ -476,10 +476,10 @@ public class StoreInfoDTO implements Serializable {
     }
 
     public String getCountyId() {
-        return countyId;
+        return areaId;
     }
 
     public void setCountyId(String countyId) {
-        this.countyId = countyId;
+        this.areaId = countyId;
     }
 }

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

@@ -244,4 +244,14 @@ public interface ClerkApiService {
      * @throws 
      */
     ServiceResponse<List<ClerkDTO>> listHaobanClerk(List<Integer> enterpriseIdList, String keyword, List<Integer> storeInfoIdList);
+
+    /**
+     * @Title: listHaobanClerk
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.ClerkDTO>>
+     * @throws
+     */
+    ServiceResponse<List<ClerkDTO>> listHaobanClerk(Integer enterpriseId, Integer positionId);
 }

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

@@ -82,4 +82,6 @@ public interface TabClerkMapper {
     void updatePosition(@Param("enterpriseId") Integer enterpriseId, @Param("positionId") Integer clerkPositionId, @Param("positionName") String positionName);
 
     List<TabClerk> listHaobanClerk(@Param("enterpriseIdList") List<Integer> enterpriseIdList, @Param("keyword") String keyword, @Param("storeInfoIdList") List<Integer> storeInfoIdList);
+
+    List<TabClerk> listClerkByPositionId(@Param("enterpriseId") Integer enterpriseId, @Param("positionId") Integer positionId);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/ClerkService.java

@@ -129,4 +129,6 @@ public interface ClerkService {
     void updatePosition(Integer enterpriseId, Integer clerkPositionId, String positionName);
 
     List<TabClerk> listHaobanClerk(List<Integer> enterpriseIdList, String keyword, List<Integer> storeInfoIdList);
+
+    List<TabClerk> listClerkByPositionId(Integer enterpriseId, Integer positionId);
 }

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

@@ -187,4 +187,9 @@ public class ClerkServiceImpl implements ClerkService {
         return tabClerkMapper.listHaobanClerk(enterpriseIdList, keyword, storeInfoIdList);
     }
 
+    @Override
+    public List<TabClerk> listClerkByPositionId(Integer enterpriseId, Integer positionId) {
+        return tabClerkMapper.listClerkByPositionId(enterpriseId, positionId);
+    }
+
 }

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

@@ -813,6 +813,12 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         return haobanClerk(clerkList);
     }
 
+    @Override
+    public ServiceResponse<List<ClerkDTO>> listHaobanClerk(Integer enterpriseId, Integer positionId) {
+        List<TabClerk> clerkList = this.clerkService.listClerkByPositionId(enterpriseId, positionId);
+        return haobanClerk(clerkList);
+    }
+
     private ServiceResponse<List<ClerkDTO>> haobanClerk(List<TabClerk> clerkList) {
         List<ClerkDTO> clerkDTOS = EntityUtil.changeEntityListByJSON(ClerkDTO.class, clerkList);
         if (CollectionUtils.isNotEmpty(clerkDTOS)) {

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

@@ -124,7 +124,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         BUSINESS_TIME_MAP.put("4", "周四");
         BUSINESS_TIME_MAP.put("5", "周五");
         BUSINESS_TIME_MAP.put("6", "周六");
-        BUSINESS_TIME_MAP.put("7", "周七");
+        BUSINESS_TIME_MAP.put("7", "周日");
     }
 
     @Autowired
@@ -303,6 +303,7 @@ public class StoreApiServiceImpl implements StoreApiService {
                         saveOrUpdate(store);
                     }
                 }
+                return ServiceResponse.success();
             }
         }
         return EnterpriseServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), "商户没有门店license");

gic-store-service/src/main/resources/mapper/TabClerkMapper.xml

@@ -383,4 +383,15 @@
       </if>
     </where>
   </select>
+  <select id="listClerkByPositionId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_clerk
+    <if test="enterpriseId != null ">
+        and enterprise_id = #{enterpriseId}
+    </if>
+    <if test="positionId != null ">
+        and position_id = #{positionId}
+    </if>
+  </select>
 </mapper>
\ No newline at end of file