From 8f9ffbcd9dce6de1483bde3d556a4492318ac32c Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 5 Aug 2024 11:31:05 +0800 Subject: [PATCH] md --- .../emis/domain/EmisSettleInvoiceRecord.java | 2 +- .../mapper/EmisSettleInvoiceRecordMapper.java | 9 +++++ .../EmisSettleInvoiceChRecordServiceImpl.java | 38 ++++++++++++++++--- .../mapper/EmisSettleInvoiceRecordMapper.xml | 6 +++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java index f45ac98d7..445b79bc6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java @@ -80,7 +80,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity private BigDecimal openMoney; /* 发票号 */ private String invoiceNo; - /* 开票状态 0-待开票 1-已开票 2-拒绝开票 */ + /* 开票状态 0-待开票 1-开票中 2-已开票 3-拒绝开票 */ private String invoiceStatus; /* 开票状态描述 */ private String invoiceStatusDesc; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java index 2fa35b17b..63602a0f4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java @@ -28,6 +28,13 @@ public interface EmisSettleInvoiceRecordMapper extends BaseMapper selectInvoiceRecordListBySettleBillNo(String settleBillNo); + + /** * 检查是否重复 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index c71d8065a..fc9889a04 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -17,9 +17,11 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.emis.domain.EmisBaseInvoiceChInfo; import com.xdadan.erp.emis.domain.EmisSettleBill; +import com.xdadan.erp.emis.domain.EmisSettleInvoiceRecord; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.mapper.EmisBaseInvoiceChInfoMapper; +import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRecordMapper; import com.xdadan.erp.emis.service.openbill.hx.HXOrderGoods; import com.xdadan.erp.emis.service.openbill.hx.HXOrderInfo; import com.xdadan.erp.emis.service.openbill.hx.HXSdk; @@ -46,6 +48,9 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC @Autowired private EmisBaseInvoiceChInfoMapper emisBaseInvoiceChInfoMapper; + @Autowired + private EmisSettleInvoiceRecordMapper emisSettleInvoiceRecordMapper; + /** * 查询渠道开票记录表 * @@ -92,10 +97,25 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC @Override public int insertEmisSettleInvoiceChRecord(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord) { + EmisSettleInvoiceRecord oldApply=emisSettleInvoiceRecordMapper.selectInvoiceRecordByApplySeqNo(emisSettleInvoiceChRecord.getApplySeqNo()); + // 判断对应账单是否存在 String reqNo= WaybillHelper.genOrderSn(); emisSettleInvoiceChRecord.setReqNo(reqNo); - return emisSettleInvoiceChRecordMapper.insertEmisSettleInvoiceChRecord(emisSettleInvoiceChRecord); + emisSettleInvoiceChRecordMapper.insertEmisSettleInvoiceChRecord(emisSettleInvoiceChRecord); + + // 更新开票状态 + EmisSettleInvoiceRecord newApply = new EmisSettleInvoiceRecord(); + newApply.setId(oldApply.getId()); + newApply.setInvoiceStatus("1"); + newApply.setInvoiceStatusDesc("开票中"); + + // 渠道待开票 + newApply.setOpenChStatus("0"); + + emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply); + + return 1; } /** @@ -251,8 +271,7 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC updRecord.setInvoiceNo(item0.getString("invoiceNo")); // updRecord.setRemark(jQRst.toJSONString()); updRecord.setOpenChStatus(item0.getString("status")); - - updRecord.setOpenChStatusDesc("已查询开票"); + updRecord.setOpenChStatusDesc("已开票"); /* status string Y 2 发票状态： 0：待开票； @@ -263,14 +282,23 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC 5：发票已红冲-部分； 6：开票失败； */ - + // 更新渠道开票状态，更新下载文件 + // 开票成功 + // 更新开票状态 + EmisSettleInvoiceRecord oldApply=emisSettleInvoiceRecordMapper.selectInvoiceRecordByApplySeqNo(updRecord.getApplySeqNo()); + EmisSettleInvoiceRecord newApply = new EmisSettleInvoiceRecord(); + newApply.setId(oldApply.getId()); + newApply.setInvoiceStatus(updRecord.getOpenChStatus()); + newApply.setInvoiceStatusDesc(updRecord.getOpenChStatusDesc()); + newApply.setOpenChStatus("2"); + newApply.setFilePath(updRecord.getFilePath()); + emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply); } else { updRecord.setOpenChStatus("-1"); updRecord.setOpenChStatusDesc(item0.getString("returnStatusMsg")); } emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(updRecord); - } } diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml index fce599cd6..d91a20ea8 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml @@ -123,6 +123,12 @@ where a.settle_bill_no = #{settleBillNo} + +