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

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

@@ -102,7 +102,9 @@ public class CouponActivityServiceImpl implements CouponActivityService {
                 try {
                     //71.券核销
                     for (int i = 2; i >= 0; i--) {
+                        LogUtil.info("核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
                         CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
+                        LogUtil.info("核销券码返回==", JSON.toJSONString(couponCodeVerificationDto), null);
                         ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
                         if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
                             LogUtil.info("CouponReverseServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));

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;
@@ -564,7 +564,9 @@ public class OrderServiceImpl implements Orderservice {
             Integer code = (Integer) jsonObject.get("code");
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
                 try {
+                    log.info("调用券码核销=="+newMessage.getTransId());
                     verificationCoupon(newMessage.getTransId());
+                    log.info("调用券码结束=="+newMessage.getTransId());
                 }catch (Exception e){
                     log.error("核销券码失败transId:"+newMessage.getTransId(),e);
                 }
@@ -1633,24 +1635,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去打印
      *