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

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

@@ -115,6 +115,17 @@ public class StoreApiServiceImpl implements StoreApiService {
 
     private Map<String, BulkUpdateStoreStrtegy> storeStrtegyMap = new ConcurrentHashMap<>();
 
+    private static Map<String, String> BUSINESS_TIME_MAP = new HashMap<>(16);
+    static {
+        BUSINESS_TIME_MAP.put("1", "周一");
+        BUSINESS_TIME_MAP.put("2", "周二");
+        BUSINESS_TIME_MAP.put("3", "周三");
+        BUSINESS_TIME_MAP.put("4", "周四");
+        BUSINESS_TIME_MAP.put("5", "周五");
+        BUSINESS_TIME_MAP.put("6", "周六");
+        BUSINESS_TIME_MAP.put("7", "周七");
+    }
+
     @Autowired
     public StoreApiServiceImpl(Map<String, BulkUpdateStoreStrtegy> strategyMap) {
         this.storeStrtegyMap.clear();
@@ -1617,8 +1628,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             if (CollectionUtils.isNotEmpty(businessTimeList)) {
                 businessTimeList.stream().filter(e -> e != null && StringUtils.isNotBlank(e.getWeekday())).map(e -> {
                     String businessHours = simpleDateFormat.format(e.getOpenTime()) + "-" + simpleDateFormat.format(e.getCloseTime());
-                    return e.getWeekdayShow() + businessHours;
-                }).forEach(businessTime::append);
+                    return businessTime(e.getWeekday()) + ":"  + businessHours;
+                }).forEach(e -> {
+                    businessTime.append(e).append("；");
+                });
             }
             weimobPhysicalStoreDTO.setBussinessHours(businessTime.toString());
 
@@ -1642,6 +1655,22 @@ public class StoreApiServiceImpl implements StoreApiService {
         return null;
     }
 
+    private static String businessTime(String week) {
+        StringBuilder businessTime = new StringBuilder();
+        Arrays.asList(week.split(","))
+                .stream()
+                .filter(e -> org.apache.commons.lang.StringUtils.isNumeric(e))
+                .mapToInt(e -> Integer.parseInt(e))
+                .boxed()
+                .sorted()
+                .collect(Collectors.toList())
+                .forEach(e -> {
+                    businessTime.append(BUSINESS_TIME_MAP.get(e.toString())).append("、");
+                });
+        String result = businessTime.toString();
+        return result.substring(0, result.length() - 1);
+    }
+
     private ClerkDTO getHeadClerk(Integer enterpriseId, Integer storeId) {
         ServiceResponse<ClerkDTO> clerkResponse = clerkApiService.getHeadClerk(enterpriseId, storeId);
         if (clerkResponse.isSuccess()) {

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

@@ -259,6 +259,7 @@
         #{item}
       </foreach>
     </if>
+    group by a.store_field_id
     order by a.sort
   </select>