zhangchen 3 долоо хоног өмнө
parent
commit
2a3dda025f

+ 4 - 1
alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerClientConsultationOrderServiceImpl.java

@@ -860,7 +860,10 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
             return R.fail("订单未申请退款或已处理,无法重复处理");
         }
 
-        // 7. 根据处理动作进行相应处理
+        // 7.取消退款超时计时器
+        orderExpirationService.cancelOrderRefundTimeout(order.getOrderNumber());
+
+        // 8. 根据处理动作进行相应处理
         if (ACTION_AGREE.equals(processAction)) {
             return processAgreeRefund(order);
         } else {

+ 6 - 0
alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.math.RandomUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -72,6 +73,8 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
      */
     private static final String SYSTEM_SENDER_ID = "system";
 
+    @Value("${order.coefficients}")
+    private String coefficients;
 
     @Override
     public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderList(int pageNum, int pageSize, String orderNumber,
@@ -1427,6 +1430,9 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
 
         // 7. 记录操作结果并发送通知
         if (success) {
+            //设置订单超时退款时间
+            orderExpirationService.setOrderRefundTimeout(order.getOrderNumber(), 60 * Long.parseLong(coefficients));
+
             log.info("申请退款成功,订单ID={}, 订单编号={}, 订单状态={}, 退款状态=已申请",
                     orderId, order.getOrderNumber(), orderStatus);