Authored by Lixiaodi

bug修改

@@ -199,4 +199,14 @@ public class PaymentData { @@ -199,4 +199,14 @@ public class PaymentData {
199 public void setBuyerId(String buyerId) { 199 public void setBuyerId(String buyerId) {
200 this.buyerId = buyerId; 200 this.buyerId = buyerId;
201 } 201 }
  202 +
  203 + @Override
  204 + public String toString() {
  205 + return "PaymentData [orderCode=" + orderCode + ", paymentID=" + paymentID + ", totalFee=" + totalFee
  206 + + ", paymentTime=" + paymentTime + ", callbackTime=" + callbackTime + ", bankName=" + bankName
  207 + + ", bankCode=" + bankCode + ", tradeNo=" + tradeNo + ", bankBillNo=" + bankBillNo + ", uid=" + uid
  208 + + ", orderType=" + orderType + ", mchId=" + mchId + ", appId=" + appId + ", messageId=" + messageId
  209 + + ", buyerId=" + buyerId + "]";
  210 + }
  211 +
202 } 212 }
@@ -246,8 +246,7 @@ public class PaymentServiceImpl implements IPaymentService { @@ -246,8 +246,7 @@ public class PaymentServiceImpl implements IPaymentService {
246 logger.warn("paySuccess finished.order exist, orderCode is {}, type is {}", orderCode, codeMeta.getType()); 246 logger.warn("paySuccess finished.order exist, orderCode is {}, type is {}", orderCode, codeMeta.getType());
247 return; 247 return;
248 } 248 }
249 -  
250 - if (abstractOrderService.isOrderPaid(orderInfo)){ 249 + if (!abstractOrderService.isOrderWaitingPay(orderInfo)){
251 logger.warn("paySuccess finished. status has paid, orderCode is {}", orderCode); 250 logger.warn("paySuccess finished. status has paid, orderCode is {}", orderCode);
252 return; 251 return;
253 } 252 }