Merge branch 'online1'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -538,7 +538,7 @@ public class PayServiceImpl implements PayService {
         }
 
         BigDecimal monthMaxReceipt = hfmember.getMonthMaxReceipt(); //每月限定金额
-        Date monthStartTime = DateUtil.getFirstDayOfMonth(new Date());
+        Date dayStartTime = DateUtil.trunc(new Date());
 
         //已收金额
         List<PaymentChannelEnum> paymentChannelList = new ArrayList<>();
@@ -556,7 +556,7 @@ public class PayServiceImpl implements PayService {
 //                redisTemplate.expire(key, 600, TimeUnit.SECONDS);// 保留10分钟内的key
 //            }
 //        }else {
-            BigDecimal monthHasReceipt = studentPaymentRouteOrderDao.getRouteOrderAmount(routeScaleDto.getOrganId(), paymentChannelList, monthStartTime);
+            BigDecimal monthHasReceipt = studentPaymentRouteOrderDao.getRouteOrderAmount(routeScaleDto.getOrganId(), paymentChannelList, dayStartTime);
             monthHasReceipt = monthHasReceipt == null ? BigDecimal.ZERO : monthHasReceipt;
 //            monthHasReceipt.multiply(new BigDecimal(100));
 //