随单购月卡下单

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

@@ -380,7 +380,8 @@ public class OrderSdkAdapter {
                 //老订单服务 1=配送费;3=包装费
                 if (QueryOrderAccountType.DELIVERY_AMOUNT.equals(accountRequest.getAccountType())
                         || QueryOrderAccountType.PACK_AMOUNT.equals(accountRequest.getAccountType())
-                        || QueryOrderAccountType.CARD_ORIGINAL_AMOUNT.equals(accountRequest.getAccountType())) {
+                        || QueryOrderAccountType.CARD_ORIGINAL_AMOUNT.equals(accountRequest.getAccountType())
+                        || QueryOrderAccountType.MCCAFE_MONTH_CARD.equals(accountRequest.getAccountType())) {
                     OrderCostCreateReq orderCostCreateReq = new OrderCostCreateReq();
                     orderCostCreateReq.setCostName(accountRequest.getName());
                     //新订单服务  1=包装费,2=运费,3=餐盒单价,4=餐盒数量
@@ -434,6 +435,9 @@ public class OrderSdkAdapter {
             case "CARD_ORIGINAL_AMOUNT":
                 type = 5;
                 break;
+            case "MCCAFE_MONTH_CARD":
+                type = 10;
+                break;
             default:
                 break;
         }

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

@@ -38,7 +38,9 @@ public enum QueryOrderAccountType {
     ONLINE_PAY("ONLINE_PAY", "线上支付"),
     FULL_DISTRIBUTION_FEE("FULL_DISTRIBUTION_FEE", "满减配送费"),
     OFFLINE_PAY("OFFLINE_PAY", "线下支付"),
-    MEMBER_PRICE_DISCOUNT("MEMBER_PRICE_DISCOUNT","会员价优惠");
+    MEMBER_PRICE_DISCOUNT("MEMBER_PRICE_DISCOUNT","会员价优惠"),
+    MCCAFE_MONTH_CARD("MCCAFE_MONTH_CARD","麦咖啡月卡"),
+    ;
     private String code;
 
     private String desc;

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

@@ -246,6 +246,16 @@ public class OrderAdapter {
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }
+        if(null != shoppingCartGoodsDto.getPayCardFee() && 0l != shoppingCartGoodsDto.getPayCardFee()) {
+            CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
+                    .accountId("")
+                    .name("麦咖啡月卡")
+                    .price(shoppingCartGoodsDto.getPayCardFee())
+                    .accountType(QueryOrderAccountType.MCCAFE_MONTH_CARD)
+                    .sequence(orderAccountIndex++)
+                    .build();
+            orderAccountDtos.add(createOrderAccountDto);
+        }
         createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
         //设置库存扣减

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

@@ -95,6 +95,11 @@ public class ShoppingCartGoodsDto {
      */
     private String discountDeliveryActivityCode;
 
+    /**
+     * 麦咖啡-咖啡月卡价格
+     */
+    private Long payCardFee;
+
     @Data
     public static class CartGoodsDetailDto {
         /**