Merge remote-tracking branch 'origin/main' into main

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorServiceImpl.java

@@ -601,20 +601,18 @@ public class DistributorServiceImpl implements DistributorService {
     @Override
     public LoginTypeRespVO getLoginType() {
         AtomicReference<LoginTypeRespVO> loginType = new AtomicReference<>();
+        LoginUser loginUser = otaAuthUtils.getAgencyLoginUser();
         TenantUtils.executeIgnore(() -> {
             LoginTypeRespVO typeRespVO = null;
-            List<DistributorDO> distributorList = getDistributorsByAccountTenantId(TenantContextHolder.getTenantId());
-            if (!distributorList.isEmpty()) {
-                DistributorDO distributorDO = distributorList.stream().filter(distributor -> !distributor.getTenantId().equals(TenantContextHolder.getTenantId())).findFirst().orElse(null);
-                if (distributorDO != null) {
-                    // 旅行社端
-                    typeRespVO = new LoginTypeRespVO();
-                    typeRespVO.setType(1);
-                    typeRespVO.setDistributorId(distributorList.get(0).getId());
-                    typeRespVO.setAccountTenantId(distributorDO.getAccountTenantId());
-                    typeRespVO.setTenantId(distributorDO.getTenantId());
-                    typeRespVO.setDistributorName(distributorDO.getName());
-                }
+            DistributorDO distributorDO = getDistributorById(loginUser.getDistributorId());
+            if (distributorDO!=null) {
+                // 旅行社端
+                typeRespVO = new LoginTypeRespVO();
+                typeRespVO.setType(1);
+                typeRespVO.setDistributorId(distributorDO.getId());
+                typeRespVO.setAccountTenantId(distributorDO.getAccountTenantId());
+                typeRespVO.setTenantId(distributorDO.getTenantId());
+                typeRespVO.setDistributorName(distributorDO.getName());
             }
             loginType.set(typeRespVO);
         });

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeServiceImpl.java

@@ -3,15 +3,23 @@ package com.yc.ship.module.ota.service.distributorselfrecharge;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
 import com.yc.ship.module.ota.controller.admin.distributor.vo.LoginTypeRespVO;
 import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
 import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
 import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
+import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.distributorselfrecharge.DistributorSelfRechargeDO;
 import com.yc.ship.module.ota.dal.mysql.distributorselfrecharge.DistributorSelfRechargeMapper;
 import com.yc.ship.module.ota.service.distributor.DistributorService;
 import com.yc.ship.module.ota.service.tradelog.TradeLogService;
+import com.yc.ship.module.ota.util.OtaAuthUtils;
+import com.yc.ship.module.system.api.user.AdminUserApi;
+import com.yc.ship.module.system.api.user.dto.AdminUserRespDTO;
+import com.yc.ship.module.trade.api.dto.PayOrderReqDTO;
+import com.yc.ship.module.trade.api.dto.PayOrderRespDTO;
+import com.yc.ship.module.trade.api.trade.TradeApi;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,27 +51,99 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
     @Resource
     private TradeLogService tradeLogService;
 
+    @Resource
+    private OtaAuthUtils otaAuthUtils;
+    @Resource
+    private AdminUserApi userApi;
+
+    @Resource
+    private TradeApi tradeApi;
+
 
 
     @Override
     public DistributorSelfRechargeSimpleRespVO createDistributorSelfRecharge(DistributorSelfRechargeSaveReqVO createReqVO) {
+        LoginUser loginUser = otaAuthUtils.getAgencyLoginUser();
         LoginTypeRespVO loginType = distributorService.getLoginType();
-
         if (loginType.getType() == 3) {
-            throw exception0(11_028, "当前为平台端，不能进行自助充值操作");
+            throw exception0(11_028, "当前为平台端，不能进行自助充值删除");
         }
+        AdminUserRespDTO respDTO = userApi.getUser(loginUser.getId());
+
+        // 处理对公转账逻辑
+        if (createReqVO.getPayType() == 9) {
+            // 对公转账逻辑：仅保存数据，不调用支付接口
+            return handlePublicTransfer(createReqVO, loginType,respDTO);
+        } else {
+            // 插入
+            DistributorSelfRechargeDO distributorSelfRecharge = BeanUtils.toBean(createReqVO, DistributorSelfRechargeDO.class);
+            Long id = IdWorker.getId(distributorSelfRecharge);
+            String rechargeNo = "CZ" + id;
+            distributorSelfRecharge.setId(id);
+            distributorSelfRecharge.setDistributorId(loginType.getDistributorId());
+            distributorSelfRecharge.setRechargeState(0);
+            distributorSelfRecharge.setAccountId(respDTO.getId());
+            distributorSelfRecharge.setAccountName(respDTO.getNickname());
+            distributorSelfRecharge.setCreator(respDTO.getId().toString());
+            distributorSelfRecharge.setTenantId(loginType.getTenantId());
+
+            PayOrderReqDTO payOrderReqDTO = new PayOrderReqDTO();
+            payOrderReqDTO.setAccountId(respDTO.getId().toString());
+            payOrderReqDTO.setAccountName(respDTO.getNickname());
+            payOrderReqDTO.setPayType(distributorSelfRecharge.getPayType());
+            payOrderReqDTO.setPayAmount(distributorSelfRecharge.getMoney());
+            payOrderReqDTO.setPaySource(101);
+            payOrderReqDTO.setOrderId(id);
+            payOrderReqDTO.setPayExtraType(0);
+            PayOrderReqDTO.PayParams payParams = new PayOrderReqDTO.PayParams();
+            payParams.setSubject(loginType.getDistributorName() + "自助充值");
+            payParams.setBody(loginType.getDistributorName() + "自助充值");
+            payParams.setParam(rechargeNo);
+            payOrderReqDTO.setPayParams(payParams);
+            PayOrderRespDTO payOrderRespDTO = tradeApi.payOuterOrder(payOrderReqDTO).getCheckedData();
+            distributorSelfRecharge.setRechargeNo(payOrderRespDTO.getOrderPayId().toString());
+            TenantUtils.execute(loginType.getTenantId(), () -> {
+                distributorSelfRechargeMapper.insert(distributorSelfRecharge);
+            });
+            DistributorSelfRechargeSimpleRespVO respVO = BeanUtils.toBean(distributorSelfRecharge, DistributorSelfRechargeSimpleRespVO.class);
+            respVO.setPayPlatResult(payOrderRespDTO.getPayPlatResult());
+            return respVO;
+        }
+    }
 
-        // 插入
-        DistributorSelfRechargeDO distributorSelfRecharge = BeanUtils.toBean(createReqVO, DistributorSelfRechargeDO.class);
-        Long id = IdWorker.getId(distributorSelfRecharge);
-        distributorSelfRecharge.setId(id);
-        distributorSelfRecharge.setDistributorId(loginType.getDistributorId());
-        distributorSelfRecharge.setRechargeState(0);
-        distributorSelfRecharge.setTenantId(loginType.getTenantId());
-        TenantUtils.execute(loginType.getTenantId(), () -> {
-            distributorSelfRechargeMapper.insert(distributorSelfRecharge);
-        });
-        DistributorSelfRechargeSimpleRespVO respVO = BeanUtils.toBean(distributorSelfRecharge, DistributorSelfRechargeSimpleRespVO.class);
+    private DistributorSelfRechargeSimpleRespVO handlePublicTransfer(
+            DistributorSelfRechargeSaveReqVO createReqVO,
+            LoginTypeRespVO loginType,AdminUserRespDTO respDTO) {
+        Long distributorId = loginType.getDistributorId();
+        // 1. 校验分销商信息
+        DistributorDO distributor = distributorService.getDistributor(loginType.getDistributorId());
+        if (distributor == null || distributor.getCmbShortNo() == null) {
+            throw exception0(11_029, "未能找到对应分销商或招行短号信息");
+        }
+
+        // 2. 生成对公账号
+        String bankAccount = "717902731210902" + distributor.getCmbShortNo();
+
+        // 3. 构建充值记录对象
+        /*DistributorSelfRechargeDO rechargeDO = new DistributorSelfRechargeDO();
+        org.springframework.beans.BeanUtils.copyProperties(createReqVO, rechargeDO);
+        rechargeDO.setId(IdWorker.getId());
+        rechargeDO.setDistributorId(loginType.getDistributorId());
+        rechargeDO.setRechargeState(0); // 初始状态：待处理
+        rechargeDO.setAccountId(respDTO.getId());
+        rechargeDO.setAccountName(respDTO.getNickname());
+        rechargeDO.setCreator(respDTO.getId().toString());
+        rechargeDO.setTenantId(loginType.getTenantId());*/
+
+        // 4. 保存到数据库
+        /*TenantUtils.execute(loginType.getTenantId(), () -> {
+            distributorSelfRechargeMapper.insert(rechargeDO);
+        });*/
+
+        // 5. 构造响应
+        DistributorSelfRechargeSimpleRespVO respVO = new DistributorSelfRechargeSimpleRespVO();
+        respVO.setDistributorId(distributorId);
+        respVO.setBankAccount(bankAccount);
         return respVO;
     }
 

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

@@ -0,0 +1,18 @@
+package com.yc.ship.module.trade.api.trade;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.module.trade.api.dto.PayOrderReqDTO;
+import com.yc.ship.module.trade.api.dto.PayOrderRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+/***
+ *@return
+ */
+@Tag(name = "RPC 服务 - 交易")
+public interface TradeApi {
+
+    @Operation(summary = "充值支付")
+    CommonResult<PayOrderRespDTO> payOuterOrder(PayOrderReqDTO reqDTO);
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/api/trade/TradeApiImpl.java

@@ -0,0 +1,34 @@
+package com.yc.ship.module.trade.api.trade;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.trade.api.dto.PayOrderReqDTO;
+import com.yc.ship.module.trade.api.dto.PayOrderRespDTO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderRespVO;
+import com.yc.ship.module.trade.service.pay.impl.TradeOrderPayServiceImpl;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author ：
+ * @description：TODO
+ * @date ：2026/4/7 11:45
+ **/
+@RestController
+@Validated
+public class TradeApiImpl implements TradeApi {
+
+    @Resource
+    private TradeOrderPayServiceImpl tradeOrderPayService;
+
+
+    @Override
+    public CommonResult<PayOrderRespDTO> payOuterOrder(PayOrderReqDTO reqDTO) {
+        PayOrderReqVO payOrderReqDTO = BeanUtils.toBean(reqDTO, PayOrderReqVO.class);
+        CommonResult<PayOrderRespVO> payOrderRespVOCommonResult = tradeOrderPayService.payOuterOrder(payOrderReqDTO);
+        return CommonResult.success(BeanUtils.toBean(payOrderRespVOCommonResult.getData(), PayOrderRespDTO.class));
+    }
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/check/TradeCheckReqVO.java

@@ -1,8 +1,5 @@
 package com.yc.ship.module.trade.controller.admin.order.vo.check;
 
-import com.yc.ship.framework.common.validation.IntEnum;
-import com.yc.ship.module.trade.enums.CheckCodeTypeEnum;
-import com.yc.ship.module.trade.enums.CheckTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;