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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -832,9 +832,13 @@ public class OrderSdkAdapter {
             }
             if (orderCostResp.getCostType() == 5) {
                 accountBean.setType(OldOrderAccountType.CARD_ORIGINAL_AMOUNT.getCode());
-            }if (orderCostResp.getCostType() == 7) {
+            }
+            if (orderCostResp.getCostType() == 7) {
                 accountBean.setType(OldOrderAccountType.DRIVER_FEE.getCode());
             }
+            if (orderCostResp.getCostType() == 10) {
+                accountBean.setType(OldOrderAccountType.WITH_ORDER_BUY_COUPON_FEE.getCode());
+            }
             accountBean.setAddInfo("");
             accountList.add(accountBean);
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -16,6 +16,7 @@ import java.util.Objects;
 
 public enum OldOrderAccountType {
 
+    OTHER(0, "其他", "OTHER"),
     DELIVERY_AMOUNT(1, "配送费", "DELIVERY_AMOUNT"),
     BUY_DISCOUNT(2, "满减优惠", "BUY_DISCOUNT"),
     PACK_AMOUNT(3, "包装费", "PACK_AMOUNT"),
@@ -24,6 +25,7 @@ public enum OldOrderAccountType {
     DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"),
     DRIVER_FEE(7, "骑手小费", "DRIVER_FEE"),
     FREIGHT_COUPON(99, "运费券", "FREIGHT_COUPON"),
+    WITH_ORDER_BUY_COUPON_FEE(10, "随单买月卡", "WITH_ORDER_BUY_COUPON_FEE"),
     DISCOUNT_AMOUNT(21, "限时折扣", "DISCOUNT_AMOUNT"),
     PREMIUM_EXCHANGE(22, "加价购", "PREMIUM_EXCHANGE"),
     SECOND_DISCOUNT(23, "第二件N折", "SECOND_DISCOUNT"),

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.dto;
 
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -196,6 +197,8 @@ public class QueryOrdersResponseDto {
 
             private AddDeliveryInfo addInfo;
 
+            private List<OrderCostResp> orderCostDetailList;
+
             /**
              * 订单操作状态(从订单操作历史表中获取)
              */

order-application-service/src/main/java/cn/freemud/entities/dto/user/SendCouponForqujiaDtoResponseDto.java

+package cn.freemud.entities.dto.user;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: SendCouponForqujiaDtoResponseDto
+ * @Package cn.freemud.entities.dto.user
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/10/12 11:20
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class SendCouponForqujiaDtoResponseDto {
+
+    private String code;
+
+    private String message;
+
+    private Integer ver;
+    private List<Result> data;
+
+    @Data
+    public final static class Result {
+
+        private String card_code;
+        private String card_id;
+        private String end_datetime;
+        private String received_time;
+        private String start_datetime;
+
+    }
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/user/SendCouponForqujiaRequestDto.java

+package cn.freemud.entities.dto.user;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: SendCouponForqujiaRequestDto
+ * @Package cn.freemud.entities.dto.user
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/10/10 17:35
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class SendCouponForqujiaRequestDto {
+
+    private String mobile;
+
+    private List<String> cardId;
+
+}

order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

@@ -290,10 +290,10 @@ public class CouponClientServiceImpl implements CouponClientService {
             return null;
         }
         List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
-                account -> (orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+                account -> (OldOrderAccountType.PRODUCT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
+                || OldOrderAccountType.COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
+                || OldOrderAccountType.DISCOUNT_COUPON.equals(OldOrderAccountType.getByCode(account.getType())
+                || OldOrderAccountType.FREIGHT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
         ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java

@@ -15,6 +15,7 @@ package cn.freemud.service.thirdparty;
 
 import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
 import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
+import cn.freemud.entities.dto.user.SendCouponForqujiaRequestDto;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,4 +29,7 @@ public interface CustomerExtendClient {
      */
     @PostMapping(value = "/customerextendservice/coupon/getCoupons")
     GetMemberCouponListResponseDto getMemberCouponListRequestDto(@RequestBody GetMemberCouponListRequestDto getMemberCouponListRequestDto);
+
+    @PostMapping(value = "/customerextendservice/qujia/b2breceiveCard")
+    GetMemberCouponListResponseDto sendCouponForqujia(@RequestBody SendCouponForqujiaRequestDto request);
 }

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);
+}