Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into…

Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into feature/20210420-华莱士公用分支-张志恒

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

@@ -994,7 +994,7 @@ public class OrderAdapter {
             if (QueryOrderStatus.ALL_BILL.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
                 queryOrdersDto.setStatus(OrderStatus.getAllCodes());
 
-                if(queryOrderDto.getMarketingType() == 2){
+                if(Objects.equals(queryOrderDto.getMarketingType().byteValue(),OrderMarketType.GROUPB.getIndex())){
                     Integer[] statuses = new Integer[]{OrderStatus.TAKE_ORDER.getCode(),OrderStatus.WAIT_PAY.getCode(), OrderStatus.RECEIPT.getCode(),
                             OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE.getCode()};
                     queryOrdersDto.setStatus(statuses);