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

feature：山能易行回推发票

Browse Source
release
gaorl 2 years ago
parent 34eebfcee0
commit f4388eea96
5 changed files with 34 additions and 14 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. 4
      order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
  2. 30
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  3. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java
  4. 1
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java
  5. 7
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java

4
order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
Unescape View File

@ -193,6 +193,10 @@ public class OrderProcessInfo implements Serializable {
* 公司代码
*/
private String gsdm;
/**
* 公司对应client
*/
private String gsClients;
/**
* 驳回状态
*/

30
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
Unescape View File

@ -1315,11 +1315,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
if(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(fpTsMqData.getPushType())){
OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpTsMqData().getFpqqlsh(), null);
OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh());
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, null);
List<GsClient> gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm());
// OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpTsMqData().getFpqqlsh(), null);
// OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
// orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh());
// OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, null);
// List<GsClient> gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm());
//发票开具推送
List<DdfpzxxV5> ddfpzxxV5s = JsonUtils.getInstance().jsonToList(content, DdfpzxxV5.class);
@ -1331,8 +1331,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
FpkjtsReqSap fpkjtsReqSap = new FpkjtsReqSap();
List<FpkjtsMxSap> itemList = new ArrayList<>();
//主信息
if(!OrderInfoEnum.SYS_SOURCE_FPPAGE.getKey().equals(orderProcessInfo.getXtly())){
fpkjtsReqSap.setZJSDH(orderProcessInfo.getOriginDdh());
if(!OrderInfoEnum.SYS_SOURCE_FPPAGE.getKey().equals(ddfpxx.getXtly())){
fpkjtsReqSap.setZJSDH(ddfpxx.getDDH());
}else {
fpkjtsReqSap.setZJSDH("");
}
@ -1364,11 +1364,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
fpkjtsReqSap.setZGFDH(ddfpxx.getGMFDH());
fpkjtsReqSap.setZXFDH(ddfpxx.getXHFDH());
fpkjtsReqSap.setZXFZH(ddfpxx.getXHFZH());
fpkjtsReqSap.setZGSDM(orderProcessInfo.getGsdm());
fpkjtsReqSap.setZYWDJ(orderProcessInfo.getBzdh());
fpkjtsReqSap.setIMGID(orderInvoiceInfo.getDocuId());
if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(orderProcessInfo.getXtly()) ||
OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(orderProcessInfo.getXtly())){
fpkjtsReqSap.setZGSDM(ddfpxx.getCompanyCode());
fpkjtsReqSap.setZYWDJ(ddfpxx.getBillNum());
fpkjtsReqSap.setIMGID(ddfpxx.getDocuId());
if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(ddfpxx.getXtly()) ||
OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(ddfpxx.getXtly())){
fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL());
fpkjtsReqSap.setZJLLX(ddfpxx.getZJLLX());
}
@ -1376,7 +1376,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
ddmxxx.stream().forEach(f -> {
FpkjtsMxSap detail = new FpkjtsMxSap();
//主信息
detail.setZJSDH(StringUtils.isNotBlank(orderProcessInfo.getOriginDdh())?orderProcessInfo.getOriginDdh():orderProcessInfo.getDdh());
detail.setZJSDH(ddfpxx.getDDH());
// detail.setZJSDH(ddfpxx.getDDH());
detail.setZFPDM(ddfpxx.getFPDM());
detail.setZFPHM(ddfpxx.getFPHM());
@ -1412,7 +1412,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJTS.getKey());
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey());
isInput.setZORG("");
isInput.setZFILED5(gsClients.size()>0?gsClients.get(0).getClient():"");
isInput.setZFILED5(ddfpxx.getGsClients());
mainList.add(fpkjtsReqSap);
String jsonString = JsonUtils.getInstance().toJsonString(mainList);
isInput.setZDATA(jsonString);
@ -1477,6 +1477,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
String pushWjl = pushInfo.getPushWjl();
List<OrderProcessInfo> orderProcessInfoList = new ArrayList<>();
OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpqqlsh(), shList);
List<GsClient> gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm());
log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo));
if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
List<OrderProcessInfo> orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList);
@ -1499,6 +1500,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
List<DdfpzxxV5> ddfpzxxV5s = new ArrayList<>();
try {
for (OrderProcessInfo processInfo : orderProcessInfoList) {
processInfo.setGsClients(gsClients.size()>0?gsClients.get(0).getClient():"");
DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(processInfo, shList, ConfigureConstant.STRING_0);
ddfpzxxV5s.add(interfaceOrderV5);
}

6
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java
Unescape View File

@ -348,6 +348,12 @@ public class DdfpxxV5 {
* 数据权限ID
*/
private String ENTID;
private String docuId;
private String xtly;
private String gsClients;
}

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

@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.csp.sentinel.annotation.SentinelResource;
import com.dxhy.order.constant.*;
import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
import com.dxhy.order.consumer.modules.order.model.GsClient;
import com.dxhy.order.exception.InterfaceException;
import com.dxhy.order.exception.OrderReceiveException;
import com.dxhy.order.model.*;

7
order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java
Unescape View File

@ -44,6 +44,12 @@ public class BeanTransitionV5Utils {
ddfpxxV5.setDDLX(orderProcessInfo.getDdlx());
ddfpxxV5.setBillNum(orderProcessInfo.getBzdh());
ddfpxxV5.setCompanyCode(orderProcessInfo.getGsdm());
ddfpxxV5.setXtly(orderProcessInfo.getXtly());
ddfpxxV5.setGsClients(orderProcessInfo.getGsClients());
//gsClients.size()>0?gsClients.get(0).getClient():""
if(StringUtils.isNotBlank(orderProcessInfo.getOriginDdh())){
ddfpxxV5.setDDH(orderProcessInfo.getOriginDdh());
}
if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
try {
String requestData = generateQdInvoice.getRequestData();
@ -122,6 +128,7 @@ public class BeanTransitionV5Utils {
ddfpxxV5.setHZXXBBH(StringUtils.isEmpty(orderInvoiceInfo.getHzxxbbh()) ? "" : orderInvoiceInfo.getHzxxbbh());
ddfpxxV5.setZFBZ(StringUtils.isEmpty(orderInvoiceInfo.getZfBz()) ? "" : orderInvoiceInfo.getZfBz());
ddfpxxV5.setCHBZ(StringUtils.isEmpty(orderInvoiceInfo.getChBz()) ? "" : orderInvoiceInfo.getChBz());
ddfpxxV5.setDocuId(StringUtils.isEmpty(orderInvoiceInfo.getDocuId()) ? "" : orderInvoiceInfo.getDocuId());
} else {
ddfpxxV5.setJQBH("");
ddfpxxV5.setFPDM("");

Write Preview
Loading…
Cancel
Save