获取分销商ID

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

@@ -6,14 +6,18 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yc.ship.framework.common.exception.ServiceException;
 import com.yc.ship.framework.common.lang.Asserts;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.framework.mybatis.core.util.MyBatisUtils;
+import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.module.infra.api.config.ConfigApi;
+import com.yc.ship.module.ota.api.OtaDistributorApi;
+import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.trade.api.invoice.dto.InvoicingReqDTO;
 import com.yc.ship.module.trade.controller.admin.invoice.vo.InvoicePageReqVO;
 import com.yc.ship.module.trade.controller.admin.invoice.vo.InvoiceRespVO;
@@ -47,6 +51,8 @@ import java.util.concurrent.ExecutorService;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
+import static com.yc.ship.module.otc.enums.ErrorCodeConstants.NOT_ASSOCIATED_DISTRIBUTOR;
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
 
 
@@ -64,6 +70,8 @@ public class InvoiceServiceImpl implements InvoiceService {
     private InvoiceMapper invoiceMapper;
     @Resource
     private InvoiceGroupService invoiceGroupService;
+    @Resource
+    private OtaDistributorApi otaDistributorApi;
 
     //TODO 待完善
     @Resource
@@ -210,10 +218,14 @@ public class InvoiceServiceImpl implements InvoiceService {
 
     @Override
     public PageResult<InvoiceRespVO> getInvoicePage(InvoicePageReqVO pageReqVO) {
-        if (ThreadLocalUtil.getAgencyId() != null) {
-            pageReqVO.setAgencyId(ThreadLocalUtil.getAgencyId().toString());
+        LoginUser loginUser = getLoginUser();
+        Long distributorId;
+        DistributorRespDTO distributor = otaDistributorApi.getDistributorByLoginUserId(loginUser.getId());
+        if(distributor != null){
+            distributorId = distributor.getId();
+            pageReqVO.setAgencyId(distributorId.toString());
         }
-        Long storeId = agencyAuthUtils.getLoginStoreId();
+        Long storeId = loginUser.getStoreId();
         if (storeId != null) {
             pageReqVO.setStoreId(storeId);
         }