diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java index 03b99001..f2538174 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderBusiness.java @@ -112,6 +112,7 @@ public enum EOrderBusiness { //复购 3,26,22,14,12,18,19,7,28,13,27,31,10,40 orderTypeList.add(EOrderType.REPURCHASE_ORDER.getValue()); + orderTypeList.add(EOrderType.MALL_ORDER.getValue()); orderTypeList.add(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()); orderTypeList.add(EOrderType.CONSUME_ORDER.getValue()); } else if (EOrderBusiness.FIRST_PURCHASE.getValue() == value) { @@ -123,6 +124,7 @@ public enum EOrderBusiness { } else if (EOrderBusiness.REPURCHASE.getValue() == value) { //复购 orderTypeList.add(EOrderType.REPURCHASE_ORDER.getValue()); + orderTypeList.add(EOrderType.MALL_ORDER.getValue()); orderTypeList.add(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()); orderTypeList.add(EOrderType.CONSUME_ORDER.getValue()); } else if (EOrderBusiness.REGISTER_ORDER.getValue() == value) { @@ -136,6 +138,7 @@ public enum EOrderBusiness { } else if (EOrderBusiness.REPURCHASE_ORDER.getValue() == value) { //复购专区 3,26,22,14,12,18,19,28,13 orderTypeList.add(EOrderType.REPURCHASE_ORDER.getValue()); + orderTypeList.add(EOrderType.MALL_ORDER.getValue()); orderTypeList.add(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()); } else if (EOrderBusiness.CONSUME_ORDER.getValue() == value) { //重销订单 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderShipment.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderShipment.java index 94572e7e..50cf082e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderShipment.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderShipment.java @@ -121,6 +121,7 @@ public enum EOrderShipment { //复购 3,26,22,14,12,18,19,7,28,13,31,10 orderTypeList.add(EOrderType.CONSUME_ORDER.getValue()); orderTypeList.add(EOrderType.REPURCHASE_ORDER.getValue()); + orderTypeList.add(EOrderType.MALL_ORDER.getValue()); orderTypeList.add(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()); orderTypeList.add(EOrderType.PICK_ORDER.getValue()); orderTypeList.add(EOrderType.CONSUME_ORDER.getValue()); @@ -133,6 +134,7 @@ public enum EOrderShipment { } else if (EOrderShipment.REPURCHASE.getValue() == value) { //复购 orderTypeList.add(EOrderType.REPURCHASE_ORDER.getValue()); + orderTypeList.add(EOrderType.MALL_ORDER.getValue()); orderTypeList.add(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()); orderTypeList.add(EOrderType.PICK_ORDER.getValue()); orderTypeList.add(EOrderType.CONSUME_ORDER.getValue()); @@ -147,6 +149,7 @@ public enum EOrderShipment { } else if (EOrderShipment.REPURCHASE_ORDER.getValue() == value) { //复购专区 3,26,22,14,12,18,19,28,13 orderTypeList.add(EOrderType.REPURCHASE_ORDER.getValue()); + orderTypeList.add(EOrderType.MALL_ORDER.getValue()); orderTypeList.add(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()); orderTypeList.add(EOrderType.CONSUME_ORDER.getValue()); } else if (EOrderShipment.CONSUME_ORDER.getValue() == value) {