ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ErrorCodeConstants.java

@@ -9,6 +9,7 @@ public interface ErrorCodeConstants {
     ErrorCode INVOICE_NOT_EXISTS = new ErrorCode(30_030_01, "电子发票不存在");
     ErrorCode INVOICE_LOG_NOT_EXISTS = new ErrorCode(30_030_02, "发票记录不存在");
     ErrorCode INVOICING_FAIL = new ErrorCode(30_030_03, "开票失败");
+    ErrorCode INVOICING_NOTFIND = new ErrorCode(30_030_04, "开票单位不能为空");
     ErrorCode INVOICING_ORDER_NOT_EXISTS = new ErrorCode(30_030_04, "订单不存在");
     ErrorCode ORDER_INVOICED = new ErrorCode(30_030_05, "订单已开票");
     ErrorCode ORDER_PAY_TENAND_FAIL = new ErrorCode(30_030_06, "支付失败,租户信息获取失败");

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/AdminTradeOrderServiceImpl.java

@@ -460,12 +460,11 @@ public class AdminTradeOrderServiceImpl implements AdminTradeOrderService {
             reqDTO.setTotalPrice(reqObj.getBigDecimal("totalAmount"));
             return invoiceService.applyInvoicing(reqDTO);
         }
-        LoginUser loginUser = getLoginUser();
-        CommonResult<DistributorRespDTO> distributorResult = distributorApi.getDistributorByAccountTenantId(loginUser.getTenantId());
-        if (distributorResult.isError()) {
-            throw exception(INVOICING_FAIL);
+        TradeOrderDO tradeOrderDO = tradeOrderMapper.selectByOrderNo(orderNoList.get(0));
+        DistributorRespDTO distributorRespDTO = distributorApi.getDistributorById(Long.parseLong(tradeOrderDO.getSourceId()));
+        if (distributorRespDTO==null) {
+            throw exception(INVOICING_NOTFIND);
         }
-        DistributorRespDTO distributorRespDTO = distributorResult.getCheckedData();
         InvoicingReqDTO reqDTO = InvoiceConvert.INSTANCE.convertOtc(distributorRespDTO);
         reqDTO.setOrderIdList(orderNoList);
         reqDTO.setTitleType(1);