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

Merge branch 'release' into test

Browse Source 
# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
release
gaorl 2 years ago
parent c126a2e757 fd41a367d0
commit 3dbf526864
8 changed files with 107 additions and 63 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. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java
  2. 127
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  3. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java
  4. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
  5. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
  6. BIN
      order-management-consumer/src/main/resources/download/OrderExcel.xlsx
  7. BIN
      order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx
  8. 26
      order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java
Unescape View File

@ -51,6 +51,8 @@ public interface OrderProcessInfoMapper {
*/
OrderProcessInfo queryOrderProcessInfoByFpqqlsh(@Param("fpqqlsh") String fpqqlsh, @Param("shList") List<String> shList);
List<OrderProcessInfo> queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh, @Param("shList")List<String> shList);
/**
* 根据批次号查询订单处理表数据
*

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

@ -465,7 +465,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
String error=String.format("税号:%s,组装请求报文为空,不进行推送数据",fpTsMqData.getNsrsbh());
log.warn(error);
failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),error,error,pushInfo,fpTsMqData.getPushType());
continue;
break;
}
try {
//推送影像系统
@ -1561,30 +1561,19 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
}
String version = pushInfo.getVersionIdent();
String pushWjl = pushInfo.getPushWjl();
List<OrderProcessInfo> orderProcessInfoList = new ArrayList<>();
OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpqqlsh(), shList);
log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo));
OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
log.info("{}推送接口orderInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfo));
List<OrderItemInfo> orderItemInfos = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
List<DdmxxxBO> ddmxxxList = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos);
List<OrderInvoiceItemBO> orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItem(orderItemInfos);
OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh());
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, shList);
log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
List<OrderProcessInfo> orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList);
List<DdkzxxBO> orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList);
log.info("{}推送接口orderExtensionInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExtensionInfos));
/**
* 查询税控设备信息
*/
String terminalCode = orderInvoiceInfo.getSksbdm();
if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
List<OrderProcessInfo> orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList);
int count = (int)orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count();
if(orderProcessInfos.size() != count){
return null;
}
orderProcessInfoList.addAll(orderProcessInfos);
}else{
orderProcessInfoList.add(orderProcessInfo);
}
//判断推送版本
if (ConfigurerInfo.INTERFACE_VERSION_V5.equals(version)
@ -1592,9 +1581,10 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
List<DdfpzxxV5> ddfpzxxV5s = new ArrayList<>();
try {
DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(orderProcessInfo, shList, ConfigureConstant.STRING_0);
ddfpzxxV5s.add(interfaceOrderV5);
for (OrderProcessInfo processInfo : orderProcessInfoList) {
DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(processInfo, shList, ConfigureConstant.STRING_0);
ddfpzxxV5s.add(interfaceOrderV5);
}
} catch (InterfaceException e) {
throw new OrderReceiveException(e.getCode(), e.getMessage());
@ -1604,6 +1594,25 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
content = JsonUtils.getInstance().toJsonString(ddfpzxxV5s);
} else if (ConfigurerInfo.INTERFACE_VERSION_V4.equals(version) || ConfigurerInfo.INTERFACE_VERSION_V3.equals(version)) {
OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
log.info("{}推送接口orderInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfo));
List<OrderItemInfo> orderItemInfos = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
List<DdmxxxBO> ddmxxxList = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos);
List<OrderInvoiceItemBO> orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItem(orderItemInfos);
OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh());
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, shList);
log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
List<OrderProcessInfo> orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList);
List<DdkzxxBO> orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList);
log.info("{}推送接口orderExtensionInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExtensionInfos));
/**
* 查询税控设备信息
*/
String terminalCode = orderInvoiceInfo.getSksbdm();
//新版本请求参数组装response
DdfpcxRspBO ddfpcxRsp = new DdfpcxRspBO();
//新版本组装数据方式
@ -1800,42 +1809,42 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
}
} else {
//旧版本请求参数组装response
PushReqBO response = new PushReqBO();
//旧版本组装方式
List<CommonOrderInvocieBO> commonOrderInvocies = new ArrayList<>();
CommonOrderInvocieBO commonOrderInvocie = new CommonOrderInvocieBO();
log.info("==>推送旧的版本接口");
OrderInvoiceHeadBO orderInvoiceHead = BeanTransitionUtils.transitionOrderInvoiceHead(orderInfo, orderInvoiceInfo);
boolean fpdmhmDp = (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(orderInvoiceInfo.getFpzlDm())
|| OrderInfoEnum.ORDER_INVOICE_TYPE_01.getKey().equals(orderInvoiceInfo.getFpzlDm())
|| OrderInfoEnum.ORDER_INVOICE_TYPE_02.getKey().equals(orderInvoiceInfo.getFpzlDm())
|| OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderInvoiceInfo.getFpzlDm()))
&& StringUtils.isNotEmpty(orderInvoiceInfo.getFphm());
if (fpdmhmDp) {
/**
* 获取PDF判断
*/
List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,"");
if (ObjectUtil.isNotEmpty(fileDownLoadList)) {
orderInvoiceHead.setPDF_FILE(fileDownLoadList.get(0).getFileContent());
} else {
orderInvoiceHead.setPDF_FILE("");
}
} else {
orderInvoiceHead.setPDF_FILE("");
}
// PushReqBO response = new PushReqBO();
// //旧版本组装方式
// List<CommonOrderInvocieBO> commonOrderInvocies = new ArrayList<>();
// CommonOrderInvocieBO commonOrderInvocie = new CommonOrderInvocieBO();
// log.info("==>推送旧的版本接口");
// OrderInvoiceHeadBO orderInvoiceHead = BeanTransitionUtils.transitionOrderInvoiceHead(orderInfo, orderInvoiceInfo);
// boolean fpdmhmDp = (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(orderInvoiceInfo.getFpzlDm())
// || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getKey().equals(orderInvoiceInfo.getFpzlDm())
// || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getKey().equals(orderInvoiceInfo.getFpzlDm())
// || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderInvoiceInfo.getFpzlDm()))
// && StringUtils.isNotEmpty(orderInvoiceInfo.getFphm());
// if (fpdmhmDp) {
// /**
// * 获取PDF判断
// */
// List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,"");
// if (ObjectUtil.isNotEmpty(fileDownLoadList)) {
// orderInvoiceHead.setPDF_FILE(fileDownLoadList.get(0).getFileContent());
// } else {
// orderInvoiceHead.setPDF_FILE("");
// }
// } else {
// orderInvoiceHead.setPDF_FILE("");
// }
//组装
commonOrderInvocie.setORDER_INVOICE_HEAD(orderInvoiceHead);
commonOrderInvocie.setORDER_INVOICE_ITEMS(orderInvoiceItems);
commonOrderInvocies.add(commonOrderInvocie);
//发票开具状态码 0000 成功 9999 失败
response.setSTATUS_CODE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getKey());
response.setSTATUS_MESSAGE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getMessage());
response.setCOMMON_ORDER_INVOCIE(commonOrderInvocies);
content = JsonUtils.getInstance().toJsonString(response);
// commonOrderInvocie.setORDER_INVOICE_HEAD(orderInvoiceHead);
// commonOrderInvocie.setORDER_INVOICE_ITEMS(orderInvoiceItems);
// commonOrderInvocies.add(commonOrderInvocie);
//
// //发票开具状态码 0000 成功 9999 失败
// response.setSTATUS_CODE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getKey());
// response.setSTATUS_MESSAGE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getMessage());
// response.setCOMMON_ORDER_INVOCIE(commonOrderInvocies);
// content = JsonUtils.getInstance().toJsonString(response);
}
return content;
}

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

