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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderStatusChangeRequestDto.java

@@ -24,4 +24,8 @@ public class OrderStatusChangeRequestDto {
      * 订单状态
      */
     private Integer orderStatus;
+    /**
+     * 支付状态
+     */
+    private Integer payStatus;
 }

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

@@ -1526,7 +1526,7 @@ public class OrderServiceImpl implements Orderservice {
                     return baseResponse;
                 }
                 // 删除订单 通知活动添加商品库存
-                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
+                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(),orderBean.getPayStatus());
             } else {
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
@@ -1557,7 +1557,7 @@ public class OrderServiceImpl implements Orderservice {
                 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
                 printApplyRefundSmallTicket(orderBean, orderRefundVo);
                 //发送消息，冲正券
-                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
+                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(),orderBean.getPayStatus());
             }
         }
         return ResponseUtil.success();
@@ -1640,6 +1640,25 @@ public class OrderServiceImpl implements Orderservice {
         }
     }
 
+    public void backOrdersStatusChange(String oid, Integer orderStatus,Integer payStatus) {
+        if (StringUtils.isEmpty(oid)) {
+            return;
+        }
+        ApiLog.info("backOrdersStatusChange", oid, String.valueOf(orderStatus));
+        OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
+        requestDto.setOid(oid);
+        requestDto.setPayStatus(payStatus);
+        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去打印
      *