Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -30,6 +30,7 @@ import com.zhongshu.card.server.core.service.pay.BalancePayService;
 import com.zhongshu.card.server.core.service.pay.ChinaumsSenselessPayService;
 import com.zhongshu.card.server.core.service.pay.SettleService;
 import com.zhongshu.card.server.core.service.paySetting.PayOrderSettingService;
+import com.zhongshu.card.server.core.service.paySetting.ProjectMainPaySettingService;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import com.zhongshu.card.server.core.util.NextNoUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -85,6 +86,9 @@ public class PayCallService extends SuperService {
     @Autowired
     private RefundRecordService refundRecordService;
 
+    @Autowired
+    private ProjectMainPaySettingService projectMainPaySettingService;
+
     /**
      * 统一调用支付服务
      *
@@ -693,8 +697,8 @@ public class PayCallService extends SuperService {
         if (StringUtils.isNotEmpty(projectOid) && paymentType != null) {
             paymentType = turnPaymentType(paymentType);
             String remark = "定时结算";
-//            Long endTime = projectMainPaySettingService.getCurrentRunTime(projectOid, paymentType);
-            Long endTime = System.currentTimeMillis();
+            Long endTime = projectMainPaySettingService.getCurrentRunTime(projectOid, paymentType);
+//            Long endTime = System.currentTimeMillis();
 
             // 项目包含的机构列表
             List<Organization> list = projectBindOrgService.getProjectBindOrgs(projectOid);