Procházet zdrojové kódy

订单更换支付方式场景适配

codingliang před 1 rokem
rodič
revize
f3a9f9039c

+ 2 - 2
src/main/java/com/sqx/modules/pay/service/impl/NewPayServiceImpl.java

@@ -72,7 +72,7 @@ public class NewPayServiceImpl implements NewPayService {
         }
 
         PayDetails payDetails = payDetailsService.getByOrderNo(dto.getOrderNo());
-        if (ObjectUtil.isNotNull(payDetails)) {
+        if (ObjectUtil.isNotNull(payDetails) && StrUtil.isNotBlank(payDetails.getRemark())) {
             // 如果在支付有效期内,则直接返回支付参数,否则提示订单超时
             LocalDateTime createTime = LocalDateTime.parse(payDetails.getCreateTime(), DTF);
 
@@ -294,7 +294,7 @@ public class NewPayServiceImpl implements NewPayService {
                 .mchId(commonInfoService.findOne(434).getValue())
                 .mchKey(commonInfoService.findOne(435).getValue())
                 // .h5Url(commonInfoService.findOne(19).getValue())
-                .h5Url("http://mprds4.natappfree.cc")
+                .h5Url("http://fwt4x5.natappfree.cc")
                 .build();
     }
 }

+ 0 - 1
src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java

@@ -105,7 +105,6 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
         payDetails.setType(dto.getPayChannel().getCode());
         payDetails.setRemark(payParam);
         payDetailsDao.insert(payDetails);
-
     }
 
     @Override