fix 退款之后作废随单购卡券

order-management/src/main/java/cn/freemud/management/entities/dto/request/customer/ForbiddenCardCodeRequest.java

+package cn.freemud.management.entities.dto.request.customer;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ForbiddenCardCodeRequest {
+
+    private String memberId;
+    private String partnerId;
+    private List<CardInfo> cardInfo;
+
+    @Data
+    public static class CardInfo {
+        private String  card_code;
+        private String  card_id;
+    }
+
+
+}

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

@@ -2,6 +2,7 @@ package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.management.entities.dto.request.customer.ForbiddenCardCodeRequest;
 import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
@@ -10,6 +11,7 @@ import cn.freemud.management.enums.OrderStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
+import cn.freemud.management.thirdparty.CustomerMcCafeClient;
 import cn.freemud.management.thirdparty.DeliveryMCCafeClient;
 import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
@@ -19,11 +21,14 @@ 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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -52,6 +57,13 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
     private StockHandle stockHandle;
     @Resource
     private DeliveryMCCafeClient deliveryMCCafeClient;
+    @Resource
+    private CustomerMcCafeClient customerMcCafeClient;
+
+    @Value("${mcCafe.partnerId}")
+    private String macCafePartnerId;
+    @Value("${mcCafe.withOrderBuy.cardId}")
+    private String macCafeCardId;
 
     @Override
     public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
@@ -117,8 +129,19 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
                 OrderCostResp orderCostResp = orderBean.getOrderCostDetailList().stream().filter(t -> 10 == t.getCostType()).findFirst().orElse(null);
                 if (orderCostResp != null){
                     String note = orderCostResp.getNote();
-                    // todo 调用券码作废券接口
-
+                    if (StringUtils.isNotEmpty(note)) {
+                        // 调用会员作废券接口
+                        ForbiddenCardCodeRequest cardCodeRequest = new ForbiddenCardCodeRequest();
+                        cardCodeRequest.setMemberId(orderBean.getUserId());
+                        cardCodeRequest.setPartnerId(macCafePartnerId);
+                        List<ForbiddenCardCodeRequest.CardInfo> list = new ArrayList<>();
+                        ForbiddenCardCodeRequest.CardInfo cardInfo = new ForbiddenCardCodeRequest.CardInfo();
+                        cardInfo.setCard_code(note);
+                        cardInfo.setCard_id(macCafeCardId);
+                        list.add(cardInfo);
+                        cardCodeRequest.setCardInfo(list);
+                        customerMcCafeClient.forbiddenCardCodeForQujia(cardCodeRequest);
+                    }
                 }
             }
             //订单拒单

order-management/src/main/java/cn/freemud/management/thirdparty/CustomerMcCafeClient.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CustomerExtendClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: song.cai
+ * @date: 2019/2/20 16:42
+ * @version V1.0
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.management.thirdparty;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.customer.ForbiddenCardCodeRequest;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@FeignClient(name = "customer-extend-service", url = "${saas.customerextendclient.feign.url}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface CustomerMcCafeClient {
+
+    @PostMapping(value = "/customerextendservice/qujia/forbiddenCardCode")
+    BaseResponse forbiddenCardCodeForQujia(@RequestBody ForbiddenCardCodeRequest request);
+}