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

Merge branch 'dev' into gongquanlin

Browse Source
release
gongquanlin 2 years ago
parent 82f11a0dde 91cef4dd49
commit a396a1cad7
5 changed files with 41 additions and 18 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. 25
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjMxSap.java
  3. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java
  4. 20
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
  5. 10
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/InvalidInvoiceServiceImpl.java

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

@ -401,8 +401,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
String sapkey = es_output.getSAPKEY();
String ztype = es_output.getZTYPE();
String zmessage = es_output.getZMESSAGE();
List<DdfptsV5> resultList = new ArrayList<>();
DdfptsV5 ddfptsV5 = new DdfptsV5();
ddfptsV5.setDDQQLSH(sapkey);
ddfptsV5.setDDQQLSH(fpTsMqData.getFpTsMqData().getFpqqlsh());
ddfptsV5.setNSRSBH("");
if(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey().equals(ztype)){
ddfptsV5.setZTDM(ConfigureConstant.STRING_000000);
@ -414,7 +415,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
dxhyInterfaceResponse.setReturnMessage("处理成功");
dxhyInterfaceResponse.setEncryptCode(ConfigurerInfo.ENCRYPTCODE_0);
dxhyInterfaceResponse.setZipCode(ConfigurerInfo.ENCRYPTCODE_0);
dxhyInterfaceResponse.setContent(Base64Encoding.encode(JsonUtils.getInstance().toJsonString(ddfptsV5)));
resultList.add(ddfptsV5);
dxhyInterfaceResponse.setContent(Base64Encoding.encode(JsonUtils.getInstance().toJsonString(resultList)));
}else{
dxhyInterfaceResponse = JsonUtils.getInstance().parseObject(result, DxhyInterfaceResponse.class);
}
@ -426,9 +428,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
String ztype = es_output.getZTYPE();
String zmessage = es_output.getZMESSAGE();
ZffpxxV5 zffpxxV5 = new ZffpxxV5();
zffpxxV5.setXHFSBH("");
zffpxxV5.setFPDM("");
zffpxxV5.setFPHM("");
zffpxxV5.setXHFSBH(fpTsMqData.getZfTsMqData().getNsrsbh());
zffpxxV5.setFPDM(fpTsMqData.getZfTsMqData().getFpdm());
zffpxxV5.setFPHM(fpTsMqData.getZfTsMqData().getFphm());
if(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey().equals(ztype)){
zffpxxV5.setZTDM(ConfigureConstant.STRING_000000);
}else {
@ -874,6 +876,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
DdfpzxxV5 ddfpzxxV5 = JsonUtils.getInstance().parseObject(content.substring(1,content.length()-1), DdfpzxxV5.class);
DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX();
List<DdmxxxV5> ddmxxx = ddfpzxxV5.getDDMXXX();
List<FpkjtsReqSap> mainList = new ArrayList<>();
FpkjtsReqSap fpkjtsReqSap = new FpkjtsReqSap();
List<FpkjtsMxSap> itemList = new ArrayList<>();
//主信息
@ -919,6 +922,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
detail.setINVOICETYPE(ddfpxx.getFPLXDM());
detail.setZHWMC(f.getXMMC());
detail.setZSM("");
itemList.add(detail);
});
fpkjtsReqSap.setITITEM(itemList);
IsInput isInput = new IsInput();
@ -927,7 +931,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey());
isInput.setZORG("");
isInput.setZFILED5(poClient);
String jsonString = JsonUtils.getInstance().toJsonString(fpkjtsReqSap);
mainList.add(fpkjtsReqSap);
String jsonString = JsonUtils.getInstance().toJsonString(mainList);
isInput.setZDATA(jsonString);
PoCommonRequestParam poCommonRequestParam = new PoCommonRequestParam();
poCommonRequestParam.setIS_INPUT(isInput);
@ -938,6 +943,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
//发票作废推送
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){
ZffptsV5 zffptsV5 = JsonUtils.getInstance().parseObject(content, ZffptsV5.class);
List<FpzftsReqSap> zfList = new ArrayList<>();
FpzftsReqSap fpzftsReqSap = new FpzftsReqSap();
fpzftsReqSap.setZFPDM(zffptsV5.getFPDM());
fpzftsReqSap.setZFPHM(zffptsV5.getFPHM());
@ -945,11 +951,12 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
fpzftsReqSap.setZJSDH("");
IsInput isInput = new IsInput();
isInput.setSYSID(OrderInfoEnum.SYS_SIGN_FP.getKey());
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJTS.getKey());
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPZFTS.getKey());
isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey());
isInput.setZORG("");
isInput.setZFILED5("");
String jsonString = JsonUtils.getInstance().toJsonString(fpzftsReqSap);
isInput.setZFILED5(poClient);
zfList.add(fpzftsReqSap);
String jsonString = JsonUtils.getInstance().toJsonString(zfList);
isInput.setZDATA(jsonString);
PoCommonRequestParam poCommonRequestParam = new PoCommonRequestParam();
poCommonRequestParam.setIS_INPUT(isInput);

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjMxSap.java
Unescape View File

