diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index bd83ecce6..daf88db7d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -43,8 +43,8 @@ public class DaliyAmountSchedule { - //@Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点盘点前一天的数据 - @Scheduled(cron = "*/30 * * * * ?") // 测试10秒中一次 + @Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点盘点前一天的数据 + //@Scheduled(cron = "*/30 * * * * ?") // 测试10秒中一次 @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void daliyAmountSchedule() { @@ -85,7 +85,7 @@ public class DaliyAmountSchedule { Map dateMap = new HashMap(); dateMap.put("startDate", startDate); dateMap.put("endDate", endDate); - dateMap.put("merchantID",merchant.getId()); + dateMap.put("merchantId",merchant.getId()); List list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 1826e0b4e..d432f85fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -163,7 +163,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { Map dateMap = new HashMap(); dateMap.put("startDate", startDate); dateMap.put("endDate", endDate); - dateMap.put("merchantID", wxMerchant.getId()); + dateMap.put("merchantId", wxMerchant.getId()); Map resultMap = new HashMap(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 4883aa05d..994f3e18e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -226,7 +226,7 @@ select from wx_coupon_order co,wx_order o where o.id = co.order_id - and o.merchant_id = #{merchantID} + and o.merchant_id = #{merchantId} AND co.create_date > #{startDate,jdbcType=TIMESTAMP} @@ -240,7 +240,7 @@ select from wx_coupon_order co,wx_order o where o.id = co.order_id - and o.merchant_id = #{merchantID} + and o.merchant_id = #{merchantId} AND co.update_date > #{startDate,jdbcType=TIMESTAMP}