Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa

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

@@ -2619,6 +2619,7 @@ public class OrderSdkAdapter {
             return originalAmount;
         }
         Integer index = 1;
+        Integer comboIndex = 1;
         for (CreateOrderProductRequest productRequest : products) {
             // 普通商品 订单转换
             productRequest.setOpid(index);
@@ -2628,7 +2629,6 @@ public class OrderSdkAdapter {
                 // 父类商品productId=productId+seq
                 String parentProductId = productRequest.getProductId() + "_" + index;
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
-                    Integer comboIndex = 1;
                     for(CreateOrderProductRequest combo : productRequest.getComboProduct()) {
                         combo.setOpid(comboIndex);
                         updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, combo, partnerId, parentProductId, false);