diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java index 8e77c8c6c..eac5b4737 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java @@ -5,9 +5,12 @@ import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; +@Repository public interface MemberWalletLogMapper { /** * delete by primary key diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index e3bae3c69..fddbaf5cc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -38,6 +38,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -392,6 +393,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { // totalAccountAmount = memberWalletInfo.getPrincipalBalance(); vo.setMerchantId(memberWalletInfo.getMerchantId()); } + // 计算用户注册天数 + String days = DateUtils.getPoorDays(new Date(), vo.getCreateTime()); + vo.setRegistrationDays(days); vo.setPrincipalBalance(principalBalance); vo.setGiftBalance(giftBalance); vo.setTotalAccountAmount(vo.getPrincipalBalance().add(vo.getGiftBalance())); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java index fe25f7716..21e86e289 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -64,6 +65,16 @@ public class MemberVO { */ private BigDecimal totalAccountAmount; + /** + * 注册天数 + */ + private String registrationDays; + + /** + * 创建时间 + */ + private Date createTime; + /** * 车牌号 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index b4914e2f0..5e48b11cb 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -187,7 +187,8 @@ t1.nick_name as nickName, t1.avatar_url as avatarUrl, t1.mobile_number as mobileNumber, - t1.merchant_id as merchantId + t1.merchant_id as merchantId, + t1.create_time as createTime FROM