1、修复商城订单无法支付问题

citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/framework/rpc/config/RpcConfiguration.java

@@ -19,6 +19,7 @@ import com.citu.module.promotion.api.discount.DiscountActivityApi;
 import com.citu.module.promotion.api.reward.RewardActivityApi;
 import com.citu.module.promotion.api.seckill.SeckillActivityApi;
 import com.citu.module.system.api.notify.NotifyMessageSendApi;
+import com.citu.module.system.api.social.SocialClientApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
@@ -29,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
         MemberUserApi.class, MemberPointApi.class, MemberLevelApi.class, MemberAddressApi.class, MemberConfigApi.class,
         ProductSpuApi.class, ProductSkuApi.class, ProductCommentApi.class, ProductCategoryApi.class,
         PayOrderApi.class, PayRefundApi.class,
-        NotifyMessageSendApi.class
+        NotifyMessageSendApi.class, SocialClientApi.class
 })
 public class RpcConfiguration {
 }

citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -33,6 +33,7 @@ import com.citu.module.trade.service.delivery.DeliveryExpressService;
 import com.citu.module.trade.service.order.TradeOrderQueryService;
 import com.citu.module.trade.service.order.TradeOrderUpdateService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -56,6 +57,7 @@ import static com.citu.module.trade.enums.ErrorCodeConstants.*;
 public class AfterSaleServiceImpl implements AfterSaleService {
 
     @Resource
+    @Lazy // 延迟加载，避免循环依赖
     private TradeOrderUpdateService tradeOrderUpdateService;
     @Resource
     private TradeOrderQueryService tradeOrderQueryService;

citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -74,7 +74,6 @@ import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static com.citu.module.promotion.enums.MessageTemplateConstants.WXA_ORDER_DELIVERY;
 import static com.citu.module.trade.enums.ErrorCodeConstants.*;
-
 /**
  * 交易订单【写】Service 实现类
  *
@@ -253,7 +252,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // 创建支付单，用于后续的支付
         PayOrderCreateReqDTO payOrderCreateReqDTO = TradeOrderConvert.INSTANCE.convert(
                 order, orderItems, tradeOrderProperties);
-        System.out.println(JSON.toJSONString(payOrderCreateReqDTO));
         Long payOrderId = payOrderApi.createOrder(payOrderCreateReqDTO).getCheckedData();
 
         // 更新到交易单上

citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/service/order/handler/TradeCombinationOrderHandler.java

@@ -10,6 +10,7 @@ import com.citu.module.trade.enums.order.TradeOrderStatusEnum;
 import com.citu.module.trade.enums.order.TradeOrderTypeEnum;
 import com.citu.module.trade.service.order.TradeOrderQueryService;
 import com.citu.module.trade.service.order.TradeOrderUpdateService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -28,11 +29,13 @@ import static com.citu.module.trade.enums.ErrorCodeConstants.ORDER_DELIVERY_FAIL
 public class TradeCombinationOrderHandler implements TradeOrderHandler {
 
     @Resource
+    @Lazy // 延迟加载，避免循环依赖
     private TradeOrderUpdateService orderUpdateService;
     @Resource
     private TradeOrderQueryService orderQueryService;
 
     @Resource
+    @Lazy // 延迟加载，避免循环依赖
     private CombinationRecordApi combinationRecordApi;
 
     @Override

citu-module-mall/citu-module-trade-biz/src/main/resources/application.yaml

@@ -105,10 +105,6 @@ citu:
     enable: true
     ignore-urls:
     ignore-tables:
-  error-code: # 错误码相关配置项
-    enable: false
-    constants-class-list:
-      - com.citu.module.menduner.system.enums.ErrorCodeConstants
   trade:
     order:
       pay-expire-time: 2h # 支付的过期时间