wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交内容：BIP推送流水改成推送当月/调用BIP接口成功获取修改 

时间：2025-05-27 17：29
提交人：邹江涛
This commit is contained in:
zoujiangtao 2025-05-27 17:30:08 +08:00
parent 93579936f9
commit af14450f81
5 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java
View File

@ -251,7 +251,6 @@ public class ApiService {
jsonObject = JSON.parseObject(saveResponseBody);
code = jsonObject.getString("code");
if ("200".equals(code)) {
// LogService.newLog("INFO", "付款单", dynamic.getString("billno"), "付款处理 → BIP保存接口 → 成功", "请求数据：" + saveRequestBody + "\n推送成功接口返回数据：" + saveResponseBody);
logger.info("付款处理 → BIP保存接口 → 成功\n失败单据编号：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveResponseBody);
data = jsonObject.getJSONObject("data");
dynamic.set("shkd_businessnumber", data.getString("code"));
@ -268,7 +267,6 @@ public class ApiService {
logger.info("付款处理 → BIP提交接口 → 返回结果：{}", submitResponseBody);
result = "推送 → 付款处理单 → 成功";
} else {
// LogService.newLog("ERROR", "付款单", dynamic.getString("billno"), "付款处理 → BIP保存接口 → 失败", "请求数据：" + saveRequestBody + "\n推送失败接口返回数据：" + saveResponseBody);
logger.info("付款处理 → BIP保存接口 → 失败\n失败单据编号：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveResponseBody);
result = "推送 → 付款处理单 → 失败";
}
@ -281,8 +279,6 @@ public class ApiService {
jsonObject = JSON.parseObject(saveResponseBody);
code = jsonObject.getString("code");
if ("200".equals(code)) {
// LogService.newLog("INFO", "收款单", dynamic.getString("billno"), "收款处理 → BIP保存接口 → 成功", "请求数据：" + saveRequestBody + "\n推送成功接口返回数据：" + saveResponseBody);
logger.info("收款处理 → BIP保存接口 → 成功\n失败单据编号：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveResponseBody);
data = jsonObject.getJSONObject("data");
dynamic.set("shkd_businessnumber", data.getString("code"));
@ -298,8 +294,6 @@ public class ApiService {
logger.info("收款处理 → BIP提交接口 → 返回结果：{}", submitResponseBody);
result = "推送 → 收款处理 → 成功";
} else {
// LogService.newLog("ERROR", "收款单", dynamic.getString("billno"), "收款处理 → BIP保存接口 → 失败", "请求数据：" + saveRequestBody + "\n推送失败接口返回数据：" + saveResponseBody);
logger.info("收款处理 → BIP保存接口 → 失败\n失败单据编号：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveResponseBody);
result = "推送 → 收款处理 → 失败";
}
@ -309,18 +303,14 @@ public class ApiService {
case "https://10.1.9.43/iuap-api-auth/yonbip/ctm/cmp/bankReconciliationBatchSave":
saveResponseBody = pushBill(token, saveUrl, saveRequestBody);
jsonObject = JSON.parseObject(saveResponseBody);
code = jsonObject.getString("code");
if ("200".equals(code)) {
int successnum = jsonObject.getJSONObject("data").getIntValue("successnum");
if (successnum > 0) {
dynamic.set("shkd_pushstatus", "已推送");
dynamic.set("shkd_businessname", "共享系统");
dynamicObjects.add(dynamic);
// LogService.newLog("INFO", "银行收付处理", dynamic.getString("billno"), "银行收付处理 → BIP推送接口 → 成功", "请求数据：" + saveRequestBody + "\n推送成功接口返回数据：" + saveResponseBody);
logger.info("银行收付处理 → BIP推送接口 → 成功\n成功单据编号：{}\n成功请求体：{}\n推送成功接口返回数据：{}", dynamic.getString("billno"), saveRequestBody, saveResponseBody);
result = "推送 → 银行收付处理 → 成功";
} else {
// LogService.newLog("ERROR", "银行收付处理", dynamic.getString("billno"), "银行收付处理 → BIP推送接口 → 失败", "请求数据：" + saveRequestBody + "\n推送失败接口返回数据：" + saveResponseBody);
logger.info("银行收付处理 → BIP推送接口 → 失败\n失败单据编号：{}\n失败请求体：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveRequestBody, saveResponseBody);
result = "推送 → 银行收付处理 → 失败";
}

2
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/Exp/BalanceExpansion.java
View File

@ -27,6 +27,6 @@ public class BalanceExpansion implements IFillBankBalance {
} else {
bankBalance.set("shkd_depositbalance", BigDecimal.ZERO);
}
SaveServiceHelper.save(new DynamicObject[]{bankBalance});
SaveServiceHelper.update(new DynamicObject[]{bankBalance});
}
}

11
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/InterfacePracticePlug.java
View File

@ -36,6 +36,7 @@ public class InterfacePracticePlug extends AbstractListPlugin implements Seriali
/**
* 计划编制写入
*
* @param arrHashMap
* @return
*/
@ -54,7 +55,7 @@ public class InterfacePracticePlug extends AbstractListPlugin implements Seriali
stringBuffer.append("第").append(i + 1).append("条数据写入").append(voidFpmResponse.isSuccess() ? "成功" : "失败")
.append("，返回信息：").append(voidFpmResponse.getMessage()).append("\n");
}
return CustomApiResult.success(stringBuffer.toString());
return CustomApiResult.fail("404", stringBuffer.toString());
}
/**
@ -63,7 +64,7 @@ public class InterfacePracticePlug extends AbstractListPlugin implements Seriali
* @param arrHashMap
* @return
*/
@ApiPostMapping(value = "planAdjustment_save", desc = "计划编制写入")
@ApiPostMapping(value = "planAdjustment_save", desc = "计划编制调整写入")
public CustomApiResult<@ApiResponseBody("返回参数") String> planAdjustment_save(@ApiParam(value = "查询字段值") ArrayList<HashMap<String, Object>> arrHashMap) {
logger.info("planAdjustment_save，请求参数：{}", arrHashMap.get(0));
StringBuilder stringBuffer = new StringBuilder();
@ -92,7 +93,7 @@ public class InterfacePracticePlug extends AbstractListPlugin implements Seriali
stringBuffer.append("第").append(i + 1).append("条数据写入").append("成功，").append("单据编号：").append(adjustBillNoList).append("\n");
}
}
return CustomApiResult.success(stringBuffer.toString());
return CustomApiResult.fail("404", stringBuffer.toString());
}
@ -102,11 +103,11 @@ public class InterfacePracticePlug extends AbstractListPlugin implements Seriali
* @param hashMap
* @return
*/
@ApiPostMapping(value = "planAdjustment_save", desc = "计划编制查询")
@ApiPostMapping(value = "planAdjustment_query", desc = "计划编制查询")
public CustomApiResult<@ApiResponseBody("返回参数") String> planAdjustment_query(@ApiParam(value = "查询字段值") HashMap<String, Object> hashMap) {
String reportPeriodName = hashMap.get("reportPeriodName").toString();// 编报期间ID
String reportOrgName = hashMap.get("reportOrgName").toString();// 编报主体ID
String queryPlanning = queryPlanning(reportPeriodName, reportOrgName);
return CustomApiResult.success(queryPlanning);
return CustomApiResult.fail("404", queryPlanning);
}
}

26
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/TicketRegistration.java
View File

@ -25,6 +25,7 @@ public class TicketRegistration implements Serializable, ApiSavePlugin {
@Override
public List<Map<String, Object>> preHandleRequestData(List<Map<String, Object>> reqData) {
logger.info("进入TicketRegistration");
for (Map<String, Object> map : reqData) {
String payeetype = map.get("payeetype").toString();
/**
@ -35,15 +36,28 @@ public class TicketRegistration implements Serializable, ApiSavePlugin {
* other
*/
if ("bd_supplier".equals(payeetype) || "bd_customer".equals(payeetype)) {
logger.info("进入判断客商if方法");
if (map.get("deliver") != null) {
logger.info("进入收票登记");
Map<String, Object> deliver = (Map<String, Object>) map.get("deliver");
String deliveraccountbase = map.get("deliveraccountbase").toString();// 交票人账号
String deliver_number = deliver.get("number").toString();
DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype, "id,number," +
"name,societycreditcode,entry_bank,entry_bank.bankaccount,entry_bank.accountname,entry_bank.bank",
new QFilter("societycreditcode", QCP.equals, deliver_number).toArray());
if (objects.length > 0) {
logger.info("进入收票登记→objects.length > 0");
DynamicObjectCollection dynamicObjectCollection = objects[0].getDynamicObjectCollection("entry_bank");
dynamicObjectCollection.forEach(dynamicObject -> {
if (dynamicObject.getString("bankaccount").equals(deliveraccountbase)) {
Object bank = dynamicObject.get("bank");
DynamicObject[] dynamicObjects = BusinessDataServiceHelper.load("bd_bebank", "id,number", new QFilter("id", QCP.equals, bank).toArray());
Map<String, Object> deliveropenbank = new HashMap<>();
deliveropenbank.put("number", dynamicObjects[0].getString("number"));
map.put("deliveropenbank", deliveropenbank);
map.put("deliveropenbanknum", dynamicObjects[0].getString("number"));
}
});
Map<String, Object> societycreditcode = new HashMap<>();
societycreditcode.put("number", objects[0].getString("number"));
map.put("deliver", societycreditcode);
@ -53,12 +67,24 @@ public class TicketRegistration implements Serializable, ApiSavePlugin {
if (map.get("receiver") != null) {//receiver_number
logger.info("进入开票登记");
Map<String, Object> deliver = (Map<String, Object>) map.get("receiver");
String receiveraccount = map.get("receiveraccount").toString();// 收款人账号
String receiver_number = deliver.get("number").toString();
DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype, "id,number," +
"name,societycreditcode,entry_bank,entry_bank.bankaccount,entry_bank.accountname,entry_bank.bank",
new QFilter("societycreditcode", QCP.equals, receiver_number).toArray());
if (objects.length > 0) {
logger.info("进入开票登记→objects.length > 0");
DynamicObjectCollection dynamicObjectCollection = objects[0].getDynamicObjectCollection("entry_bank");
dynamicObjectCollection.forEach(dynamicObject -> {
if (dynamicObject.getString("bankaccount").equals(receiveraccount)) {
Object bank = dynamicObject.get("bank");
DynamicObject[] dynamicObjects = BusinessDataServiceHelper.load("bd_bebank", "id,number", new QFilter("id", QCP.equals, bank).toArray());
Map<String, Object> receiverbank = new HashMap<>();
receiverbank.put("number", dynamicObjects[0].getString("number"));
map.put("receiverbank", receiverbank);
map.put("receiverbankno", dynamicObjects[0].getString("number"));
}
});
Map<String, Object> societycreditcode = new HashMap<>();
societycreditcode.put("number", objects[0].getString("number"));
map.put("receiver", societycreditcode);

24
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/PushTaskPlugin.java
View File

@ -24,6 +24,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.ParseException;
import java.time.LocalDate;
import java.time.Month;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
@ -142,8 +143,7 @@ public class PushTaskPlugin extends AbstractTask implements Plugin {
*/
case "bei_transdetail_cas":
DynamicObject[] objects3 = BusinessDataServiceHelper.load("bei_transdetail_cas", "id,bizdate,billno,detailid,oppbank,oppunit,accountbank,description,company,oppbanknumber,bankdetailno,transbalance,description,debitamount,creditamount,shkd_pushstatus,shkd_businessnumber,shkd_businessid,shkd_businessname,recedbillentry,receiptno,recedbillentry.e_recedbilltype,recedbillentry.e_recedbillnumber,recedbillentry.e_recedbillid"
, new QFilter("bizdate", QCP.large_equals, getFirstDayOfMonth(3))
.and("bizdate", QCP.less_equals, calculateTheDate(1))
, new QFilter("bizdate", QCP.large_equals, getFirstDayOfCurrentMonth())
.and("shkd_pushstatus", QCP.not_equals, "已推送").toArray());
Arrays.stream(objects3).forEach(dynamicObject -> {
@ -379,6 +379,11 @@ public class PushTaskPlugin extends AbstractTask implements Plugin {
return date;
}
/**
* 获取指定月份的第一天
* @param month
* @return
*/
private static Date getFirstDayOfMonth(int month) {
// 获取当前年份
int currentYear = LocalDate.now().getYear();
@ -389,4 +394,19 @@ public class PushTaskPlugin extends AbstractTask implements Plugin {
// 将LocalDate转换为Date
return Date.from(firstDayOfMonth.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
* 获取当前月份的第一天
* @return
*/
private static Date getFirstDayOfCurrentMonth() {
// 获取当前日期
LocalDate currentDate = LocalDate.now();
// 获取当前月份的第一天
LocalDate firstDayOfMonth = currentDate.withDayOfMonth(1);
// 将LocalDate转换为Date
return Date.from(firstDayOfMonth.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
}