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

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

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

@@ -492,6 +492,7 @@ public class OrderSdkAdapter {
                     orderCostCreateReq.setProductSeq(accountRequest.getSequence());
                     //1=订单,2=订单商品,3=售后单
                     orderCostCreateReq.setBillType(1);
+                    orderCostCreateReq.setProductId(accountRequest.getProductId());
                     orderCostCreateReqs.add(orderCostCreateReq);
                 } else {
                     OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();

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

@@ -262,13 +262,14 @@ public class OrderAdapter {
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }
-        if(null != shoppingCartGoodsDto.getPayCardFee() && 0l != shoppingCartGoodsDto.getPayCardFee()) {
+        if(null != shoppingCartGoodsDto.getPayCardFee() && 0l != shoppingCartGoodsDto.getPayCardFee() && StringUtils.isNotBlank(createOrderVo.getCardKeyCode())) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId("")
                     .name("啡常月享卡")
                     .price(shoppingCartGoodsDto.getPayCardFee())
                     .accountType(QueryOrderAccountType.MCCAFE_MONTH_CARD)
                     .sequence(orderAccountIndex++)
+                    .productId(createOrderVo.getCardKeyCode())
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }

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

@@ -200,6 +200,11 @@ public class CreateOrderVo {
      */
     private String faceCode;
 
+    /**
+     * 随单购啡常月享卡键位
+     */
+    private String cardKeyCode;
+
     @ApiModelProperty(hidden = true)
     private String sessionKey; // 存储sessionKey,异常补退使用
     @ApiModelProperty(hidden = true)