|
|
@@ -11,6 +11,7 @@ import org.jeecg.modules.hlwpayaccount.entity.HlwPayAccountCmb;
|
|
|
import org.jeecg.modules.hlwpayaccount.entity.HlwPayRecord;
|
|
|
import org.jeecg.modules.hlwpayaccount.service.IHlwPayAccountCmbService;
|
|
|
import org.jeecg.modules.hlwpayment.entity.HlwPaymentDetail;
|
|
|
+import org.jeecg.modules.hlwpayment.service.IHlwPaymentDetailService;
|
|
|
import org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractor;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -35,15 +36,20 @@ public class PayNbcbCommon {
|
|
|
private static final Logger logger = LoggerFactory.getLogger(PayNbcbCommon.class);
|
|
|
@Autowired
|
|
|
private IHlwPayAccountCmbService hlwPayAccountCmbService;
|
|
|
+ @Autowired
|
|
|
+ private IHlwPaymentDetailService hlwPaymentDetailService;
|
|
|
|
|
|
public static PayNbcbCommon payCommon;
|
|
|
|
|
|
public static IHlwPayAccountCmbService iHlwPayAccountCmbService;
|
|
|
|
|
|
+ public static IHlwPaymentDetailService iHlwPaymentDetailService;
|
|
|
+
|
|
|
@PostConstruct
|
|
|
public void init() {
|
|
|
payCommon = this;
|
|
|
iHlwPayAccountCmbService = hlwPayAccountCmbService;
|
|
|
+ iHlwPaymentDetailService = hlwPaymentDetailService;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -151,12 +157,14 @@ public class PayNbcbCommon {
|
|
|
* 明细信息
|
|
|
*/
|
|
|
JSONArray jsonArrayRequest3 = new JSONArray();
|
|
|
+ //查询今天已支付付款明细数(包含:付款中,已付款)
|
|
|
+ int count = iHlwPaymentDetailService.getCountForToday();
|
|
|
for (int i = 0; i < payLength; i++) {
|
|
|
JSONObject trs = new JSONObject();
|
|
|
HlwPaymentDetail hlgPaymentDetail = hlgPaymentDetailList.get(i);
|
|
|
//明细流水号=8位日期+8位数字
|
|
|
//为8位纯数字,格式为:00000001、00000002...
|
|
|
- String trxseq = Stream.iterate(i + 1, item -> item + 1).limit(1)
|
|
|
+ String trxseq = Stream.iterate(i + 1 + count, item -> item + 1).limit(1)
|
|
|
.map(item -> String.valueOf(item))
|
|
|
.map(item -> {
|
|
|
while (item.length() < numLength) {
|