2 Commity 99853ead59 ... a01bc6184e

Autor SHA1 Wiadomość Data
  lishiqiang a01bc6184e 电子发票查询接口修改 2 tygodni temu
  lishiqiang c4c0ce0c23 电子发票查询接口修改 2 tygodni temu

+ 46 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/InvoiceQueryJob.java

@@ -0,0 +1,46 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.util.TenantUtils;
+import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
+import com.yc.ship.module.trade.service.insurance.InsuranceService;
+import com.yc.ship.module.trade.service.invoice.InvoiceService;
+import com.yc.ship.module.trade.service.order.TradeOrderRepositoryService;
+import com.yc.ship.module.trade.service.order.TradeOrderService;
+import com.yc.ship.module.trade.service.order.TradeVisitorService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 保险购买定时任务
+ * 1. 查询需要购买保险的订单,只有确认状态并且开航前一天才可购买保险
+ */
+@Component
+@Slf4j
+public class InvoiceQueryJob implements JobHandler {
+
+    @Resource
+    private InvoiceService invoiceService;
+    /**
+     * 执行定时任务
+     * 定时购买保险
+     */
+    @Override
+    public String execute(String param) {
+        try {
+            List<InvoiceDO> list = invoiceService.getInvoices();
+            for (InvoiceDO invoiceDO : list) {
+                invoiceService.queryGroupInvoiceUrl(invoiceDO);
+            }
+        } catch (Exception e) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> queryGroupInvoiceUrlExecute Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(e.getMessage(), e);
+        }
+        log.info(">>>>>>>>>>>>>>>>>>>>>>  queryGroupInvoiceUrlExecute End  <<<<<<<<<<<<<<<<<<<<<<");
+        return "success";
+    }
+}

+ 1 - 1
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/invoice/impl/InvoiceGroupServiceImpl.java

@@ -163,7 +163,7 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
                 if (TenantContextHolder.getTenantId() == null) {
                     TenantContextHolder.setTenantId(invoice.getTenantId());
                 }
-                String file = fileApi.createFile(Base64.decodeBase64(pdfzjls));
+                String file = fileApi.createFile(Base64.decodeBase64(pdfzjls),null,null,"application/pdf");
                 log.error("发票file=" + file);
                 invoice.setCUrl(file);
                 String sdewmurl = ddfpxx.getStr("SDEWMURL");

+ 9 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/invoice/impl/InvoiceServiceImpl.java

@@ -219,6 +219,15 @@ public class InvoiceServiceImpl implements InvoiceService {
         }
         IPage<InvoiceRespVO> iPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<InvoiceRespVO> page = invoiceMapper.queryInvoicePage(iPage, pageReqVO);
+        String downurl = configApi.getPlatformConfigValueByKey("newinvoice.downurl");
+        page.getRecords().forEach(invoice -> {
+            if(StringUtils.isNotBlank(invoice.getCUrl())) {
+                invoice.setCUrl(downurl + invoice.getCUrl());
+            }
+            if(StringUtils.isBlank(invoice.getFpSupplier())) {
+                invoice.setFpSupplier("group");
+            }
+        });
         return new PageResult<>(page.getRecords(), page.getTotal());
     }