ariesy 增加判断区块链发票推送逻辑

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java

@@ -391,9 +391,6 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             String uuid = zdata1.getZFPDM() + fphm;
             //销项标识
             String xxbs = zdata1.getXXBS();
-            String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
-            //销项标识
-            String xxbs = zdata1.getXXBS();
             DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ);
             if (fplxList.contains(zdata1.getZFPLX()) && !"X".equalsIgnoreCase(xxbs)) {
                 TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
@@ -438,36 +435,19 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null, updateWrapper);
             }
-<<<<<<<<< Temporary merge branch 1
-            if ("X".equals(xxbs)){
-                DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
-                UpdateWrapper updateWrapper = new UpdateWrapper();
-                updateWrapper.set("sn_voucher_number",zdata1.getBELNR());
-                updateWrapper.set("posting_time",zdata1.getBUDAT());
-                updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7));
-                updateWrapper.set("bzdh",zdata1.getZBZDH());
-                updateWrapper.set("inaccount_status",zdata1.getZYWZT());
-                updateWrapper.set("comp_code",zdata1.getZGSDM());
-                updateWrapper.set("bzr",zdata1.getZJBRT());
-                updateWrapper.eq("uuid",uuid);
-=========
             if ("X".equalsIgnoreCase(xxbs)){
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 UpdateWrapper updateWrapper = convertRecordInvoice(zdata1,uuid);
->>>>>>>>> Temporary merge branch 2
                 tdxSaleRecordInvoiceDao.update(null,updateWrapper);
             }
-
-            if(!flag){
-                promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功!  ");
-            }
-        }
             zdataresp.setPROMSG(promsg.toString());
             zdataresp.setPROTYP("S");
             es.setZMESSAGE("处理成功");
             es.setZdata(zdataresp);
             return es;
         }
+        return es;
+    }
 
     public UpdateWrapper convertRecordInvoice(ZDATA zdata, String uuid) {
         UpdateWrapper updateWrapper = new UpdateWrapper();