feat:page cashier record

api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantVO.java

@@ -51,6 +51,10 @@ public class StudioMerchantVO {
   private String companyType;
   private String companyType;
 
 
   @EnumMapping(enumClass = OpenStateEnums.class)
   @EnumMapping(enumClass = OpenStateEnums.class)
+  @ApiModelProperty("开通状态")
+  private String openState;
+
+  @EnumMapping(enumClass = OpenStateEnums.class)
   @ApiModelProperty("支付宝开通状态")
   @ApiModelProperty("支付宝开通状态")
   private String aliOpenState;
   private String aliOpenState;
 
 

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

@@ -392,7 +392,7 @@ public class MerchantConvert {
   }
   }
 
 
   public static StudioMerchantVO convertStudioMerchant(PartyToMerchant relation, MerchantVO merchant,
   public static StudioMerchantVO convertStudioMerchant(PartyToMerchant relation, MerchantVO merchant,
-      SubChannelInfoDTO dto, Map<Long, String> urlMap) {
+      SubChannelInfoDTO dto, Map<Long, String> urlMap, StudioMerchantApply apply) {
     Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(
     Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(
         JsonUtil.convertList(merchant.getSubChannels(), SubChannelInfo.class), dto.getSubChannels());
         JsonUtil.convertList(merchant.getSubChannels(), SubChannelInfo.class), dto.getSubChannels());
     SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
     SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
@@ -410,6 +410,7 @@ public class MerchantConvert {
         .merchantNo(merchant.getMerchantNo())
         .merchantNo(merchant.getMerchantNo())
         .merchantName(merchant.getMerchantName())
         .merchantName(merchant.getMerchantName())
         .shortName(merchant.getShortName())
         .shortName(merchant.getShortName())
+        .openState(apply.getOpenState())
         .companyType(merchant.getCompanyType())
         .companyType(merchant.getCompanyType())
         .aliOpenState(Optional.ofNullable(ali.getState()).map(Enum::name).orElse(null))
         .aliOpenState(Optional.ofNullable(ali.getState()).map(Enum::name).orElse(null))
         .aliAuthState(aliAuthState)
         .aliAuthState(aliAuthState)

service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java

@@ -185,7 +185,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
         relation.getMerchantId());
         relation.getMerchantId());
     Map<Long, String> urlMap = resourceRpcService.getResourceUrlMap(apply.getBrandId(), resourceIds);
     Map<Long, String> urlMap = resourceRpcService.getResourceUrlMap(apply.getBrandId(), resourceIds);
     return MerchantConvert.convertStudioMerchant(relation, merchant,
     return MerchantConvert.convertStudioMerchant(relation, merchant,
-        configService.getDefaultBrandSubChannelInfo(), urlMap);
+        configService.getDefaultBrandSubChannelInfo(), urlMap, apply);
   }
   }
 
 
   @Override
   @Override