拼单付款成功更新拼单购物车状态与清除普通购物车逻辑分离

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

@@ -1283,7 +1283,7 @@ public class OrderAdapter {
                 responseVo.setAfterRefundInterval(false);
             }
             //商品信息转换
-            convent2ProductVos(ordersBean.getProductList(), responseVo);
+            convent2ProductVos(ordersBean.getProductList(), responseVo,ordersBean.getCompanyId());
             responseVo.setOrderAccounts(convent2OrderAccountVo(ordersBean.getApportionDetails()));
             if(CollectionUtils.isNotEmpty(ordersBean.getOrderCostDetailList())) {
                 ordersBean.getOrderCostDetailList().forEach(o -> {
@@ -1955,7 +1955,7 @@ public class OrderAdapter {
         return orderAccountVos;
     }
 
-    public void convent2ProductVos(List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productBeans, QueryOrderResponseVo responseVo) {
+    public void convent2ProductVos(List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productBeans, QueryOrderResponseVo responseVo, String partnerId) {
         if (CollectionUtils.isEmpty(productBeans)) {
             return;
         }
@@ -3881,20 +3881,4 @@ public class OrderAdapter {
         return responseDto;
     }
 
-    public MultiOrderRefundRequest getMultiOrderPayRefundRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, Long refundId) {
-        MultiOrderRefundRequest multiQueryRequest = new MultiOrderRefundRequest();
-        multiQueryRequest.setStationId("1");
-        multiQueryRequest.setPartnerId(orderBean.getCompanyId());
-        multiQueryRequest.setStoreId(orderBean.getShopId());
-        multiQueryRequest.setFmId("");
-        multiQueryRequest.setRefundAmount(orderBean.getAmount());
-        multiQueryRequest.setRefundTradeNo(String.valueOf(refundId));
-        multiQueryRequest.setStoreId(orderBean.getShopId());
-        multiQueryRequest.setNotifyUrl(refundNotifyCallback);
-        multiQueryRequest.setVer("V1");
-        multiQueryRequest.setVer3(false);
-        multiQueryRequest.setOutOrderNo(orderBean.getOid());
-        return multiQueryRequest;
-    }
-
 }

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -135,6 +135,10 @@ public class QueryOrdersResponseDto {
              */
             private Integer orderType;
             /**
+             * 销售类型或营销活动类型 1普通订单 2秒杀订单 3推广活动 4拼单订单
+             */
+            private Byte marketingType;
+            /**
              * 取餐码
              */
             private String otherCode;

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

@@ -510,25 +510,27 @@ public class OrderServiceImpl implements Orderservice {
         takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
 
-        //TODO 清空购物车
-        NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
-        newShoppingCartClearDto.setPartnerId(partnerId);
-        newShoppingCartClearDto.setShopId(storeId);
-        newShoppingCartClearDto.setUserId(userId);
-        newShoppingCartClearDto.setAppId(wxappid);
-        newShoppingCartClearDto.setSessionId(sessionId);
-        newShoppingCartClearDto.setOperationType(1);
-        shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
-
-        // 清空拼单购物车
-        CollageOrderDto collageOrderDto = new CollageOrderDto();
-        collageOrderDto.setSessionId(StringUtils.isBlank(sessionId) ? oid : sessionId);
-        collageOrderDto.setPartnerId(partnerId);
-        collageOrderDto.setShopId(storeId);
-        collageOrderDto.setCreateCollageUserId(userId);
-        collageOrderDto.setOrderCode(oid);
-        collageOrderDto.setStatus(1);
-        shoppingCartClient.updateCollageOrder(collageOrderDto);
+        if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) {
+            // 更新拼单购物车状态
+            CollageOrderDto collageOrderDto = new CollageOrderDto();
+            collageOrderDto.setSessionId(StringUtils.isBlank(sessionId) ? oid : sessionId);
+            collageOrderDto.setPartnerId(partnerId);
+            collageOrderDto.setShopId(storeId);
+            collageOrderDto.setCreateCollageUserId(userId);
+            collageOrderDto.setOrderCode(oid);
+            collageOrderDto.setStatus(1);
+            shoppingCartClient.updateCollageOrder(collageOrderDto);
+        } else {
+            //TODO 清空购物车
+            NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
+            newShoppingCartClearDto.setPartnerId(partnerId);
+            newShoppingCartClearDto.setShopId(storeId);
+            newShoppingCartClearDto.setUserId(userId);
+            newShoppingCartClearDto.setAppId(wxappid);
+            newShoppingCartClearDto.setSessionId(sessionId);
+            newShoppingCartClearDto.setOperationType(1);
+            shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
+        }
 
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -26,7 +26,6 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import javafx.util.Pair;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java

@@ -22,7 +22,6 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;