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

Merge remote-tracking branch 'origin/config' into release

Browse Source
release
wangrangrang 2 years ago
parent 3f4c5708d0 b898ebba76
commit 9c612420f5
6 changed files with 101 additions and 8 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. 5
      order-management-common/src/main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java
  3. 33
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/FangGeInterfaceServiceImpl.java
  4. 17
      order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java
  5. 19
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java
  6. 29
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java

5
order-management-common/src/main/java/com/dxhy/order/model/sk/fg/SpFpXeMxDto.java
Unescape View File

@ -35,6 +35,11 @@ public class SpFpXeMxDto implements Serializable {
*/
private String cpyqylx;
/**
* 二手车标识
*/
private String escbs;
/**
* 发票种类明细
*/

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/MakeOutAnInvoiceServiceImpl.java
Unescape View File

@ -616,7 +616,7 @@ public class MakeOutAnInvoiceServiceImpl implements MakeOutAnInvoiceService {
//方格开票特殊处理
if (CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh) && (OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())||OrderInfoEnum.ORDER_INVOICE_TYPE_42.getKey().equals(orderInfo.getFpzlDm()))) {
if (CommonUtils.judgeIsFgTerminalOld(terminalCode,fgSkKpShList,sh)) {
for (List<InvoiceBatchRequestItem> invoiceBatchRequestItem1 : insertBatchItem) {
for (InvoiceBatchRequestItem batchRequestItem : invoiceBatchRequestItem1) {
/**

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

@ -215,6 +215,7 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
OrderInfoJdcVO orderInfoJdc = orderInfoJdcService.queryOrderInfoJdcByOrderId(info.getOrderInfoId());
if (null != orderInfoJdc) {
FgJdctxxBO fgJdctxxBO = BeanTransitionUtils.transitionJdcfgOrderInvoiceHead(orderInfoJdc);
fgJdctxxBO.setJDCFPBZ("3");
fgCommonOrder.setJDCTXX(fgJdctxxBO);
}
//查询二手车订单数据
@ -2241,7 +2242,22 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
if (OrderInfoEnum.TAX_EQUIPMENT_C48.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_D60.getKey().equals(terminalCode)) {
terminalCode = OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey();
}
SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(invoiceConfig.configSqZcxxFg(), sqZcxxParam, terminalCode);
String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
String url = invoiceConfig.configSqZcxxFg();
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(sqZcxxParam.getNSRSBH())) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (sqZcxxParam.getNSRSBH().equals(fgSkKp)) {
url = invoiceConfig.configSqZcxxFgJDC();
}
}
}
SqZcxxResponse sqZcxxResponse = HttpInvoiceRequestUtilFg.sqZcxx(url, sqZcxxParam, terminalCode);
if (ConfigureConstant.STRING_0000.equals(sqZcxxResponse.getCode())) {
//注册成功，返回注册码
String zcm = "";
@ -2341,7 +2357,20 @@ public class FangGeInterfaceServiceImpl implements FangGeInterfaceService {
}
// 调用税控接口,同步税盘信息
ResponseBaseBean result = HttpInvoiceRequestUtilFg.tbSpxx(invoiceConfig.configTbSpxxFg(), tbSpxxParam, taxEquipmentInfo.getSksbCode());
String url = invoiceConfig.configTbSpxxFg();
String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (nsrsbh.equals(fgSkKp)) {
url = invoiceConfig.configTbSpxxFgJDC();
}
}
}
ResponseBaseBean result = HttpInvoiceRequestUtilFg.tbSpxx(url, tbSpxxParam, taxEquipmentInfo.getSksbCode());
if (OrderInfoContentEnum.INVOICE_STAT_SUCCESS.getKey().equals(result.getCode())) {
//同步信息成功
log.info("同步税盘信息成功");

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

@ -31,6 +31,9 @@ public class InvoiceConfig {
@Value("${order.url.A9}")
private String interfaceA9BusinessUrl;
@Value("${order.url.jdc}")
private String interfaceJdcBusinessUrl;
/**
* 预览pdf水印
*/
@ -385,6 +388,10 @@ public class InvoiceConfig {
return interfaceA9BusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx";
}
public String configQueryNsrXnsbxxJDC() {
return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryNsrXnsbxx";
}
/**
* 打印机列表查询
*
@ -537,6 +544,10 @@ public class InvoiceConfig {
return interfaceA9BusinessUrl + "/invoice/business/v1.0/tbSpxx";
}
public String configTbSpxxFgJDC() {
return interfaceJdcBusinessUrl + "/invoice/business/v1.0/tbSpxx";
}
/**
* 调用税控生成pdf地址
*
@ -554,6 +565,9 @@ public class InvoiceConfig {
public String configSqZcxxFg() {
return interfaceA9BusinessUrl + "/invoice/business/v1.0/sqZcxx";
}
public String configSqZcxxFgJDC() {
return interfaceJdcBusinessUrl + "/invoice/business/v1.0/sqZcxx";
}
/**
* 调用获取pdf地址
@ -1207,4 +1221,7 @@ public class InvoiceConfig {
}
public String configGetDiscInfoFgJDC() {
return interfaceJdcBusinessUrl + "/invoice/business/v1.0/queryDiscinfo";
}
}

19
order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java
Unescape View File

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import com.dxhy.order.baseservice.config.BaseServiceConfig;
import com.dxhy.order.constant.*;
import com.dxhy.order.model.InvoicePrintInfo;
import com.dxhy.order.model.OrderInvoiceInfo;
@ -74,6 +75,9 @@ public class FangGeServiceImpl implements FangGeService {
@Resource
private FangGeService fangGeService;
@Resource
private BaseServiceConfig baseServiceConfig;
@Override
public void updateUploadRedInvoice(SpecialInvoiceReversalEntity entity) {
specialInvoiceReversalMapper.updateByPrimaryKeySelective(entity);
@ -279,7 +283,20 @@ public class FangGeServiceImpl implements FangGeService {
spxxParams.add(spxxParam);
tbSpxxParam.setJSPXX(spxxParams);
// 调用税控接口,同步税盘信息
HttpInvoiceRequestUtilFg.tbSpxx(invoiceConfig.configTbSpxxFg(), tbSpxxParam, OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey());
String url = invoiceConfig.configTbSpxxFg();
String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(xhfNsrsbh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (xhfNsrsbh.equals(fgSkKp)) {
url = invoiceConfig.configTbSpxxFgJDC();
}
}
}
HttpInvoiceRequestUtilFg.tbSpxx(url, tbSpxxParam, OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey());
registrationCode.setSpzt(spzt);
saveCodeToRedis(registrationCode);
log.warn("{}同步税盘状态成功,当前税盘状态为:{}(0:在线,1:离线),税号:{},机器编号:{}", LOGGER_MSG, spzt, xhfNsrsbh, jqbh);

29
order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/UnifyServiceImpl.java
Unescape View File

@ -239,7 +239,20 @@ public class UnifyServiceImpl implements UnifyService {
cpybs = "";
}
sldRequest.setCpybs(cpybs);
NsrXnsbxxs nsrXnsbxxs = HttpInvoiceRequestUtil.queryNsrXnsbxx(invoiceConfig.configQueryNsrXnsbxx(), sldRequest, terminalCode);
String realUrl = invoiceConfig.configQueryNsrXnsbxx();
String fgSkKpShList = baseServiceConfig.getFgSkKpShList();
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (nsrsbh.equals(fgSkKp)) {
realUrl = invoiceConfig.configQueryNsrXnsbxxJDC();
}
}
}
NsrXnsbxxs nsrXnsbxxs = HttpInvoiceRequestUtil.queryNsrXnsbxx(realUrl, sldRequest, terminalCode);
if (ObjectUtil.isNotEmpty(nsrXnsbxxs) && ObjectUtil.isNotEmpty(nsrXnsbxxs.getContent())) {
convertToNewTaxFjh(resultList, nsrXnsbxxs.getContent(), nsrsbh, terminalCode);
}
@ -747,8 +760,19 @@ public class UnifyServiceImpl implements UnifyService {
fgJspxxReqEntity.setJsplx(jspxx);
fgJspxxReqEntity.setFpzlDm(fpzldm);
String url = invoiceConfig.configGetDiscInfoFg();
if (StringUtils.isNotBlank(fgSkKpShList) && StringUtils.isNotBlank(nsrsbh)) {
String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2);
for (String fgSkKp : fgSkKpList) {
if (nsrsbh.equals(fgSkKp)) {
url = invoiceConfig.configGetDiscInfoFgJDC();
}
}
}
SpFpXeDto spFpXeDto = HttpInvoiceRequestUtilFg.querySpZlXeByNsrsbh(
invoiceConfig.configGetDiscInfoFg(), fgJspxxReqEntity, terminalCode);
url, fgJspxxReqEntity, terminalCode);
List<TaxpayerMachineInfo> taxpayerMachineInfoList = new ArrayList<>();
if (ObjectUtil.isNotNull(spFpXeDto)) {
if (ConfigureConstant.STRING_0000.equals(spFpXeDto.getCode()) && ObjectUtil.isNotNull(spFpXeDto.getData())) {
@ -760,6 +784,7 @@ public class UnifyServiceImpl implements UnifyService {
taxpayerMachineInfo.setJQBH(fpXeMxDto.getJqbh());
taxpayerMachineInfo.setSPMC(fpXeMxDto.getJqbh());
taxpayerMachineInfo.setCPYBS(fpXeMxDto.getCpyqylx());
taxpayerMachineInfo.setESCBS(fpXeMxDto.getEscbs());
List<InvoiceType> invoiceTypeList = new ArrayList<>();
if (ObjectUtil.isNotEmpty(fpXeMxDto.getInvoicetypedetails())) {

Write Preview
Loading…
Cancel
Save