| @@ -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}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| public void daliyAmountSchedule() { | public void daliyAmountSchedule() { | ||||
| @@ -85,7 +85,7 @@ public class DaliyAmountSchedule { | |||||
| Map dateMap = new HashMap(); | Map dateMap = new HashMap(); | ||||
| dateMap.put("startDate", startDate); | dateMap.put("startDate", startDate); | ||||
| dateMap.put("endDate", endDate); | dateMap.put("endDate", endDate); | ||||
| dateMap.put("merchantID",merchant.getId()); | |||||
| dateMap.put("merchantId",merchant.getId()); | |||||
| List<WxCouponOrder> list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); | List<WxCouponOrder> list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); | ||||
| logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); | logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); | ||||
| @@ -163,7 +163,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| Map dateMap = new HashMap(); | Map dateMap = new HashMap(); | ||||
| dateMap.put("startDate", startDate); | dateMap.put("startDate", startDate); | ||||
| dateMap.put("endDate", endDate); | dateMap.put("endDate", endDate); | ||||
| dateMap.put("merchantID", wxMerchant.getId()); | |||||
| dateMap.put("merchantId", wxMerchant.getId()); | |||||
| Map resultMap = new HashMap(); | Map resultMap = new HashMap(); | ||||
| @@ -226,7 +226,7 @@ | |||||
| select <include refid="allCouponOrderColumns" /> | select <include refid="allCouponOrderColumns" /> | ||||
| from wx_coupon_order co,wx_order o | from wx_coupon_order co,wx_order o | ||||
| where o.id = co.order_id | where o.id = co.order_id | ||||
| and o.merchant_id = #{merchantID} | |||||
| and o.merchant_id = #{merchantId} | |||||
| <if test="startDate != null"> | <if test="startDate != null"> | ||||
| AND co.create_date > #{startDate,jdbcType=TIMESTAMP} | AND co.create_date > #{startDate,jdbcType=TIMESTAMP} | ||||
| </if> | </if> | ||||
| @@ -240,7 +240,7 @@ | |||||
| select <include refid="allCouponOrderColumns" /> | select <include refid="allCouponOrderColumns" /> | ||||
| from wx_coupon_order co,wx_order o | from wx_coupon_order co,wx_order o | ||||
| where o.id = co.order_id | where o.id = co.order_id | ||||
| and o.merchant_id = #{merchantID} | |||||
| and o.merchant_id = #{merchantId} | |||||
| <if test="startDate != null"> | <if test="startDate != null"> | ||||
| AND co.update_date > #{startDate,jdbcType=TIMESTAMP} | AND co.update_date > #{startDate,jdbcType=TIMESTAMP} | ||||
| </if> | </if> | ||||