luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-FI871' into test

Browse Source
release
高荣琳 2 years ago
parent d6f9bbbb69 5eedab27d6
commit d367b86995
2 changed files with 41 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 82
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
  2. 4
      order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java

82
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
Unescape View File

@ -19,6 +19,7 @@ import com.dxhy.order.consumer.constant.RespStatusEnum;
import com.dxhy.order.consumer.openapi.protocol.CheckResult; import com.dxhy.order.consumer.openapi.protocol.CheckResult;
import com.dxhy.order.consumer.openapi.protocol.CommonRequestParam; import com.dxhy.order.consumer.openapi.protocol.CommonRequestParam;
import com.dxhy.order.consumer.openapi.protocol.po.EsOutput; import com.dxhy.order.consumer.openapi.protocol.po.EsOutput;
import com.dxhy.order.consumer.openapi.protocol.po.IsInput;
import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam; import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam;
import com.dxhy.order.consumer.openapi.protocol.v4.fpyl.FpylcxReqBO; import com.dxhy.order.consumer.openapi.protocol.v4.fpyl.FpylcxReqBO;
@ -56,10 +57,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.joda.time.DateTime.now; import static org.joda.time.DateTime.now;
@ -417,45 +415,43 @@ public class InvoiceRestApiV6 {
return result; return result;
} }
//20230426客户说不同步更新组织名称 //20230426客户说不同步更新组织名称
// else if(ConfigurerInfo.SYNC_DEPT_INFO.equals(interfaceName)) { else if(ConfigurerInfo.SYNC_DEPT_INFO.equals(interfaceName)) {
// // /itaxAdmin/api/sys/dept/batchUpdate // /itaxAdmin/api/sys/dept/batchUpdate
// log.info("同步组织信息请求报文：{}",reqStr); log.info("同步组织信息请求报文：{}",reqStr);
// PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(reqStr, PoCommonRequestParam.class); PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(reqStr, PoCommonRequestParam.class);
// IsInput isInput = requestParam.getIS_INPUT(); IsInput isInput = requestParam.getIS_INPUT();
// //JSONObject jsonObject2 = JSONObject.parseObject(reqStr); 正常、注销、划转、下线 //JSONObject jsonObject2 = JSONObject.parseObject(reqStr); 正常、注销、划转、下线
// String zdata = isInput.getZDATA();//jsonObject2.getString("ZDATA"); String zdata = isInput.getZDATA();//jsonObject2.getString("ZDATA");
// String bskey = isInput.getBSKEY();//jsonObject2.getString("BSKEY"); String bskey = isInput.getBSKEY();//jsonObject2.getString("BSKEY");
// String sapkey = isInput.getSAPKEY();//jsonObject2.getString("SAPKEY"); String sapkey = isInput.getSAPKEY();//jsonObject2.getString("SAPKEY");
// String s = ""; String s = "";
// JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
//
// JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
// jsonObject.put("BSKEY",UUID.randomUUID().toString().replaceAll("-","")); jsonObject.put("BSKEY", UUID.randomUUID().toString().replaceAll("-",""));
// jsonObject.put("SAPKEY",sapkey); jsonObject.put("SAPKEY",sapkey);
// jsonObject.put("ZTYPE","E"); jsonObject.put("ZTYPE","E");
// jsonObject.put("ZMESSAGE","处理失败"); jsonObject.put("ZMESSAGE","处理失败");
// try { try {
// if(StringUtils.isNotBlank(zdata)){ if(StringUtils.isNotBlank(zdata)){
// String sysUrl = invoiceConfig.getSysUrl() + "/itax/batchUpdate"; String sysUrl = invoiceConfig.getSysUrl() + "/itax/batchUpdate";
// //String sysUrl = "http://localhost:18100/itax/batchUpdate"; //String sysUrl = "http://localhost:18100/itax/batchUpdate";
// s = HttpUtils.doPost(sysUrl, zdata); s = HttpUtils.doPost(sysUrl, zdata);
// JSONObject jsonObject1 = JSONObject.parseObject(s); JSONObject jsonObject1 = JSONObject.parseObject(s);
// if(CollectionUtils.isEmpty(jsonObject1.getJSONArray("data"))){ if(CollectionUtils.isEmpty(jsonObject1.getJSONArray("data"))){
// jsonObject.put("ZTYPE","S"); jsonObject.put("ZTYPE","S");
// jsonObject.put("ZMESSAGE","处理成功"); jsonObject.put("ZMESSAGE","处理成功");
// jsonObject.put("ZDATA",jsonObject1.getString("data")); jsonObject.put("ZDATA",jsonObject1.getString("data"));
// } }
// } }
// } catch (Exception e) { } catch (Exception e) {
// jsonObject.put("ZTYPE","E"); jsonObject.put("ZTYPE","E");
// jsonObject.put("ZMESSAGE","处理失败"); jsonObject.put("ZMESSAGE","处理失败");
// } }
// log.info("同步组织信息返回报文：{}",jsonObject.toJSONString()); log.info("同步组织信息返回报文：{}",jsonObject.toJSONString());
// result.put("ES_OUTPUT",jsonObject); result.put("ES_OUTPUT",jsonObject);
// return result.toJSONString(); return result.toJSONString();
// } }else{
else{
returnJsonString = ""; returnJsonString = "";
} }
return returnJsonString; return returnJsonString;

4
order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java
Unescape View File

@ -205,8 +205,8 @@ public class InvoiceConfig {
@Value("${order.opentext.tempPath}") @Value("${order.opentext.tempPath}")
public String openTextTempPath; public String openTextTempPath;
// @Value("${order.sys.url}") @Value("${order.sys.url}")
// public String sysUrl; public String sysUrl;
// @Value("${order.sap.userName}") // @Value("${order.sap.userName}")
// private String sapUserName; // private String sapUserName;

Write Preview
Loading…
Cancel
Save