Commit f5607562 by 吴一龙

fix StudioAxfOrderVO add 会员头像 会员性别

parent 8de51d91
package com.jiejing.fitness.finance.api.axf.vo; package com.jiejing.fitness.finance.api.axf.vo;
import com.jiejing.common.enums.GenderEnum;
import com.jiejing.fitness.enums.member.MemberStatusEnum; import com.jiejing.fitness.enums.member.MemberStatusEnum;
import com.jiejing.fitness.finance.api.axf.enums.AxfOrderSignStateEnums; import com.jiejing.fitness.finance.api.axf.enums.AxfOrderSignStateEnums;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -55,6 +56,12 @@ public class StudioAxfOrderVO { ...@@ -55,6 +56,12 @@ public class StudioAxfOrderVO {
@ApiModelProperty("会员状态") @ApiModelProperty("会员状态")
private MemberStatusEnum memberStatus; private MemberStatusEnum memberStatus;
@ApiModelProperty("会员性别")
private GenderEnum memberGender;
@ApiModelProperty("会员头像")
private String memberAvatar;
@ApiModelProperty(value = "签约状态") @ApiModelProperty(value = "签约状态")
private String signState; private String signState;
......
...@@ -632,6 +632,8 @@ public class AxfServiceImpl implements AxfService { ...@@ -632,6 +632,8 @@ public class AxfServiceImpl implements AxfService {
e.setMemberName(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getName()); e.setMemberName(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getName());
e.setMemberPhone(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getPhone()); e.setMemberPhone(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getPhone());
e.setMemberStatus(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getStatus()); e.setMemberStatus(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getStatus());
e.setMemberGender(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getGender());
e.setMemberAvatar(memberDigestVOMap.getOrDefault(e.getMemberId(), new MemberDigestVO()).getAvatar());
}); });
} }
...@@ -645,7 +647,9 @@ public class AxfServiceImpl implements AxfService { ...@@ -645,7 +647,9 @@ public class AxfServiceImpl implements AxfService {
if (null == order) { if (null == order) {
return null; return null;
} }
return AxfConvert.toVO(order); StudioAxfOrderVO studioAxfOrderVO = AxfConvert.toVO(order);
appendStudioAndMemberInfo(Lists.newArrayList(studioAxfOrderVO));
return studioAxfOrderVO;
} }
private void doOpenAxfStoreProcess(Long id) { private void doOpenAxfStoreProcess(Long id) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment