Merge remote-tracking branch 'origin/v2' into v2

order-service/src/main/java/com/ssy/lingxi/order/serviceimpl/PurchaseOrderServiceImpl.java

@@ -1042,6 +1042,10 @@ public class PurchaseOrderServiceImpl extends BasePurchaseOrder implements Purch
         if (request.getProductIds().size() == 1) {
             return Wrapper.success();
         }
+        //暂时写成魔法值，因为不知道枚举对应哪里
+        if(request.getOrderModel() == 32 || request.getOrderModel() == 33 || request.getOrderModel() == 34){
+            return Wrapper.success();
+        }
         Integer workFlow = tradingRulesByProductId(request.getProductIds().get(0), request.getMemberId(), request.getMemberRoleId(), request.getShopId());
         for (Long productId : request.getProductIds()) {
             if (!workFlow.equals(tradingRulesByProductId(productId, request.getMemberId(), request.getMemberRoleId(), request.getShopId()))) {