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

feature 1.配置调用订单还是税控

Browse Source
release
zhenghaiyang@ele-cloud.com 2 years ago
parent 13fd8cc4a2
commit d82df20a18
2 changed files with 18 additions and 31 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. 37
      order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
  2. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java

37
order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java
Unescape View File

@ -1132,17 +1132,16 @@ public class CommonUtils {
* @date 2021-09-07
*/
public static boolean judgeIsFgTerminalNew(String terminalCode, String fgSkKpShList, String sh) {
boolean isSkQd = true;
// if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
// String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
// for (String fgSkKp : fgSkKpList) {
// if (sh.equals(fgSkKp)) {
// isSkQd = true;
// break;
// }
// }
// }
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (sh.equals(fgSkKp)) {
return true;
}
}
}
boolean isSkQd = true;
return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) ||
OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) ||
OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) ||
@ -1158,17 +1157,15 @@ public class CommonUtils {
* @date 2021-09-07
*/
public static boolean judgeIsFgTerminalOld(String terminalCode, String fgSkKpShList, String sh) {
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (sh.equals(fgSkKp)) {
return true;
}
}
}
boolean isSkQd = false;
// if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
// String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
// for (String fgSkKp : fgSkKpList) {
// if (sh.equals(fgSkKp)) {
// isSkQd = true;
// break;
// }
// }
// }
return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) ||
OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) ||
OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) ||

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java
Unescape View File

@ -3021,17 +3021,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
log.info("{}请求税控设备类型为:{}", LOGGER_MSG, terminalCode);
FgEnterpriseInfoBo fgEnterpriseInfoBo = new FgEnterpriseInfoBo();
fgEnterpriseInfoBo.setSKSBCODE(terminalCode);
boolean isSkQd = false;
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (sh.equals(fgSkKp)) {
isSkQd = true;
break;
}
}
}
fgEnterpriseInfoBo.setKPFS(!isSkQd? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey());
fgEnterpriseInfoBo.setKPFS(CommonUtils.judgeIsFgTerminalNew(terminalCode,fgSkKpShList,sh)? FANGGE_INVOICE_TYPE_1.getKey():FANGGE_INVOICE_TYPE_0.getKey());
fgOrderResponse.setData(fgEnterpriseInfoBo);
} catch (Exception e) {
fgOrderResponse.setSTATUS_CODE(OrderInfoContentEnum.INVOICE_STAT_ERROR.getKey());

Write Preview
Loading…
Cancel
Save