新增 后管会员详情页面新增字段

jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java

@@ -119,12 +119,12 @@ public class OccupyOrderController extends BaseController {
             String memberId = getMemberIdByAuthorization(request);
             logger.info("查询用户: {} 是否有未支付的占桩订单", memberId);
             OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId);
-            if (orderPileOccupy != null) {
-                response = new RestApiResponse<>(ImmutableMap.of("occupyOrder", orderPileOccupy.getOccupyCode()));
+            String occupyCode = orderPileOccupy.getOccupyCode();
+            if (StringUtils.isNotBlank(occupyCode)) {
+                response = new RestApiResponse<>(ImmutableMap.of("occupyCode", occupyCode));
             }
         } catch (Exception e) {
             logger.error("查询用户是否有未支付的占桩订单 error,", e);
-            response = new RestApiResponse<>(e);
         }
         logger.info("查询用户是否有未支付的占桩订单 result:{}", response);
         return response;

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java

@@ -5,9 +5,11 @@ 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.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

@@ -267,10 +267,21 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation();
 		memberPlateNumberRelation.setMemberId(memberId);
 		List<MemberPlateNumberRelation> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
-		List<String> plateNumberList = list.stream()
-				.map(MemberPlateNumberRelation::getLicensePlateNumber)
-				.collect(Collectors.toList());
+		// List<String> plateNumberList = list.stream()
+		// 		.map(MemberPlateNumberRelation::getLicensePlateNumber)
+		// 		.collect(Collectors.toList());
+		List<String> plateNumberList = new ArrayList<>();
+		List<String> vinCodeList = new ArrayList<>();
+		for (MemberPlateNumberRelation relation : list) {
+			if (StringUtils.isNotBlank(relation.getLicensePlateNumber())) {
+				plateNumberList.add(relation.getLicensePlateNumber());
+			}
+			if (StringUtils.isNotBlank(relation.getVinCode())) {
+				vinCodeList.add(relation.getVinCode());
+			}
+		}
 		vo.setPlateNumberList(plateNumberList);
+		vo.setVinCodeList(vinCodeList);
 		return vo;
 	}
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java

@@ -66,6 +66,11 @@ public class MemberVO {
      */
     private List<String> plateNumberList;
 
+    /**
+     * VIN码
+     */
+    private List<String> vinCodeList;
+
     /**
      * 头像地址
      */

jsowell-ui/src/views/member/info/detail.vue

@@ -41,6 +41,9 @@
                     @click="handleDelete(item)"
                   >删除</el-button>
                 </el-descriptions-item>
+                <el-descriptions-item label="已绑VIN码" v-for="(item,index) in vinCodeList"  :key="index">
+                  {{item}}
+                </el-descriptions-item>
                 <el-descriptions-item label="本金余额">
                   {{memberInfo.principalBalance}}
                 </el-descriptions-item>
@@ -304,6 +307,7 @@ export default {
       // 会员信息
       memberInfo: {},
       plateNumberList: [],
+      vinCodeList: [],
       // 会员个人桩列表
       personalPileInfoList: [],
       personalPileTotal: 0,
@@ -385,6 +389,7 @@ export default {
         console.log("getMemberInfo==", response);
         this.memberInfo = response.data;
         this.plateNumberList = response.data.plateNumberList;
+        this.vinCodeList = response.data.vinCodeList;
       });
     },
     // 查询会员个人桩列表