ariesy 解决影像推送删除实名客票对应信息bug

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -87,6 +87,9 @@ public class SDNYMainProcessController extends AbstractController {
     @Resource
     private RecordInvoiceDao recordInvoiceDao;
 
+    @Resource
+    private MixedSignatureDao mixedSignatureDao;
+
     /**
      * 查验发票
      */
@@ -484,14 +487,35 @@ public class SDNYMainProcessController extends AbstractController {
                 //删除对应的影像号
                 QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
                 recordWrapper.eq("image_id", imageId);
+                BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper);
+                if(baseTDxRecordInvoice != null){
+                    log.info("TDxRecordInvoice表中匹配到数据");
                     BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
                     recordInvoice.setImageId("");
                     recordInvoice.setCompCode("");
                     baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);
 
                     R data = new R(1000, "default success");
-                data.put("data", result);
+                    data.put("data", "");
                     return ResponseEntity.ok(JSONObject.toJSONString(data));
+                }else{
+                    //删除对应的影像号
+                    QueryWrapper<TDxInvoiceReimburse> reimburseWrapper = new QueryWrapper<>();
+                    reimburseWrapper.eq("image_id", imageId);
+
+                    TDxInvoiceReimburse reimburse1 = mixedSignatureDao.selectOne(reimburseWrapper);
+                    if(reimburse1 != null){
+                        log.info("TDxInvoiceReimburse表中匹配到数据");
+                        TDxInvoiceReimburse tDxInvoiceReimburse = new TDxInvoiceReimburse();
+                        tDxInvoiceReimburse.setImageId("");
+                        tDxInvoiceReimburse.setCompCode("");
+                        mixedSignatureDao.update(tDxInvoiceReimburse, reimburseWrapper);
+                    }
+                    R data = new R(1000, "default success");
+                    data.put("data", "");
+                    return ResponseEntity.ok(JSONObject.toJSONString(data));
+
+                }
             }
         } catch (Exception exception) {
             exception.printStackTrace();

dxhy-erp/src/main/java/com/dxhy/erp/dao/MixedSignatureDao.java

@@ -0,0 +1,17 @@
+package com.dxhy.erp.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dxhy.erp.entity.TDxInvoiceReimburse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author user
+ */
+@Mapper
+public interface MixedSignatureDao extends BaseMapper<TDxInvoiceReimburse> {
+
+}

dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxInvoiceReimburse.java

@@ -80,7 +80,7 @@ public class TDxInvoiceReimburse {
     private String currency;
 
     private String snVoucherNumber;
-    private String postingTime = "";
+    private String postingTime;
     private String imageId;
     private String accountPeriod;
     private String compCode;

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -596,10 +596,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
 
             SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode);
             log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode));
+            if(orgByCompCode != null) {
                 reimburse.setGfTaxNo(orgByCompCode.getTaxno());
                 reimburse.setGfName(orgByCompCode.getTaxname());
                 reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone());
                 reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount());
+            }
 
             reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);