diff --git a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java index 2335f2d5f..9fe763cfc 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java @@ -2,6 +2,7 @@ package com.czg.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSONObject; import com.czg.EntryManager; import com.czg.PayCst; import com.czg.constant.PayChannelCst; @@ -9,12 +10,12 @@ import com.czg.dto.resp.QueryStatusResp; import com.czg.order.dto.ShopMerchantDTO; import com.czg.order.entity.ShopDirectMerchant; import com.czg.order.service.ShopMerchantService; +import com.czg.pay.AlipayAuthInfoDto; import com.czg.pay.NativeMerchantDTO; import com.czg.service.order.service.ShopDirectMerchantService; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -86,7 +87,10 @@ public class EntryManagerTask { NativeMerchantDTO nativeMerchantDTO = new NativeMerchantDTO(); nativeMerchantDTO.setWechatMerchantId(wechatMerchantId); nativeMerchantDTO.setAlipayMerchantId(alipayMerchantId); - shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO); + if (StrUtil.isNotBlank(shopDirectMerchant.getAlipayAuthInfo())) { + AlipayAuthInfoDto alipayAuthInfoDto = JSONObject.parseObject(shopDirectMerchant.getAlipayAuthInfo(), AlipayAuthInfoDto.class); + nativeMerchantDTO.setAlipayAuthInfo(alipayAuthInfoDto); + } shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO); shopMerchantService.editEntry(shopMerchantDTO, false); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java index 8d001b050..7a3ea941c 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java @@ -103,6 +103,15 @@ public class ShopMerchantServiceImpl extends ServiceImpl