@ -34,7 +34,7 @@ public class FpkjMxSap {
*/
private String ZZSL;
/**
* 税额
* 税率
*/
private String ZTAX;
/**

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java
Unescape View File

@ -1,5 +1,6 @@
package com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@ -266,5 +267,6 @@ public class FpkjtsReqSap {
/**
* 行项目结构
*/
@JSONField(name = "IT_ITEM")
private List<FpkjtsMxSap> ITITEM;
}

20
order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
Unescape View File

@ -58,6 +58,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
@ -3249,22 +3250,35 @@ public class BeanTransitionUtils {
ddtxxBO.setHJJE(req.getZBHSJE());
ddtxxBO.setHJSE(req.getZZSE());
ddtxxBO.setDDH(req.getZJSDH());
//TODO lfl 清单标志怎么处理？
ddtxxBO.setQDBZ("0");
//明细信息
List<FpkjMxSap> ititem = req.getITITEM();
for(int i=0;i < ititem.size();i++){
FpkjMxSap detail = ititem.get(i);
DdmxxxBO ddmxxxBO = new DdmxxxBO();
ddmxxxBO.setXH(i+1+"");
ddmxxxBO.setFPHXZ("0");
//detail.getZSFZKH() 1:普通行;2:折扣行 折扣行上一行是被折扣行
if(ConfigureConstant.STRING_1.equals(detail.getZSFZKH())){
ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_0);
}else if(ConfigureConstant.STRING_2.equals(detail.getZSFZKH())){
ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_1);
ddmxList.get(i-1).setFPHXZ(ConfigureConstant.STRING_2);
}else {
ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_0);
}
ddmxxxBO.setZXBM(detail.getMATNR());
ddmxxxBO.setXMMC(detail.getZCPMC());
ddmxxxBO.setGGXH(detail.getCHARG());
ddmxxxBO.setDW(detail.getZSLDW());
ddmxxxBO.setSPSL(detail.getZZSL());
ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString());
ddmxxxBO.setDJ(detail.getZZDJ());
ddmxxxBO.setJE(detail.getZBHSJE());
ddmxxxBO.setHSBZ("0");
ddmxxxBO.setJE(detail.getZHSJE());
ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1);
ddmxxxBO.setSE(detail.getZZSE());
//TODO lfl 优惠政策标识 取税编对应的优惠政策标识!
ddmxxxBO.setYHZCBS("0");
ddmxList.add(ddmxxxBO);
}
}

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

@ -798,13 +798,13 @@ public class InvalidInvoiceServiceImpl implements InvalidInvoiceService {
//作废推送数据存放队列
ZfTsMqData zfTsMqData = new ZfTsMqData();
zfTsMqData.setFpdm(invalidInvoiceInfo.getFpdm());
zfTsMqData.setFphm(invalidInvoiceInfo.getFphm());
zfTsMqData.setNsrsbh(invalidInvoiceInfo.getXhfNsrsbh());
zfTsMqData.setFpdm(invalidInvoiceInfoData.getFpdm());
zfTsMqData.setFphm(invalidInvoiceInfoData.getFphm());
zfTsMqData.setNsrsbh(invalidInvoiceInfoData.getXhfNsrsbh());
CommonTsMqData commonTsMqData = new CommonTsMqData();
commonTsMqData.setPushType(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_2.getKey());
commonTsMqData.setNsrsbh(invalidInvoiceInfo.getXhfNsrsbh());
commonTsMqData.setEntId(invalidInvoiceInfo.getEntId());
commonTsMqData.setNsrsbh(invalidInvoiceInfoData.getXhfNsrsbh());
commonTsMqData.setEntId(invalidInvoiceInfoData.getEntId());
commonTsMqData.setZfTsMqData(zfTsMqData);
rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData));

Write Preview
Loading…
Cancel
Save