查询门店

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreSyncLogApiServiceImpl.java

@@ -42,7 +42,7 @@ public class WmStoreSyncLogApiServiceImpl implements WmStoreSyncLogApiService {
                 List<StoreDTO> storeList = page.getResult();
                 if (CollectionUtils.isNotEmpty(storeList)) {
                     storeList.forEach(temp -> wmStoreSyncLogService
-                            .saveWmStoreSyncLog(temp.getStoreId(), enterpriseId, wmMallStoreId, type, temp.getStoreCode(), temp.getStoreName()));
+                            .saveWmStoreSyncLog(temp.getStoreId(), wmMallStoreId, type, enterpriseId, temp.getStoreCode(), temp.getStoreName()));
                 }
                 return ServiceResponse.success();
             }

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

@@ -710,11 +710,9 @@ public class WmStoreSyncController {
                 weimobPhysicalStoreDTO.setStoreNumber(storeDTO.getStoreCode());
                 weimobPhysicalStoreDTO.setStoreName(storeDTO.getStoreName());
                 //经纬度
-                if (StringUtils.isNotBlank(storeDTO.getLongitude())) {
-                    weimobPhysicalStoreDTO.setLongitude(new BigDecimal(storeDTO.getLongitude()));
-                }
-                if (StringUtils.isNotBlank(storeDTO.getLatitude())) {
-                    weimobPhysicalStoreDTO.setLatitude(new BigDecimal(storeDTO.getLatitude()));
+                if (CollectionUtils.isNotEmpty(storeDTO.getLocation())) {
+                    weimobPhysicalStoreDTO.setLongitude(new BigDecimal(storeDTO.getLocation().get(0)));
+                    weimobPhysicalStoreDTO.setLatitude(new BigDecimal(storeDTO.getLocation().get(1)));
                 }
                 //省市区名称
                 String fullArea = StringUtils.isNotBlank(storeDTO.getProvinces()) ?
@@ -726,14 +724,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;
+                        return e.getWeekdayShow() + ":" + businessHours;
                     }).forEach(businessTime::append);
                 }
-                if (StringUtils.isBlank(businessTime.toString())) {
-                    weimobPhysicalStoreDTO.setBussinessHours("08:00-22:00");
-                } else {
-                    weimobPhysicalStoreDTO.setBussinessHours(businessTime.toString());
-                }
+                weimobPhysicalStoreDTO.setBussinessHours(businessTime.toString());
 
                 WeimobStoreAccountDTO accountDTO = new WeimobStoreAccountDTO();
                 ClerkDTO headClerk = getHeadClerk(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
@@ -800,11 +794,9 @@ public class WmStoreSyncController {
             weimobPhysicalStoreDTO.setStoreNumber(storeDTO.getStoreCode());
             weimobPhysicalStoreDTO.setStoreName(storeDTO.getStoreName());
             //经纬度
-            if (StringUtils.isNotBlank(storeDTO.getLongitude())) {
-                weimobPhysicalStoreDTO.setLongitude(new BigDecimal(storeDTO.getLongitude()));
-            }
-            if (StringUtils.isNotBlank(storeDTO.getLatitude())) {
-                weimobPhysicalStoreDTO.setLatitude(new BigDecimal(storeDTO.getLatitude()));
+            if (CollectionUtils.isNotEmpty(storeDTO.getLocation())) {
+                weimobPhysicalStoreDTO.setLongitude(new BigDecimal(storeDTO.getLocation().get(0)));
+                weimobPhysicalStoreDTO.setLatitude(new BigDecimal(storeDTO.getLocation().get(1)));
             }
             //省市区名称
             String fullArea = StringUtils.isNotBlank(storeDTO.getProvinces()) ?
@@ -816,14 +808,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;
+                    return e.getWeekdayShow() + ":" + businessHours;
                 }).forEach(businessTime::append);
             }
-            if (StringUtils.isBlank(businessTime.toString())) {
-                weimobPhysicalStoreDTO.setBussinessHours("08:00-22:00");
-            } else {
-                weimobPhysicalStoreDTO.setBussinessHours(businessTime.toString());
-            }
+            weimobPhysicalStoreDTO.setBussinessHours(businessTime.toString());
 
             WeimobStoreAccountDTO accountDTO = new WeimobStoreAccountDTO();
             ClerkDTO headClerk = getHeadClerk(storeDTO.getEnterpriseId(), storeDTO.getStoreId());