|
|
@ -12,6 +12,7 @@ import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService |
|
|
|
import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; |
|
|
|
import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; |
|
|
|
import com.dxhy.order.constant.*; |
|
|
|
import com.dxhy.order.constant.*; |
|
|
|
import com.dxhy.order.consumer.config.OpenApiConfig; |
|
|
|
import com.dxhy.order.consumer.config.OpenApiConfig; |
|
|
|
|
|
|
|
import com.dxhy.order.consumer.dao.GsClientMapper; |
|
|
|
import com.dxhy.order.consumer.model.protocol.CommonResponse; |
|
|
|
import com.dxhy.order.consumer.model.protocol.CommonResponse; |
|
|
|
import com.dxhy.order.consumer.model.protocol.ResponseData; |
|
|
|
import com.dxhy.order.consumer.model.protocol.ResponseData; |
|
|
|
import com.dxhy.order.consumer.model.protocol.ResponseStatus; |
|
|
|
import com.dxhy.order.consumer.model.protocol.ResponseStatus; |
|
|
@ -19,6 +20,7 @@ import com.dxhy.order.consumer.modules.jdjos.service.PushInvoiceToJdJosService; |
|
|
|
import com.dxhy.order.consumer.modules.manager.model.OpenTextResult; |
|
|
|
import com.dxhy.order.consumer.modules.manager.model.OpenTextResult; |
|
|
|
import com.dxhy.order.consumer.modules.manager.service.PushInvoiceService; |
|
|
|
import com.dxhy.order.consumer.modules.manager.service.PushInvoiceService; |
|
|
|
import com.dxhy.order.consumer.modules.manager.service.QuickCodeInfoService; |
|
|
|
import com.dxhy.order.consumer.modules.manager.service.QuickCodeInfoService; |
|
|
|
|
|
|
|
import com.dxhy.order.consumer.modules.order.model.GsClient; |
|
|
|
import com.dxhy.order.consumer.modules.order.service.OrderCommonService; |
|
|
|
import com.dxhy.order.consumer.modules.order.service.OrderCommonService; |
|
|
|
import com.dxhy.order.consumer.modules.order.service.OrderInfoService; |
|
|
|
import com.dxhy.order.consumer.modules.order.service.OrderInfoService; |
|
|
|
import com.dxhy.order.consumer.modules.order.service.OrderItemInfoService; |
|
|
|
import com.dxhy.order.consumer.modules.order.service.OrderItemInfoService; |
|
|
@ -157,6 +159,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private BaseServiceConfig baseServiceConfig; |
|
|
|
private BaseServiceConfig baseServiceConfig; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
|
|
|
private GsClientMapper gsClientMapper; |
|
|
|
|
|
|
|
|
|
|
|
private final static Map smMap = new HashMap() {{ |
|
|
|
private final static Map smMap = new HashMap() {{ |
|
|
|
put(new BigDecimal("0"), "X0"); |
|
|
|
put(new BigDecimal("0"), "X0"); |
|
|
|
put(new BigDecimal("0.16"), "X1"); |
|
|
|
put(new BigDecimal("0.16"), "X1"); |
|
|
@ -388,7 +393,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
|
|
|
|
|
|
|
|
Map<String, String> requestMap = commonDisposeService.getRequestParameter(pushInfo.getNsrsbh(), pushInfo.getZipCode(), pushInfo.getEncryptCode(), content, pushInfo.getPushUrl(), pushInfo.getInterfaceType(), pushInfo.getVersionIdent()); |
|
|
|
Map<String, String> requestMap = commonDisposeService.getRequestParameter(pushInfo.getNsrsbh(), pushInfo.getZipCode(), pushInfo.getEncryptCode(), content, pushInfo.getPushUrl(), pushInfo.getInterfaceType(), pushInfo.getVersionIdent()); |
|
|
|
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ |
|
|
|
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ |
|
|
|
fptsParam = convertToYwxtParam(fpTsMqData,xtly,content,baseServiceConfig.getPoClient()); |
|
|
|
fptsParam = convertToYwxtParam(fpTsMqData,xtly,content); |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
fptsParam = JsonUtils.getInstance().toJsonString(requestMap); |
|
|
|
fptsParam = JsonUtils.getInstance().toJsonString(requestMap); |
|
|
|
} |
|
|
|
} |
|
|
@ -955,7 +960,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
return content; |
|
|
|
return content; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String convertToYwxtParam(CommonTsMqData fpTsMqData,String xtly,String content,String poClient){ |
|
|
|
public String convertToYwxtParam(CommonTsMqData fpTsMqData,String xtly,String content){ |
|
|
|
String ywxtParam = ""; |
|
|
|
String ywxtParam = ""; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -964,6 +969,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); |
|
|
|
OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); |
|
|
|
orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); |
|
|
|
orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); |
|
|
|
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, null); |
|
|
|
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, null); |
|
|
|
|
|
|
|
List<GsClient> gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm()); |
|
|
|
|
|
|
|
|
|
|
|
//发票开具推送
|
|
|
|
//发票开具推送
|
|
|
|
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ |
|
|
|
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ |
|
|
@ -1025,7 +1031,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJTS.getKey()); |
|
|
|
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJTS.getKey()); |
|
|
|
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey()); |
|
|
|
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey()); |
|
|
|
isInput.setZORG(""); |
|
|
|
isInput.setZORG(""); |
|
|
|
isInput.setZFILED5(poClient); |
|
|
|
isInput.setZFILED5(gsClients.size()>0?gsClients.get(0).getClient():""); |
|
|
|
mainList.add(fpkjtsReqSap); |
|
|
|
mainList.add(fpkjtsReqSap); |
|
|
|
String jsonString = JsonUtils.getInstance().toJsonString(mainList); |
|
|
|
String jsonString = JsonUtils.getInstance().toJsonString(mainList); |
|
|
|
isInput.setZDATA(jsonString); |
|
|
|
isInput.setZDATA(jsonString); |
|
|
@ -1036,6 +1042,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
} |
|
|
|
} |
|
|
|
}else if(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_2.getKey().equals(fpTsMqData.getPushType())){ |
|
|
|
}else if(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_2.getKey().equals(fpTsMqData.getPushType())){ |
|
|
|
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(fpTsMqData.getZfTsMqData().getFpdm(), fpTsMqData.getZfTsMqData().getFphm(), null); |
|
|
|
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(fpTsMqData.getZfTsMqData().getFpdm(), fpTsMqData.getZfTsMqData().getFphm(), null); |
|
|
|
|
|
|
|
OrderProcessInfo orderProcessInfo = orderProcessService.selectByOrderId(orderInvoiceInfo.getOrderInfoId(), null); |
|
|
|
|
|
|
|
List<GsClient> gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm()); |
|
|
|
//发票作废推送
|
|
|
|
//发票作废推送
|
|
|
|
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ |
|
|
|
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){ |
|
|
|
ZffptsV5 zffptsV5 = JsonUtils.getInstance().parseObject(content, ZffptsV5.class); |
|
|
|
ZffptsV5 zffptsV5 = JsonUtils.getInstance().parseObject(content, ZffptsV5.class); |
|
|
@ -1051,7 +1059,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { |
|
|
|
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPZFTS.getKey()); |
|
|
|
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPZFTS.getKey()); |
|
|
|
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey()); |
|
|
|
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey()); |
|
|
|
isInput.setZORG(""); |
|
|
|
isInput.setZORG(""); |
|
|
|
isInput.setZFILED5(poClient); |
|
|
|
isInput.setZFILED5(gsClients.size()>0?gsClients.get(0).getClient():""); |
|
|
|
zfList.add(fpzftsReqSap); |
|
|
|
zfList.add(fpzftsReqSap); |
|
|
|
String jsonString = JsonUtils.getInstance().toJsonString(zfList); |
|
|
|
String jsonString = JsonUtils.getInstance().toJsonString(zfList); |
|
|
|
isInput.setZDATA(jsonString); |
|
|
|
isInput.setZDATA(jsonString); |
|
|
|