Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa

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

@@ -392,8 +392,8 @@ public class OrderServiceImpl implements Orderservice {
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
             return sendPaySuccessNoticeMessage();
         }
-        //若该订单使用了优惠券，则移除卡包,移除失败也不退款
-        couponActivityService.callbackNotify(orderBean);
+        //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
+//        couponActivityService.callbackNotify(orderBean);
         // 订单失败后 发消息重试 待实现
         String takeCode;
         String daySeq;
@@ -1633,24 +1633,6 @@ public class OrderServiceImpl implements Orderservice {
         }
     }
 
-    public void backOrdersStatusChange(String oid, Integer orderStatus,Integer payState) {
-        if (StringUtils.isEmpty(oid)) {
-            return;
-        }
-        ApiLog.info("backOrdersStatusChange", oid, String.valueOf(orderStatus));
-        OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
-        requestDto.setOid(oid);
-        requestDto.setOrderStatus(orderStatus);
-
-        try {
-            Header header = new Header(MQAction.INSERT.getAction(), "backOrdersStatusChange", oid, backOrdersChangeOrderStatusConsumerQueue);
-            MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
-            mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
-        } catch (Exception e) {
-            LogUtil.error("ActivityReverse", JSON.toJSONString(requestDto), "", e);
-        }
-    }
-
     /**
      * 发MQ去打印
      *