下单购买会员卡父子订单去除

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

@@ -3873,7 +3873,7 @@ public class OrderAdapter {
         Integer serviceTime = storeResponseDto.getServiceTime();
         String sessionId = createOrderVo.getSessionId();
         String version = createOrderVo.getVersion();
-        CreateOrderVo.BuyMemberCard memberCard = createOrderVo.getBuyMemberCard();
+//        CreateOrderVo.BuyMemberCard memberCard = createOrderVo.getBuyMemberCard();
 
         String deliveryHoursDayStart = "";
         String deliveryHoursDayEnd = "";
@@ -3898,9 +3898,9 @@ public class OrderAdapter {
         orderExtInfoDto.setServiceTime(serviceTime);
         orderExtInfoDto.setPushOrderTime(0);
         orderExtInfoDto.setVersion(version);
-        if (memberCard != null && memberCard.getRuleId() != null) {
-            orderExtInfoDto.setRuleId(memberCard.getRuleId());
-        }
+//        if (memberCard != null && memberCard.getRuleId() != null) {
+//            orderExtInfoDto.setRuleId(memberCard.getRuleId());
+//        }
         // 扩展字段中存储 sessionKey
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         orderExtInfoDto.setFormId(createOrderVo.getFormId());

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -218,7 +218,8 @@ public class CreateOrderVo {
     /**
      * 会员卡信息
      */
-    private BuyMemberCard buyMemberCard;
+//    @Deprecated
+//    private BuyMemberCard buyMemberCard;
 
     /**
      * svc 卡支付使用

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

@@ -394,11 +394,11 @@ public class CheckMCCafeOrder {
 
     public ShoppingCartGoodsDto getShoppingCartGoodsDto(CreateOrderVo createOrderVo) {
         ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
-        if (createOrderVo.getBuyMemberCard() != null) {
-            buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
-            buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
-            buyMemberCard.setRuleId(createOrderVo.getBuyMemberCard().getRuleId());
-        }
+//        if (createOrderVo.getBuyMemberCard() != null) {
+//            buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
+//            buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
+//            buyMemberCard.setRuleId(createOrderVo.getBuyMemberCard().getRuleId());
+//        }
         ShoppingCartInfoRequestVo shoppingCartInfoRequestVo = ShoppingCartInfoRequestVo.builder()
                 .partnerId(createOrderVo.getPartnerId())
                 .shopId(createOrderVo.getShopId())

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

@@ -755,11 +755,11 @@ public class CheckOrder {
 
     public ShoppingCartGoodsDto getShoppingCartGoodsDto(CreateOrderVo createOrderVo) {
         ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = null;
-        if (createOrderVo.getBuyMemberCard() != null) {
-            buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
-            buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
-            buyMemberCard.setRuleId(createOrderVo.getBuyMemberCard().getRuleId());
-        }
+//        if (createOrderVo.getBuyMemberCard() != null) {
+//            buyMemberCard = new ShoppingCartInfoRequestVo.BuyMemberCard();
+//            buyMemberCard.setPaidId(createOrderVo.getBuyMemberCard().getPaidId());
+//            buyMemberCard.setRuleId(createOrderVo.getBuyMemberCard().getRuleId());
+//        }
         ShoppingCartInfoRequestVo shoppingCartInfoRequestVo = ShoppingCartInfoRequestVo.builder()
                 .partnerId(createOrderVo.getPartnerId())
                 .shopId(createOrderVo.getShopId())

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

@@ -902,7 +902,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         Integer serviceTime = storeResponseDto.getServiceTime();
         String sessionId = createOrderVo.getSessionId();
         String version = createOrderVo.getVersion();
-        CreateOrderVo.BuyMemberCard memberCard = createOrderVo.getBuyMemberCard();
+//        CreateOrderVo.BuyMemberCard memberCard = createOrderVo.getBuyMemberCard();
 
         String deliveryHoursDayStart = "";
         String deliveryHoursDayEnd = "";
@@ -926,9 +926,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         orderExtInfoDto.setServiceTime(serviceTime);
         orderExtInfoDto.setPushOrderTime(pushOrderTime);
         orderExtInfoDto.setVersion(version);
-        if (memberCard != null && memberCard.getRuleId() != null) {
-            orderExtInfoDto.setRuleId(memberCard.getRuleId());
-        }
+//        if (memberCard != null && memberCard.getRuleId() != null) {
+//            orderExtInfoDto.setRuleId(memberCard.getRuleId());
+//        }
         // 扩展字段中存储 sessionKey
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         orderExtInfoDto.setFormId(createOrderVo.getFormId());

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

@@ -2536,7 +2536,7 @@ public class OrderServiceImpl implements Orderservice {
         Integer serviceTime = storeResponseDto.getServiceTime();
         String sessionId = createOrderVo.getSessionId();
         String version = createOrderVo.getVersion();
-        CreateOrderVo.BuyMemberCard memberCard = createOrderVo.getBuyMemberCard();
+//        CreateOrderVo.BuyMemberCard memberCard = createOrderVo.getBuyMemberCard();
 
         String deliveryHoursDayStart = "";
         String deliveryHoursDayEnd = "";
@@ -2561,9 +2561,9 @@ public class OrderServiceImpl implements Orderservice {
         orderExtInfoDto.setServiceTime(serviceTime);
         orderExtInfoDto.setPushOrderTime(pushOrderTime);
         orderExtInfoDto.setVersion(version);
-        if (memberCard != null && memberCard.getRuleId() != null) {
-            orderExtInfoDto.setRuleId(memberCard.getRuleId());
-        }
+//        if (memberCard != null && memberCard.getRuleId() != null) {
+//            orderExtInfoDto.setRuleId(memberCard.getRuleId());
+//        }
         // 扩展字段中存储 sessionKey
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         orderExtInfoDto.setFormId(createOrderVo.getFormId());