围餐商品删除

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

@@ -2469,6 +2469,13 @@ public class OrderSdkAdapter {
         createOrderProductRequest.setUnit(productBean.getUnit());
         createOrderProductRequest.setId(productBean.getId());
         createOrderProductRequest.setProductType(productBean.getProductType());
+        OrderProductAddInfoDto extInfo = JSONObject.parseObject(productBean.getExtInfo(), OrderProductAddInfoDto.class);
+        if(extInfo != null) {
+            createOrderProductRequest.setIsFixedProduct(extInfo.getIsFixedProduct());
+            createOrderProductRequest.setThirdProductSpecId(extInfo.getThirdProductSpecId());
+            createOrderProductRequest.setThirdProductPropertyId(extInfo.getThirdProductPropertyId());
+        }
+
         if (productBean.getWeight() != null) {
             createOrderProductRequest.setWeight(productBean.getWeight().doubleValue());
         }

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

@@ -892,7 +892,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
 
     @Override
     public CreateOrderResponse createGroupOrder(AssortmentGroupCreateOrderRequest createOrderRequest) {
-        GroupCreateOrderRequest groupCreateOrderRequest = orderSdkAdapter.conventGroupCreateOrderRequest(createOrderRequest);
+        GroupCreateOrderRequest groupCreateOrderRequest = orderSdkAdapter.conventGroupCreateOrderRequest(
+
+
+                createOrderRequest);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> baseResponse = orderSdkService.createGroupOrder(groupCreateOrderRequest, createOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2NEWOrderInfoReqs(baseResponse);
     }
@@ -976,6 +979,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     if(createOrderProductRequest != null) {
                         createOrderProductRequest.setIsDeleted(isDeleted);
                         if(isDeleted) {
+                            if(CollectionUtils.isNotEmpty(createOrderProductRequest.getComboProduct())) {
+                                createOrderProductRequest.getComboProduct().forEach(ct -> {
+                                    ct.setIsDeleted(true);
+                                });
+                            }
                             deletedOrderProductList.add(createOrderProductRequest);
                         } else {
                             if(t.getWeight() != null && t.getWeight() > 0D) {