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

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

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

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;
+
     /**
      * 车牌号
      */