支付管理-引入方法调整

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentServiceImpl.java

@@ -11,6 +11,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.businessAccountUtils;
 import org.jeecg.common.zhutils.PayConst;
 import org.jeecg.modules.api.SysBaseRemoteApi;
@@ -58,9 +59,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import static org.jeecg.common.util.DateUtils.now;
 
 /**
  * @Description: 付款信息表
@@ -289,8 +288,8 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
             QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
             queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
             queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPayment.getSubcontractorId());
-            queryWrapperCpSubcontractor.le("start_date", now());
-            queryWrapperCpSubcontractor.ge("end_date", now());
+            queryWrapperCpSubcontractor.le("start_date", DateUtils.now());
+            queryWrapperCpSubcontractor.ge("end_date", DateUtils.now());
             HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
             if (hlwCpSubcontractor == null) {
                 result.error500("平台已到期，请联系管理员!");
@@ -604,8 +603,8 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
             QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
             queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
             queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPayment.getSubcontractorId());
-            queryWrapperCpSubcontractor.le("start_date", now());
-            queryWrapperCpSubcontractor.ge("end_date", now());
+            queryWrapperCpSubcontractor.le("start_date", DateUtils.now());
+            queryWrapperCpSubcontractor.ge("end_date", DateUtils.now());
             HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
             if (hlwCpSubcontractor == null) {
                 result.error500("平台已到期，请联系管理员!");
@@ -878,8 +877,8 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
         QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
         queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
         queryWrapperCpSubcontractor.eq("subcontractor_id", hlwPayment.getSubcontractorId());
-        queryWrapperCpSubcontractor.le("start_date", now());
-        queryWrapperCpSubcontractor.ge("end_date", now());
+        queryWrapperCpSubcontractor.le("start_date", DateUtils.now());
+        queryWrapperCpSubcontractor.ge("end_date", DateUtils.now());
         HlwCpSubcontractor hlwCpSubcontractor = hlwCpSubcontractorService.getOne(queryWrapperCpSubcontractor);
         //企业账户表
         QueryWrapper<HlwCompanyAccount> queryWrapper = new QueryWrapper<>();