feature 1.修复分机号未赋值的情况

release
zhenghaiyang@ele-cloud.com 2 years ago
parent 35cc5c42f1
commit a3cf2af3c6
  1. 1
      order-management-common/src/main/java/com/dxhy/order/model/page/OrderInvoiceInfoVo.java
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
  3. 2
      order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml

@ -107,6 +107,7 @@ public class OrderInvoiceInfoVo {
* 系统来源 * 系统来源
*/ */
private String xtly; private String xtly;
private String fjh;
/** /**
* 数据权限ID * 数据权限ID
*/ */

@ -1661,8 +1661,10 @@ public class InvoiceServiceImpl implements InvoiceService {
BigDecimal blueSe = blueItemList.stream().map(blueItem -> new BigDecimal(blueItem.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal blueSe = blueItemList.stream().map(blueItem -> new BigDecimal(blueItem.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal hjzje = blueMxje.add(blueSe); BigDecimal hjzje = blueMxje.add(blueSe);
if(OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(blueInvoiceInfo.getFpzlDm())){ if(OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(blueInvoiceInfo.getFpzlDm())){
SpecialInvoiceReversalPlus specialInvoiceReversal = new SpecialInvoiceReversalPlus(); SpecialInvoiceReversalPlus specialInvoiceReversal = new SpecialInvoiceReversalPlus();
BeanUtils.copyProperties(blueInvoiceInfo,specialInvoiceReversal); BeanUtils.copyProperties(blueInvoiceInfo,specialInvoiceReversal);
specialInvoiceReversal.setFjh(blueInvoiceInfo.getFjh());
specialInvoiceReversal.setYfpHm(blueInvoiceInfo.getFphm()); specialInvoiceReversal.setYfpHm(blueInvoiceInfo.getFphm());
specialInvoiceReversal.setYfpDm(blueInvoiceInfo.getFpdm()); specialInvoiceReversal.setYfpDm(blueInvoiceInfo.getFpdm());
specialInvoiceReversal.setYfpKprq(blueInvoiceInfo.getKprq()); specialInvoiceReversal.setYfpKprq(blueInvoiceInfo.getKprq());

@ -245,6 +245,7 @@
<result column="sykchse" jdbcType="VARCHAR" property="sykchse"/> <result column="sykchse" jdbcType="VARCHAR" property="sykchse"/>
<result column="zf_bz" jdbcType="VARCHAR" property="zfBz"/> <result column="zf_bz" jdbcType="VARCHAR" property="zfBz"/>
<result column="ch_bz" jdbcType="VARCHAR" property="chBz"/> <result column="ch_bz" jdbcType="VARCHAR" property="chBz"/>
<result column="fjh" jdbcType="VARCHAR" property="fjh"/>
<result column="kprq" jdbcType="TIMESTAMP" property="kprq"/> <result column="kprq" jdbcType="TIMESTAMP" property="kprq"/>
</resultMap> </resultMap>
@ -2313,6 +2314,7 @@
oii.zf_bz, oii.zf_bz,
oii.ch_bz, oii.ch_bz,
oii.kprq, oii.kprq,
oii.fjh,
op.ddzt op.ddzt
FROM FROM
order_invoice_info oii INNER JOIN order_process_info op ON oii.order_info_id = op.order_info_id order_invoice_info oii INNER JOIN order_process_info op ON oii.order_info_id = op.order_info_id

Loading…
Cancel
Save