|
@@ -58,7 +58,7 @@ public class TransDetailApiPlugin implements Serializable {
|
|
@ApiParam(value = "操作类型") String operation,
|
|
@ApiParam(value = "操作类型") String operation,
|
|
@ApiParam(value = "交易明细数据", required = true) String jsondata
|
|
@ApiParam(value = "交易明细数据", required = true) String jsondata
|
|
) {
|
|
) {
|
|
- log.info("收到保存交易明细请求:\r\n操作类型:{}\r\n交易明细数据:{}",
|
|
|
|
|
|
+ log.info("九恒星-收到保存交易明细请求:\r\n操作类型:{}\r\n交易明细数据:{}",
|
|
operation,
|
|
operation,
|
|
jsondata
|
|
jsondata
|
|
);
|
|
);
|
|
@@ -74,15 +74,15 @@ public class TransDetailApiPlugin implements Serializable {
|
|
|
|
|
|
//JSONArray jsonArray =JSONArray.parseArray(jsondata);
|
|
//JSONArray jsonArray =JSONArray.parseArray(jsondata);
|
|
if(jsondata.startsWith("[")){
|
|
if(jsondata.startsWith("[")){
|
|
- log.error("保存交易明细失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, "只允许接收1条数据,请重新传输!");
|
|
|
|
|
|
+ log.error("九恒星-保存交易明细失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, "只允许接收1条数据,请重新传输!");
|
|
returnModel.setNumber(number);
|
|
returnModel.setNumber(number);
|
|
returnModel.setCode("500");
|
|
returnModel.setCode("500");
|
|
- returnModel.setMessage("操作交易明细失败: 只允许接收1条数据,请重新传输!");
|
|
|
|
|
|
+ returnModel.setMessage("九恒星-操作交易明细失败: 只允许接收1条数据,请重新传输!");
|
|
|
|
|
|
JSONArray dataArray = new JSONArray();
|
|
JSONArray dataArray = new JSONArray();
|
|
dataArray.add(JSONObject.parseObject(returnModel.toString()));
|
|
dataArray.add(JSONObject.parseObject(returnModel.toString()));
|
|
|
|
|
|
- return returnResult("200","S","接口调用成功,具体信息查看responseData参数", dataArray);
|
|
|
|
|
|
+ return returnResult("200","S","九恒星-接口调用成功,具体信息查看responseData参数", dataArray);
|
|
}
|
|
}
|
|
|
|
|
|
//如果未传operation参数,则默认为sava保存
|
|
//如果未传operation参数,则默认为sava保存
|
|
@@ -98,12 +98,12 @@ public class TransDetailApiPlugin implements Serializable {
|
|
String errMsg = saveTransDetail(jsondata);
|
|
String errMsg = saveTransDetail(jsondata);
|
|
|
|
|
|
if (!EmptyUtils.isEmpty(errMsg)) {
|
|
if (!EmptyUtils.isEmpty(errMsg)) {
|
|
- log.error("交易明细添加失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, "交易明细添加失败" + errMsg);
|
|
|
|
|
|
+ log.error("九恒星-交易明细添加失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, "交易明细添加失败" + errMsg);
|
|
|
|
|
|
code = "500";
|
|
code = "500";
|
|
msg = "交易明细添加失败," + errMsg;
|
|
msg = "交易明细添加失败," + errMsg;
|
|
} else {
|
|
} else {
|
|
- log.info("交易明细添加成功。操作类型:{},交易明细数据:{}", operation, jsondata);
|
|
|
|
|
|
+ log.info("九恒星-交易明细添加成功。操作类型:{},交易明细数据:{}", operation, jsondata);
|
|
|
|
|
|
code = "200";
|
|
code = "200";
|
|
msg = "交易明细添加成功";
|
|
msg = "交易明细添加成功";
|
|
@@ -113,19 +113,19 @@ public class TransDetailApiPlugin implements Serializable {
|
|
// 更新交易明细逻辑
|
|
// 更新交易明细逻辑
|
|
String errMsg1 = deleteTransDetail(jsondata);
|
|
String errMsg1 = deleteTransDetail(jsondata);
|
|
if (!EmptyUtils.isEmpty(errMsg1)) {
|
|
if (!EmptyUtils.isEmpty(errMsg1)) {
|
|
- log.error("交易明细更新失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, errMsg1);
|
|
|
|
|
|
+ log.error("九恒星-交易明细更新失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, errMsg1);
|
|
|
|
|
|
code = "500";
|
|
code = "500";
|
|
msg = "交易明细删除失败," + errMsg1;
|
|
msg = "交易明细删除失败," + errMsg1;
|
|
} else {
|
|
} else {
|
|
- log.info("交易明细更新成功。操作类型:{},交易明细数据:{}", operation, jsondata);
|
|
|
|
|
|
+ log.info("九恒星-交易明细更新成功。操作类型:{},交易明细数据:{}", operation, jsondata);
|
|
|
|
|
|
code = "200";
|
|
code = "200";
|
|
msg = "交易明细删除成功";
|
|
msg = "交易明细删除成功";
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
- log.error("不支持的操作类型。操作类型:{},交易明细数据:{}", operation, jsondata);
|
|
|
|
|
|
+ log.error("九恒星-不支持的操作类型。操作类型:{},交易明细数据:{}", operation, jsondata);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -136,9 +136,9 @@ public class TransDetailApiPlugin implements Serializable {
|
|
JSONArray dataArray = new JSONArray();
|
|
JSONArray dataArray = new JSONArray();
|
|
dataArray.add(JSONObject.parseObject(JSON.toJSONString(returnModel)));
|
|
dataArray.add(JSONObject.parseObject(JSON.toJSONString(returnModel)));
|
|
|
|
|
|
- return returnResult("200", "S", "接口调用成功,同步结果请查看responseData参数", dataArray);
|
|
|
|
|
|
+ return returnResult("200", "S", "九恒星-接口调用成功,同步结果请查看responseData参数", dataArray);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error("保存交易明细失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, e.getMessage());
|
|
|
|
|
|
+ log.error("九恒星-保存交易明细失败。操作类型:{},交易明细数据:{},错误信息:{}", operation, jsondata, e.getMessage());
|
|
|
|
|
|
returnModel.setNumber(number);
|
|
returnModel.setNumber(number);
|
|
returnModel.setCode("500");
|
|
returnModel.setCode("500");
|
|
@@ -147,7 +147,7 @@ public class TransDetailApiPlugin implements Serializable {
|
|
JSONArray dataArray = new JSONArray();
|
|
JSONArray dataArray = new JSONArray();
|
|
dataArray.add(JSONObject.parseObject(JSON.toJSONString(returnModel)));
|
|
dataArray.add(JSONObject.parseObject(JSON.toJSONString(returnModel)));
|
|
|
|
|
|
- return returnResult("500","E","接口调用异常,同步结果请查看responseData参数", dataArray);
|
|
|
|
|
|
+ return returnResult("500","E","九恒星-接口调用异常,同步结果请查看responseData参数", dataArray);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -378,10 +378,8 @@ public class TransDetailApiPlugin implements Serializable {
|
|
//需要与付款单建立关联关系
|
|
//需要与付款单建立关联关系
|
|
String casBillID = jsonObject.getString("sourceBillId");
|
|
String casBillID = jsonObject.getString("sourceBillId");
|
|
DynamicObject paybillDyn = null;
|
|
DynamicObject paybillDyn = null;
|
|
- if(StringUtils.isEmpty(casBillID)){
|
|
|
|
- errMsg.append("付款单ID为空;");
|
|
|
|
- }else {
|
|
|
|
- String billid = casBillID;
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(casBillID)){
|
|
|
|
+ Long billid = Long.parseLong(casBillID);
|
|
//获取 付款单号
|
|
//获取 付款单号
|
|
QFilter qFilter = new QFilter("id", QCP.equals, billid);
|
|
QFilter qFilter = new QFilter("id", QCP.equals, billid);
|
|
paybillDyn = BusinessDataServiceHelper.loadSingle("cas_paybill", new QFilter[]{qFilter});
|
|
paybillDyn = BusinessDataServiceHelper.loadSingle("cas_paybill", new QFilter[]{qFilter});
|