feat:merchant

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java

@@ -51,6 +51,7 @@ import com.jiejing.paycenter.common.model.vo.SubChannelAuthVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -555,7 +556,7 @@ public class MerchantConvert {
       List<String> studioNames = studioMap.getOrDefault(brandId, new ArrayList<>()).stream()
       List<String> studioNames = studioMap.getOrDefault(brandId, new ArrayList<>()).stream()
           .map(StudioVO::getName).collect(Collectors.toList());
           .map(StudioVO::getName).collect(Collectors.toList());
       return convertBrandMerchant(brandId, studioNames, e, dto, applyMap.get(e.getId()));
       return convertBrandMerchant(brandId, studioNames, e, dto, applyMap.get(e.getId()));
-    }).collect(Collectors.toList());
+    }).sorted(Comparator.comparing(BrandMerchantVO::getFinishTime)).collect(Collectors.toList());
   }
   }
 
 
   public static StudioMerchantApply convertBindApply(Long studioId, StudioMerchantApply apply) {
   public static StudioMerchantApply convertBindApply(Long studioId, StudioMerchantApply apply) {