前端bug修复

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantDTO.java

@@ -152,6 +152,6 @@ public class MerchantDTO implements Serializable {
     /**
      * 商家副营业务名称
      */
-    private List<String> ancillaryBusinessName;
+    private String ancillaryBusinessName;
 
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantAuthServiceImpl.java

@@ -164,7 +164,11 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         }
         if (!CollectionUtils.isEmpty(merchantDTO.getAncillaryBusiness())){
             List<CategoryDTO> list2 = this.categoryService.listCategories(merchantDTO.getAncillaryBusiness());
-            merchantDTO.setAncillaryBusinessName(list2.stream().map(CategoryDTO::getName).collect(Collectors.toList()));
+            List<String> names = list2.stream().map(CategoryDTO::getName).collect(Collectors.toList());
+            if (names.size() > 0){
+                merchantDTO.setAncillaryBusinessName(String.join("/",names));
+            }
+
         }
         merchantAuthDTO.setMerchant(merchantDTO);
         return merchantAuthDTO;

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -852,25 +852,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         if (ObjectUtils.isEmpty(merchants)) {
             return null;
         }
-        List<Integer> statuses = new ArrayList<>();
-        if (0 == param.getStatus()){
-            statuses.add(0);
-            statuses.add(1);
-            statuses.add(2);
-            statuses.add(3);
-            statuses.add(4);
-        }else if(1 == param.getStatus()){
-            statuses.add(0);
-            statuses.add(1);
-            statuses.add(2);
-            statuses.add(3);
-        }else if (2 == param.getStatus()){
-            statuses.add(4);
-        }else{
-            statuses.add(5);
-        }
         Page<OmsOrder> page = this.lambdaQuery()
-                .in(StringUtils.notEmpty(param.getStatus()), OmsOrder::getStatus, statuses)
+                .eq(StringUtils.notEmpty(param.getStatus()), OmsOrder::getStatus, param.getStatus())
                 .in(OmsOrder::getMerchantId, merchants)
                 .eq(StringUtils.notEmpty(param.getOrderId()),OmsOrder::getId,param.getOrderId())
                 .eq(StringUtils.notEmpty(param.getOrderSn()),OmsOrder::getOrderSn,param.getOrderSn())