Merge remote-tracking branch 'origin/2020/10/06-随单购买月享卡-huiyang' into 2020/10/06-随单购买月享卡-huiyang

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

@@ -13,8 +13,10 @@ import cn.freemud.management.service.handle.*;
 import cn.freemud.management.thirdparty.DeliveryMCCafeClient;
 import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
 import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -110,6 +112,15 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         }else {
             //支付退款
             PayRefundResponse refundResponse = paymentHandle.refund(orderManagerRequest, orderBean);
+            //随单购月卡进行卡作废
+            if (CollectionUtils.isNotEmpty(orderBean.getOrderCostDetailList())){
+                OrderCostResp orderCostResp = orderBean.getOrderCostDetailList().stream().filter(t -> 10 == t.getCostType()).findFirst().orElse(null);
+                if (orderCostResp != null){
+                    String note = orderCostResp.getNote();
+                    // todo 调用券码作废券接口
+
+                }
+            }
             //订单拒单
             saasOrderHandle.orderReject(orderManagerRequest, refundResponse, orderBean);
             //冲正库存