diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java index f947741bc..51c5c94a4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java @@ -66,11 +66,11 @@ public class ChartDataScheduleTest { private CUserServiceFactory cuserFactory; @Async - @Scheduled(cron = "0 10 17 10 3 ?") + @Scheduled(cron = "0 30 22 10 3 ?") public void testCreateData() { -// createUserData(); -// createCarData(); -// createSaleData(); + createUserData(); + createCarData(); + createSaleData(); createMerchantTradeData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 09af696e7..e4522e009 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1608,6 +1608,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { vo.setBusinessId(m.getBusinessId()); vo.setSubBusinessId(m.getSubBusinessId()); vo.setLinkLinePhone(m.getLinkLinePhone()); + vo.setMerchantStatus(m.getStatus()); if (null != merchantShopVoMap) { vo.setShopVoList(merchantShopVoMap.get(m.getId())); }