Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -548,9 +548,6 @@ public class OrderServiceImpl implements Orderservice {
         }
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
-        log.info("调用券码核销==" + message.getTrans_id());
-        verificationCoupon(message.getTrans_id());
-        log.info("调用券码结束=="+ message.getTrans_id());
         return sendPaySuccessNoticeMessage();
     }
 
@@ -627,6 +624,9 @@ public class OrderServiceImpl implements Orderservice {
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
+                log.info("调用券码核销==" + message.getTrans_id());
+                verificationCoupon(message.getTrans_id());
+                log.info("调用券码结束=="+ message.getTrans_id());
                 return newSendPaySuccessNoticeMessage();
             } else {
                 return newSendPayFaileMessage();