Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.4-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentSdkUpdateOrderProductInfoRequest.java

@@ -77,9 +77,10 @@ public class AssortmentSdkUpdateOrderProductInfoRequest extends BaseConfig {
      * update 表示只会更新商品，会合并相同的商品
      * updateByOrderProductDetailId 只会根据订单商品ID更新商品信息不会进行任何合并
      * deleteOrderProduct 删除订单商品
+     * updatePrePayPriceTwo 已经唤起过支付，不在进行促销计算和扣减库存
      */
     public enum OpUpdateOrderItemEnum{
-        deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct
+        deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct,updatePrePayPriceTwo
     }
     private List<CreateOrderProductRequest> orderItemList;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1130,7 +1130,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 this.syncAddProductToCache(updateOrderProductInfoRequest);
             }
             updateOrderProductInfoRequest.setOrderItemList(orderItemListByRequest);
-        } else if (AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum()) {
+        } else if (AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum()
+                ||  AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPriceTwo == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum() ) {
             orderItemListByRequest = productListByOrder.stream().map(p -> this.orderSdkAdapter.convertOrderBeanProductBean2CreateOrderProductRequest(p, updateOrderProductInfoRequest.getTrackingNo())).collect(Collectors.toList());
             if(CollectionUtils.isNotEmpty(updateOrderProductInfoRequest.getOrderItemList())) {
                 orderItemListByRequest.forEach(t -> {
@@ -1138,6 +1139,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     if(createOrderProductRequest != null) {
                         t.setTotalDiscountAmount(createOrderProductRequest.getTotalDiscountAmount());
                         t.setAccounts(createOrderProductRequest.getAccounts());
+                        if (CollectionUtils.isNotEmpty(createOrderProductRequest.getComboProduct())) {
+                            t.setComboProduct(createOrderProductRequest.getComboProduct());
+                        }
                     }
                 });
             }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.3-SNAPSHOT</version>
+            <version>2.0.4-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.5.5-RELEASE</version>
+            <version>2.5.4-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

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

@@ -2451,13 +2451,17 @@ public class OrderAdapter {
      * @return
      */
     public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingPromotionInfo(ShoppingCartGoodsResponse shoppingCartGoodsResponse, QueryOrderByIdResponse queryOrderByIdResponse,
-                                                                                   AssortmentCustomerInfoVo assortmentCustomerInfoVo, boolean isUpdateAccounts,CreateReserveOrderVo createReserveOrderVo) {
+                                                                                   AssortmentCustomerInfoVo assortmentCustomerInfoVo, boolean isUpdateAccounts,CreateReserveOrderVo createReserveOrderVo, Boolean prePayLock) {
         AssortmentSdkUpdateOrderProductInfoRequest sdkUpdateOrderProductInfoRequest = new AssortmentSdkUpdateOrderProductInfoRequest();
         sdkUpdateOrderProductInfoRequest.setStoreId(queryOrderByIdResponse.getData().getShopId());
         sdkUpdateOrderProductInfoRequest.setPartnerId(queryOrderByIdResponse.getData().getCompanyId());
         sdkUpdateOrderProductInfoRequest.setOrderCode(queryOrderByIdResponse.getData().getOid());
         sdkUpdateOrderProductInfoRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex());
-        sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice);
+        if (prePayLock){
+            sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPriceTwo);
+        }else {
+            sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice);
+        }
         sdkUpdateOrderProductInfoRequest.setThirdOrderCode(queryOrderByIdResponse.getData().getThirdOrderCode());
         sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount());
         sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount());

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

@@ -416,7 +416,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         String partnerId = createReserveOrderVo.getPartnerId();
         //SVC卡支付
         SVCCardPay(createReserveOrderVo.getCardCode(), partnerId, shoppingCartGoodsResponseVo);
-        return ResponseUtil.success();
+        return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
 
@@ -501,7 +501,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                 shoppingCartGoodsResponse = calculationDiscountService.updateDiscountApportion(orderBeanRequest, couponPromotionDto,true);
             }
             boolean isUpdateAccounts = CollectionUtils.isEmpty(queryOrderByIdResponse.getData().getAccountList());
-            AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(shoppingCartGoodsResponse, queryOrderByIdResponse, assortmentCustomerInfoVo, isUpdateAccounts,createReserveOrderVo);
+            AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(shoppingCartGoodsResponse, queryOrderByIdResponse, assortmentCustomerInfoVo, isUpdateAccounts,createReserveOrderVo, prePayLock);
             //修改订单信息
             OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
             if(baseOrderResponse == null || ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){