Merge branch 'developer' into 'master'

Developer

See merge request !19

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingPayInfoController.java

@@ -205,6 +205,7 @@ public class BillingPayInfoController {
             params.setShippingAddress(invoiceDTO.getShippingAddress());
             params.setShippingPhone(invoiceDTO.getShippingPhone());
             params.setBusinessLicense(invoiceDTO.getBusinessLicense());
+            params.setEmail(invoiceDTO.getEmail());
             ServiceResponse invoice = invoiceManageApiService.applyInvoice(params);
             if (invoice.isSuccess()) {
                 ServiceResponse updateInvoiceStatus = billingPayInfoApiService.updateInvoiceStatus(serialNumbers);

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java

@@ -73,6 +73,17 @@ import com.gic.weimob.api.service.WeimobStoreSiteService;
 public class WmStoreSyncController {
     private static final Logger LOGGER = LogManager.getLogger(WmStoreSyncController.class);
 
+    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
     private WmStoreApiService wmStoreApiService;
     @Autowired
@@ -757,8 +768,10 @@ public class WmStoreSyncController {
                 if (CollectionUtils.isNotEmpty(businessTimeList)) {
                     businessTimeList.stream().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());
 
@@ -782,6 +795,22 @@ public class WmStoreSyncController {
             return null;
         }
 
+        private static String businessTime(String week) {
+            StringBuilder businessTime = new StringBuilder();
+            Arrays.asList(week.split(","))
+                    .stream()
+                    .filter(e -> 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()) {
@@ -849,8 +878,10 @@ public class WmStoreSyncController {
             if (CollectionUtils.isNotEmpty(businessTimeList)) {
                 businessTimeList.stream().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());
 
@@ -874,6 +905,22 @@ public class WmStoreSyncController {
         return null;
     }
 
+    private static String businessTime(String week) {
+        StringBuilder businessTime = new StringBuilder();
+        Arrays.asList(week.split(","))
+                .stream()
+                .filter(e -> 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()) {