@ -32,6 +32,8 @@ public interface OrderProcessService {
*/
OrderProcessInfo queryOrderProcessInfoByFpqqlsh(String fpqqlsh, List<String> shList);
List<OrderProcessInfo> queryOrderProcessInfoByBzdh(String bzdh, List<String> shList);
/**
* 根据订单请求批次号获取发票处理表数据
*

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

@ -64,6 +64,11 @@ public class OrderProcessServiceImpl implements OrderProcessService {
//订单与原始订单都需要使用,不能添加有效状态判断
return orderProcessInfoMapper.queryOrderProcessInfoByFpqqlsh(fpqqlsh, shList);
}
@Override
public List<OrderProcessInfo> queryOrderProcessInfoByBzdh(String bzdh, List<String> shList){
return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, shList);
}
@Override
public List<OrderProcessInfo> selectOrderProcessInfoByDdqqpch(String ddqqpch, List<String> shList) {

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

@ -3509,10 +3509,10 @@ public class BeanTransitionUtils {
// ddtxxBO.setXHFYH("");
// ddtxxBO.setXHFZH("");
// } else {
ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount());
ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount());
// }
ddtxxBO.setGMFBM(req.getZGFBH());
ddtxxBO.setKPR(req.getZKPRXM());

BIN
order-management-consumer/src/main/resources/download/OrderExcel.xlsx
View File

Binary file not shown.

BIN
order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx
View File

Binary file not shown.

26
order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
Unescape View File

@ -144,6 +144,32 @@
</if>
</select>
<select id="queryOrderProcessInfoByBzdh" parameterType="java.lang.String" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM
order_process_info op
WHERE
bzdh = #{bzdh,jdbcType=VARCHAR}
<if test="shList != null and shList.size() == 0">
and xhf_nsrsbh = ''
</if>
<if test="shList != null and shList.size() == 1">
and xhf_nsrsbh =
<foreach collection="shList" index="index" item="item">
#{item}
</foreach>
</if>
<if test="shList != null and shList.size() > 1">
and xhf_nsrsbh in
<foreach collection="shList" index="index" item="item"
open="(" separator="," close=")">
#{item}
</foreach>
</if>
and order_status = '0'
</select>
<!--根据发票请求批次号获取订单数据-->
<select id="selectOrderProcessInfoByDdqqpch" resultMap="BaseResultMap"
parameterType="java.lang.String">

Write Preview
Loading…
Cancel
Save