diff --git a/bweb/src/main/java/com/bweb/excel/listener/ImportCompleteGasOrderReceiptListener.java b/bweb/src/main/java/com/bweb/excel/listener/ImportCompleteGasOrderReceiptListener.java index bbad51b..7ab3a62 100644 --- a/bweb/src/main/java/com/bweb/excel/listener/ImportCompleteGasOrderReceiptListener.java +++ b/bweb/src/main/java/com/bweb/excel/listener/ImportCompleteGasOrderReceiptListener.java @@ -28,25 +28,17 @@ public class ImportCompleteGasOrderReceiptListener extends AnalysisEventListener **/ @Override public void invoke(ImportCompleteGasOrderReceiptModel model, AnalysisContext analysisContext) { - if (StringUtils.isBlank(model.getApplyNo())) { - model.setErrorMessage("请填写申请单号"); - errorData.add(model); - return; + if (StringUtils.isNotBlank(model.getOrderNo())) { + // 订单开票 + BsGasOrderReceipt receipt = gasOrderReceiptService.getDetailByOrderNo(model.getOrderNo().trim(),GasOrderReceiptStatusEnum.status1); + if (receipt == null) { + //model.setErrorMessage("未找到交易单号开票申请数据"); + //errorData.add(model); + return; + } + receipt.setStatus(GasOrderReceiptStatusEnum.status2.getStatus()); + successData.add(receipt); } - // 订单开票 - BsGasOrderReceipt receipt = gasOrderReceiptService.getDetail(model.getApplyNo()); - if (receipt == null) { - model.setErrorMessage("未找到申请单号数据"); - errorData.add(model); - return; - } - if (!receipt.getStatus().equals(GasOrderReceiptStatusEnum.status1.getStatus())) { - model.setErrorMessage("开票不处于待开票状态"); - errorData.add(model); - return; - } - receipt.setStatus(GasOrderReceiptStatusEnum.status2.getStatus()); - successData.add(receipt); } /** @@ -57,7 +49,7 @@ public class ImportCompleteGasOrderReceiptListener extends AnalysisEventListener @Override public void doAfterAllAnalysed(AnalysisContext analysisContext) { if (!successData.isEmpty()) { - gasOrderReceiptService.batchInsert(successData); + gasOrderReceiptService.batchUpdate(successData); } this.successData.clear(); } diff --git a/bweb/src/main/java/com/bweb/excel/model/ImportCompleteGasOrderReceiptModel.java b/bweb/src/main/java/com/bweb/excel/model/ImportCompleteGasOrderReceiptModel.java index cdc9856..b562ee3 100644 --- a/bweb/src/main/java/com/bweb/excel/model/ImportCompleteGasOrderReceiptModel.java +++ b/bweb/src/main/java/com/bweb/excel/model/ImportCompleteGasOrderReceiptModel.java @@ -10,8 +10,8 @@ import lombok.Data; @Data public class ImportCompleteGasOrderReceiptModel { - @ExcelProperty("申请单号") - private String applyNo; + @ExcelProperty("交易单号") + private String orderNo; /** * 错误消息 */ diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderReceiptMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderReceiptMapperExt.java index 7f380db..bd0a128 100644 --- a/service/src/main/java/com/hfkj/dao/BsGasOrderReceiptMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsGasOrderReceiptMapperExt.java @@ -4,6 +4,7 @@ import com.hfkj.entity.BsGasOrderReceipt; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -12,49 +13,36 @@ import java.util.List; */ public interface BsGasOrderReceiptMapperExt { - @Insert({ + @Update({ "" }) - @Options(useGeneratedKeys=true, keyProperty="id") - void batchInsert(@Param("list") List data); + void batchUpdate(@Param("list") List data); } diff --git a/service/src/main/java/com/hfkj/service/gas/BsGasOrderReceiptService.java b/service/src/main/java/com/hfkj/service/gas/BsGasOrderReceiptService.java index fabf643..db6a9c3 100644 --- a/service/src/main/java/com/hfkj/service/gas/BsGasOrderReceiptService.java +++ b/service/src/main/java/com/hfkj/service/gas/BsGasOrderReceiptService.java @@ -1,6 +1,7 @@ package com.hfkj.service.gas; import com.hfkj.entity.BsGasOrderReceipt; +import com.hfkj.sysenum.gas.GasOrderReceiptStatusEnum; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ public interface BsGasOrderReceiptService { * 批量导入 * @param data */ - void batchInsert(List data); + void batchUpdate(List data); /** * 申请 @@ -50,6 +51,14 @@ public interface BsGasOrderReceiptService { */ BsGasOrderReceipt getDetail(String applyNo); + /** + * 查询详情 + * @param orderNo + * @param status + * @return + */ + BsGasOrderReceipt getDetailByOrderNo(String orderNo, GasOrderReceiptStatusEnum status); + /** * 查询详情 * @param orderReceiptId diff --git a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderReceiptServiceImpl.java b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderReceiptServiceImpl.java index 55a2902..6cb471d 100644 --- a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderReceiptServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderReceiptServiceImpl.java @@ -52,8 +52,8 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService { } @Override - public void batchInsert(List data) { - gasOrderReceiptMapper.batchInsert(data); + public void batchUpdate(List data) { + gasOrderReceiptMapper.batchUpdate(data); } @Override @@ -156,6 +156,21 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService { return null; } + @Override + public BsGasOrderReceipt getDetailByOrderNo(String orderNo, GasOrderReceiptStatusEnum status) { + BsGasOrderReceiptExample example = new BsGasOrderReceiptExample(); + BsGasOrderReceiptExample.Criteria criteria = example.createCriteria().andOrderNoEqualTo(orderNo); + if (status != null) { + criteria.andStatusEqualTo(status.getStatus()); + } + example.setOrderByClause("create_time desc"); + List list = gasOrderReceiptMapper.selectByExample(example); + if (!list.isEmpty()) { + return list.get(0); + } + return null; + } + @Override public BsGasOrderReceipt getDetail(Long orderReceiptId) { return gasOrderReceiptMapper.selectByPrimaryKey(orderReceiptId);