Merge remote-tracking branch 'origin/master'

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

@@ -1993,6 +1993,9 @@ public class OrderAdapter {
                 ProductVo productVo = convent2ProductVo(productBean);
                 // 套餐商品设置子商品节点
                 if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), productBean.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), productBean.getProductType())) {
+                    if(mcCafePartnerId.equals(partnerId)) {
+                        productVo.setOriginalPrice(productBean.getSalePrice() + productBean.getProductSharePrice().longValue());
+                    }
                     List<ProductVo> setMealProducts = new ArrayList<>();
                     productBean.getComboProduct().forEach(product -> {
                         if(!"无".equals(product.getSpecificationName())) {

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -246,6 +246,16 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             //回调成功，记录汇集状态
             updateDeliveryStatus(request);
             return ResponseUtil.success();
+        } else if(deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
+            AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder()
+                    .abnormalDesc(request.getRemark())
+                    .deliveryId(request.getDeliveryId())
+                    .orderCode(request.getOrderId())
+                    .partnerId(request.getPartnerId())
+                    .operator("餐道")
+                    .build();
+            orderCenterSdkService.updateDeliveryAbnormal(assortmentUpdateDeliveryAbnormalRequest);
+            return ResponseUtil.success();
         }
         return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
     }