记得上下班打卡 | git大法好,push需谨慎

Commit 3644e5ee authored by 张国柄's avatar 张国柄

+下单页面添加实名、生日信息;

parent 5d1e3043
...@@ -23,7 +23,7 @@ public class AdamMemberOrderParam implements Serializable { ...@@ -23,7 +23,7 @@ public class AdamMemberOrderParam implements Serializable {
@ApiModelProperty(position = 14, required = true, value = "会员价格ID", example = "0") @ApiModelProperty(position = 14, required = true, value = "会员价格ID", example = "0")
private String memberPriceId; private String memberPriceId;
@ApiModelProperty(position = 15, required = true, value = "用户生日", example = "0") @ApiModelProperty(position = 15, required = true, value = "用户生日", example = "0")
private LocalDateTime birthday; private String birthday;
@ApiModelProperty(position = 16, required = true, value = "支付方式:ALIPAY,WEPAY,WAPALIPAY,WAPWEPAY,JSWEPAY,APPLETWEPAY,APPIAP") @ApiModelProperty(position = 16, required = true, value = "支付方式:ALIPAY,WEPAY,WAPALIPAY,WAPWEPAY,JSWEPAY,APPLETWEPAY,APPIAP")
private String payChannel; private String payChannel;
@ApiModelProperty(position = 17, required = true, value = "支付用的AuthCode") @ApiModelProperty(position = 17, required = true, value = "支付用的AuthCode")
......
...@@ -17,7 +17,9 @@ public class AdamMemberOrderPreviewVo implements Serializable { ...@@ -17,7 +17,9 @@ public class AdamMemberOrderPreviewVo implements Serializable {
@ApiModelProperty(position = 12, value = "价格详情") @ApiModelProperty(position = 12, value = "价格详情")
private AdamMemberPriceVo priceVo; private AdamMemberPriceVo priceVo;
@ApiModelProperty(position = 13, value = "是否实名[true-是]") @ApiModelProperty(position = 13, value = "是否实名[true-是]")
private Boolean realNamed; private AdamRealInfoVo realInfoVo;
@ApiModelProperty(position = 14, value = "生日")
private String birthday;
private static final AdamMemberOrderPreviewVo obj = new AdamMemberOrderPreviewVo(); private static final AdamMemberOrderPreviewVo obj = new AdamMemberOrderPreviewVo();
......
...@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult; ...@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderPreviewVo; import com.liquidnet.service.adam.dto.vo.AdamMemberOrderPreviewVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo; import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo; import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.service.IAdamMemberOrderService; import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.IAdamRealNameService; import com.liquidnet.service.adam.service.IAdamRealNameService;
...@@ -50,8 +51,12 @@ public class AdamMemberOrderController { ...@@ -50,8 +51,12 @@ public class AdamMemberOrderController {
AdamMemberOrderPreviewVo previewVo = AdamMemberOrderPreviewVo.getNew(); AdamMemberOrderPreviewVo previewVo = AdamMemberOrderPreviewVo.getNew();
previewVo.setMemberId(mno); previewVo.setMemberId(mno);
previewVo.setMemberTitle("摩登天空会员"); previewVo.setMemberTitle("摩登天空会员");
previewVo.setRealNamed(null != adamRealNameService.queryByUid(CurrentUtil.getCurrentUid())); AdamRealInfoVo realInfoVo = adamRealNameService.queryByUid(CurrentUtil.getCurrentUid());
previewVo.setRealInfoVo(realInfoVo);
previewVo.setPriceVo(adamMemberPriceService.query(mno, id)); previewVo.setPriceVo(adamMemberPriceService.query(mno, id));
AdamUserInfoVo userInfoVo = adamUserService.queryByUid(CurrentUtil.getCurrentUid());
previewVo.setBirthday(null == userInfoVo ? null : userInfoVo.getBirthday());
return ResponseDto.success(previewVo); return ResponseDto.success(previewVo);
} }
......
...@@ -136,7 +136,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe ...@@ -136,7 +136,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
String orderNo = IDGenerator.nextSnowId().toString().concat("V"); String orderNo = IDGenerator.nextSnowId().toString().concat("V");
orderVo.setOrderNo(orderNo); orderVo.setOrderNo(orderNo);
orderVo.setMemberId(memberId); orderVo.setMemberId(memberId);
orderVo.setBirthday(DateUtil.format(param.getBirthday(), DateUtil.Formatter.yyyyMMddHHmmss)); orderVo.setBirthday(param.getBirthday());
orderVo.setDays(memberPrice.getDays()); orderVo.setDays(memberPrice.getDays());
orderVo.setMemberPriceId(memberPriceId); orderVo.setMemberPriceId(memberPriceId);
orderVo.setCreatedAt(createdAt); orderVo.setCreatedAt(createdAt);
......
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