Merge branch 'feature/2020/09/30-20-停车上订单未支付积分回退-张志恒' into develop

# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -91,9 +91,13 @@ public class OrderCallBackMQService {
         sendWechatReportMQ(body);
         //上报发票信息
         sendInvoiceReportMQ(body);
-        //未支付超时关单，发送队列冲正积分、券码等
+        //未支付超时关单，发送队列冲正积分、券码等,停车场订单走单独逻辑
+        if (checkParkingOrders(orderInfoReqs)) {
+            revertParkingOrders(body);
+        }else{
             revert(body);
         }
+    }
 
     /**
      * 冲正库存、券码等
@@ -161,6 +165,10 @@ public class OrderCallBackMQService {
         if (ObjectUtils.equals(1, orderInfoReqs.getPayState()) || ObjectUtils.equals(NewOrderStatus.PENDING_PAYMENT.getIndex(), orderInfoReqs.getOrderState())) {
             return null;
         }
+        //停车场订单关闭状态不通知开放平台
+        if (checkParkingOrders(orderInfoReqs)) {
+            return null;
+        }
         return orderInfoReqs;
     }
 
@@ -285,4 +293,37 @@ public class OrderCallBackMQService {
             log.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),e.toString());
         }
     }
+
+    /**
+     * 冲正库存、券码等
+     * @param body
+     */
+    public void revertParkingOrders(OrderCallBackRequestVo body){
+        String orderCode=body.getOrderCode();
+        ApiLog.info("parkingOrderBackOrdersStatusChange", orderCode);
+        OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
+        requestDto.setOid(orderCode);
+        //2：未支付
+        requestDto.setOrderStatus(2);
+        try {
+            Header header = new Header(MQAction.INSERT.getAction(), "parkingOrderBackOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
+            MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
+            mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
+        } catch (Exception e) {
+            ErrorLog.errorConvertJson(this.getClass(),"parkingOrderBackOrdersStatusChange:"+orderCode,e);
+        }
+    }
+
+    /**
+     * 检查是否符合停车场订单
+     * @param orderInfoReqs
+     * @return
+     */
+    private boolean checkParkingOrders(OrderInfoReqs orderInfoReqs){
+        if (orderInfoReqs.getOrderClient().equals(OrderClientType.PARKING.getIndex()) && orderInfoReqs.getBizType() == 99 && orderInfoReqs.getPayState() ==3 && orderInfoReqs.getOrderState() == 7) {
+            return true;
+        }
+        return false;
+    }
+
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2260,6 +2260,41 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
+    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
+        CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
+        createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
+        createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
+        createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
+        createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
+        if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
+                || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
+            createOrderProductDemoDto.setPrice(0l);
+        } else {
+            createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
+        }
+        createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
+        createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
+        createOrderProductDemoDto.setNumber(cartGoodsDetailDto.getQty());
+        createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
+        createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
+        createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
+        createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
+        createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
+        createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
+        createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
+        createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
+        createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
+        createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
+        createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
+        createOrderProductDemoDto.setStapleFood(0);
+        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
+        createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
+        return createOrderProductDemoDto;
+    }
+
     public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, Integer productType) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());