Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop

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

@@ -264,7 +264,7 @@ public class OrderAdapter {
         if(null != shoppingCartGoodsDto.getPayCardFee() && 0l != shoppingCartGoodsDto.getPayCardFee()) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId("")
-                    .name("麦咖啡月卡")
+                    .name("啡常月享卡")
                     .price(shoppingCartGoodsDto.getPayCardFee())
                     .accountType(QueryOrderAccountType.MCCAFE_MONTH_CARD)
                     .sequence(orderAccountIndex++)
@@ -1197,7 +1197,7 @@ public class OrderAdapter {
             responseVo.setOrderAccounts(convent2OrderAccountVo(ordersBean.getApportionDetails()));
             if(CollectionUtils.isNotEmpty(ordersBean.getOrderCostDetailList())) {
                 ordersBean.getOrderCostDetailList().forEach(o -> {
-                    if(o.getCostType() == 10) {
+                    if(o.getCostType() == 10 && o.getBillType() == 1) {
                         ProductVo productVo = new ProductVo();
                         productVo.setName(o.getCostName());
                         productVo.setSpuName(o.getCostName());

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

@@ -232,6 +232,14 @@ public class CreateOrderVo {
     private String invoiceTitle;
 
     /**
+     * 随单购是否购买月享卡
+     * 1:不购买，2：月卡续费，3：新购月卡
+     */
+    private String buyMonthlyCard;
+
+    private String monthlyCardCode;
+
+    /**
      * 是否使用电子风味卡,如果不为空则为使用
      */
     @Valid

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

@@ -100,6 +100,14 @@ public class ShoppingCartInfoRequestVo {
 
     private String receiveId;
 
+    /**
+     * 随单购是否购买月享卡
+     * 1:不购买，2：月卡续费，3：新购月卡
+     */
+    private String buyMonthlyCard;
+
+    private String monthlyCardCode;
+
     @Data
     public final static class SendGoods {
         /**

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

@@ -479,6 +479,8 @@ public class CheckMCCafeOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(null)
                 .menuType(createOrderVo.getMenuType())
+                .buyMonthlyCard(createOrderVo.getBuyMonthlyCard())
+                .monthlyCardCode(createOrderVo.getMonthlyCardCode())
                 .build();
         List<MCCafeCouponVo> couponCodeList = new ArrayList<>();
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {