Merge remote-tracking branch 'origin/main'

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/vo/AppTradeOrderDetailRespVO.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.trade.controller.app.otc.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yc.ship.framework.desensitize.core.slider.annotation.MobileDesensitize;
 import com.yc.ship.framework.excel.core.annotations.DictFormat;
 import com.yc.ship.framework.excel.core.convert.DictConvert;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
@@ -139,6 +140,7 @@ public class AppTradeOrderDetailRespVO {
 
     @Schema(description = "手机号")
     @ExcelProperty("手机号")
+    @MobileDesensitize
     private String mobile;
 
     @Schema(description = "门店ID")
@@ -257,6 +259,9 @@ public class AppTradeOrderDetailRespVO {
     @Schema(description  = "待支付金额")
     private BigDecimal loadPayAmount;
 
+    @Schema(description  = "支付超时时间")
+    private Long payTimeout;
+
 
 
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -99,6 +99,7 @@ import com.yc.ship.module.trade.dal.mysql.orderpolicy.OrderPolicyMapper;
 import com.yc.ship.module.trade.dal.mysql.tradeOrderaudit.TradeOrderAuditMapper;
 import com.yc.ship.module.trade.enums.*;
 import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
+import com.yc.ship.module.trade.framework.common.ConfigUtils;
 import com.yc.ship.module.trade.framework.common.ThreadLocalUtil;
 import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
 import com.yc.ship.module.trade.framework.mq.TradePublishUtils;
@@ -256,6 +257,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Resource
     private TradePublishUtils tradePublishUtils;
 
+    @Resource
+    private ConfigUtils configUtils;
+
 
     public final static String AGENCY_LOGIN_INFO = "agencyLoginInfo";
 
@@ -2900,6 +2904,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         OrderJzDO orderJzDO = orderJzMapper.selectOne(OrderJzDO::getOrderId, orderRespNewVO.getId());
         orderRespNewVO.setOrderJz(orderJzDO);
+        // 设置支付超时时间
+        orderRespNewVO.setPayTimeout(configUtils.getPayTimeOut()*60*1000L);
         return orderRespNewVO;
     }