Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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()));