merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -22,6 +22,8 @@ import com.zhongzheng.modules.order.service.IOrderInvoiceOrderService;
 import com.zhongzheng.modules.order.service.IOrderInvoiceService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -50,6 +52,9 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
     @Autowired
     private IOrderInvoiceOrderService iOrderInvoiceOrderService;
 
+    @Autowired
+    private ISysOldOrgService sysOldOrgService;
+
     @Autowired
     private IUserService userService;
 
@@ -143,6 +148,16 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
             }
         }
 
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = sysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>()
+                .eq(SysOldOrg::getTenantId, Long.valueOf(tenantId))
+                .eq(SysOldOrg::getStatus, 1)
+                .last("limit 1"));
+        if (ObjectUtils.isNotNull(oldOrg) && oldOrg.getOperationType() == 2){
+            //独立运营机构不需要开祥粤的发票
+            return true;
+        }
+
         //开发票
         OrderInvoiceBo invoiceBo = new OrderInvoiceBo();
         Long nowTime = DateUtils.getNowTime();

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1580,7 +1580,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (mplatformLog.getStatus() == 2) {
             //开票完成
             invoice.setInvoiceStatus(2);//已开票
-            invoice.setInvoiceImg(mplatformLog.getPdfUrl());
+            invoice.setInvoiceImg(mplatformLog.getOssPdfUrl());
             List<OrderInvoiceOrder> invoiceOrderList = iOrderInvoiceOrderService
                     .list(new LambdaQueryWrapper<OrderInvoiceOrder>().eq(OrderInvoiceOrder::getInvoiceId, invoice.getInvoiceId()));
             if (CollectionUtils.isNotEmpty(invoiceOrderList)) {