修改优化

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/distributor/DistributorController.java

@@ -30,6 +30,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import static com.yc.ship.framework.common.pojo.CommonResult.error;
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -90,6 +91,9 @@ public class DistributorController {
 //    @PreAuthorize("@ss.hasPermission('ota:distributor:query')")
     public CommonResult<DistributorRespVO> getDistributor(@RequestParam("id") Long id) {
         DistributorDO distributor = distributorService.getDistributor(id);
+        if(distributor==null){
+            return error(500,"分销商不存在");
+        }
         DistributorRespVO DistributorRespVO = BeanUtils.toBean(distributor, DistributorRespVO.class);
         String functions = distributor.getFunctions();
         if(StringUtils.isNoneBlank(functions)){

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -15,6 +15,7 @@ import com.yc.ship.framework.excel.core.annotations.DictFormat;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
+import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.module.product.api.dto.CategoryRespDTO;
 import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
@@ -137,6 +138,18 @@ public class OtcTradeOrderController {
         return otcTradeOrderService.getOrderById(orderId);
     }
 
+    @RequestDecryption
+    @GetMapping("/travl/getRole")
+    @Operation(summary = "win-旅行社游船订单获取")
+    @OperateLog(type = TRADE)
+    public CommonResult<?> getRole() {
+        LoginUser agencyLoginUser = agencyAuthUtils.getAgencyLoginUser();
+        if (agencyLoginUser!= null && agencyLoginUser.getDistributorId() != null) {
+            return success(1);
+        }
+        return success(2);
+    }
+
 
     @RequestDecryption
     @PostMapping("/travl/motifyOtcOrder")