|
|
@@ -194,7 +194,7 @@ public class WeChatPaymentMininProgramStrategyImpl implements PaymentStrategy {
|
|
|
|
|
|
String wechatOutTradeNo = orderNo;
|
|
|
StoreOrder storeOrder = storeOrderService.getOrderByOrderNo(orderNo);
|
|
|
- if (storeOrder != null && StringUtils.hasText(storeOrder.getPayTradeNo())) {
|
|
|
+ if (storeOrder != null ) {
|
|
|
if (storeOrder.getPayStatus() != null && storeOrder.getPayStatus() == 1) {
|
|
|
return R.fail("订单已支付");
|
|
|
}
|
|
|
@@ -221,8 +221,6 @@ public class WeChatPaymentMininProgramStrategyImpl implements PaymentStrategy {
|
|
|
storeOrder.setPayTradeNo(newPayTradeNo);
|
|
|
wechatOutTradeNo = newPayTradeNo;
|
|
|
log.info("未支付场景已换新微信商户单号 orderNo={}, payTradeNo={}", orderNo, newPayTradeNo);
|
|
|
- }
|
|
|
- if (storeOrder != null) {
|
|
|
storeOrder.setCouponId(couponId);
|
|
|
storeOrder.setPayUserId(payerId);
|
|
|
if (!storeOrderService.updateById(storeOrder)) {
|
