随单购发券对接会员接口

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

@@ -24,16 +24,26 @@ public class SendCouponForqujiaDtoResponseDto {
     private String message;
 
     private Integer ver;
-    private List<Result> data;
+    private Result data;
 
     @Data
     public final static class Result {
 
+        private List<Card> card_list;
+
+    }
+
+    @Data
+    public final static class Card {
+
         private String card_code;
         private String card_id;
-        private String end_datetime;
+        private String card_type;
+        private String card_type_code;
+        private String outer_str;
+        private String received_id;
         private String received_time;
-        private String start_datetime;
+        private String user_id;
 
     }
 

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

@@ -19,8 +19,10 @@ import java.util.List;
 @Data
 public class SendCouponForqujiaRequestDto {
 
-    private String mobile;
+    private String receivedId;
 
-    private List<String> cardId;
+    private String thirdPartyMemberId;
+
+    private List<String> cardIds;
 
 }

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

@@ -829,7 +829,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 //        }
 
         //麦咖啡随单购咖啡月卡
-        withOrderBuyCoupon(orderBean);
+        withOrderBuyCoupon(orderBean,sessionId);
 
         // 如果是到店，则冻结优惠券
         // 如果是外卖，则核销优惠券
@@ -1422,8 +1422,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
      * 随单购月卡调会员发券与更新订单使用的优惠券与买的优惠券
      * @param orderBean
      */
-    private void withOrderBuyCoupon(QueryOrdersResponseDto.DataBean.OrderBean orderBean){
-
+    private void withOrderBuyCoupon(QueryOrdersResponseDto.DataBean.OrderBean orderBean,String sessionId){
+        AssortmentCustomerInfoVo assortmentCustomerInfoVo = customerInfoManager.getCustomerInfoByObject(sessionId);
         try{
             boolean isWithOrderBuyCoupon = false;
 
@@ -1441,12 +1441,20 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
             String notBuyCouponCode = withOrderBuyCouponCode;
             String cardId = withOrderBuyCardId;
-//            SendCouponForqujiaRequestDto request = new SendCouponForqujiaRequestDto();
-//            request.setMobile(orderBean.getPhone());
-//            request.setCardId(Arrays.asList(cardId));
-//            SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request);
+            SendCouponForqujiaRequestDto request = new SendCouponForqujiaRequestDto();
+            request.setReceivedId(orderBean.getOid());
+            request.setCardIds(Arrays.asList(cardId));
+            request.setThirdPartyMemberId(assortmentCustomerInfoVo.getThirdPartyMemberID());
+            SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request);
+            if(!Objects.equals(responseDto.getCode(), ResponseResult.SUCCESS.getCode())){
+                LogUtil.error("sendCouponForqujia", JSON.toJSONString(request), JSON.toJSONString(responseDto),null);
+                return;
+            }
 
-            String buyCouponCode = "999999";
+            if(responseDto.getData() == null || CollectionUtils.isEmpty(responseDto.getData().getCard_list())){
+                return;
+            }
+            String buyCouponCode = responseDto.getData().getCard_list().get(0).getCard_code();
 
             boolean useDiscount = false;
             if(CollectionUtils.isNotEmpty(orderBean.getProductList())){

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.SendCouponForqujiaDtoResponseDto;
 import cn.freemud.entities.dto.user.SendCouponForqujiaRequestDto;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,6 @@ public interface CustomerExtendClient {
     @PostMapping(value = "/customerextendservice/coupon/getCoupons")
     GetMemberCouponListResponseDto getMemberCouponListRequestDto(@RequestBody GetMemberCouponListRequestDto getMemberCouponListRequestDto);
 
-    @PostMapping(value = "/customerextendservice/qujia/b2breceiveCard")
-    GetMemberCouponListResponseDto sendCouponForqujia(@RequestBody SendCouponForqujiaRequestDto request);
+    @PostMapping(value = "/customerextendservice/qujia/receiveCard")
+    SendCouponForqujiaDtoResponseDto sendCouponForqujia(@RequestBody SendCouponForqujiaRequestDto request);
 }