Commit 162fc985 by chongfu.liang

Merge branch 'feature/2.0.4-集点改造' into qa

parents f42dae3d 61f4a9de
......@@ -2532,7 +2532,7 @@ public class OrderServiceImpl implements Orderservice {
orderExtInfoDto.setSendPointValidityDateDays(sendPoint.getValidityDateDays());
orderExtInfoDto.setSendPointMaxNum(sendPoint.getMaxNum());
orderExtInfoDto.setSendPointActivityCode(sendPoint.getActivityCode());
orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime());
orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime()+"");
orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
}
return orderExtInfoDto;
......
......@@ -177,7 +177,7 @@ public class OrderExtInfoDto {
private String thirdPartyMemberId;
private String sendPointActivityCode;
private Date sendPointEndTime;
private String sendPointEndTime;
private Integer sendPointSendPoint;
private Integer sendPointMaxNum;
private Integer sendPointValidityDateDays;
......
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