Merge branch 'freature/20200729_农工商未支付冲正积分' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -19,6 +19,7 @@ import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.entities.dto.OrderExtInfoDto;
+import cn.freemud.entities.dto.OrderStatusChangeRequestDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.WechatReportOrderDto;
 import cn.freemud.entities.vo.OrderCallBackRequestVo;
@@ -27,6 +28,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
@@ -71,6 +73,8 @@ public class OrderCallBackMQService {
     private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
     @Value("${saas.order.invoice.report.partnerIds}")
     private String invoicePartnerIds;
+    private static final String backOrdersChangeOrderStatusConsumerQueue="program.backorders_change_order_status_consumer_queue";
+    private static final String backOrdersNotifyActivityExchange="program.backorders_notify_activity_exchange";
 
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         //发送订单回调
@@ -87,6 +91,31 @@ public class OrderCallBackMQService {
         sendWechatReportMQ(body);
         //上报发票信息
         sendInvoiceReportMQ(body);
+        //未支付超时关单，发送队列冲正积分、券码等
+        revert(body);
+    }
+
+    /**
+     * 冲正库存、券码等
+     * @param body
+     */
+    public void revert(OrderCallBackRequestVo body){
+        if (ObjectUtils.notEqual(body.getDelayMsgEventType(),2)){
+            return;
+        }
+        String orderCode=body.getOrderCode();
+        ApiLog.info("backOrdersStatusChange", orderCode);
+        OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
+        requestDto.setOid(orderCode);
+        //2：未支付
+        requestDto.setOrderStatus(2);
+        try {
+            Header header = new Header(MQAction.INSERT.getAction(), "backOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
+            MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
+            mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
+        } catch (Exception e) {
+            ErrorLog.errorConvertJson(this.getClass(),"activityReverseError:"+orderCode,e);
+        }
     }
     private void sendWechatReportMQ(OrderCallBackRequestVo body) {
         try {

call-back-service/src/main/java/cn/freemud/entities/dto/OrderStatusChangeRequestDto.java

+package cn.freemud.entities.dto;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: OrderStatusChangeRequestDto
+ * @Package cn.freemud.entities.dto.user
+ * @Description:
+ * @author: bowen.hu
+ * @date: 2019-09-10 15:28
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
+ */
+@Data
+public class OrderStatusChangeRequestDto {
+    /**
+     * 订单号
+     */
+    private String oid;
+    /**
+     * 订单状态
+     */
+    private Integer orderStatus;
+}

call-back-service/src/main/java/cn/freemud/entities/vo/OrderCallBackRequestVo.java

@@ -23,7 +23,10 @@ public class OrderCallBackRequestVo {
     private String orderCode;
     // 售后单编号（operateType=2返回）
     private String afterSalesCode;
-    //延迟类型
+    /**
+     * 延迟通知类型
+     * 2 未支付超时关单
+     */
     private Integer delayMsgEventType;
     //操作类型 0= 其他信息修改，1=订单正向操作，2=订单逆向操作
     private Integer operateType;