fix 修复是否开启推广员

xyzc-start/src/main/java/com/xyzc/start/controller/UserInfoController.java

@@ -52,6 +52,18 @@ public class UserInfoController {
         return Result.ok(baseUserVo);
     }
 
+    /**
+     * 获取会员卡使用详情
+     * @param cardId 会员卡id
+     * @param useDetailId 会员卡使用详情id
+     */
+    @GetMapping("/cardUseDetail/{cardId}")
+    public Result<BaseUserVo> cardUseDetail(@PathVariable("cardId") Long cardId, Long useDetailId) {
+        BaseUserVo baseUserVo = userInfoService.queryCardUseDetail(cardId);
+
+        return Result.ok(baseUserVo);
+    }
+
 
     /**
      * 燃料流水

xyzc-start/src/main/java/com/xyzc/start/domain/vo/BaseUserVo.java

@@ -30,6 +30,11 @@ public class BaseUserVo {
      */
     private Long userId;
 
+    /**
+     * 是否开启推广员计划，为 true ，开启
+     */
+    private Boolean isPromoter;
+
 
     /**
      * 拥有会员卡数量
@@ -65,4 +70,5 @@ public class BaseUserVo {
      * 拥有会员卡个数
      */
     private List<BaseUserMemberCardVo> memberCardVoList;
+
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/BaseUserMemberCardMapper.java

@@ -0,0 +1,10 @@
+package com.xyzc.start.mapper;
+
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.domain.vo.BaseUserMemberCardVo;
+
+public interface BaseUserMemberCardMapper  extends BaseMapperPlus<BaseUserMemberCardMapper, BaseUserMemberCardVo> {
+
+
+
+}

xyzc-start/src/main/java/com/xyzc/start/mapper/MemberCardMapper.java

@@ -23,4 +23,8 @@ public interface MemberCardMapper extends BaseMapperPlus<MemberCard, MemberCardV
      * @param schemeId 方案id
      */
     List<MemberCardVo> queryVoListBySchemeId(Long schemeId);
+
+    /**
+     *
+     */
 }

xyzc-start/src/main/java/com/xyzc/start/service/IUserInfoService.java

@@ -97,5 +97,10 @@ public interface IUserInfoService {
      */
     void collectOrCancel(BaseUserCollectBo collectBo);
 
-
+    /**
+     * 获取会员卡使用详情
+     * @param cardId
+     * @return
+     */
+    BaseUserVo queryCardUseDetail(Long cardId);
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/SchemeServiceImpl.java

@@ -50,14 +50,14 @@ public class SchemeServiceImpl implements ISchemeService {
             // collect不为空并且memberCardId不一致时新建一个list
             if (!collect.isEmpty() &&
                     !collect.get(0).getMemberCardId().equals(memberCardVo.getMemberCardId())) {
+                memberList.add(collect);
                 collect = new ArrayList<>();
             }
             // 对当前值进行处理
             memberCardVo.setSaveMoney(memberCardVo.getPrice().subtract(memberCardVo.getStrikethroughPrice()));
             collect.add(memberCardVo);
         }
-
-        // 通过会员卡id确定是否继续添加
+        memberList.add(collect);
 
         // 将会员卡列表绑定到方案中
         scheme.setMemberCardList(memberList);

xyzc-start/src/main/java/com/xyzc/start/service/impl/UserInfoServiceImpl.java

@@ -36,6 +36,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
 
     private final DrawGraphicsMapper drawGraphicsMapper;
     private final DrawModelMapper drawModelMapper;
+    private final BaseUserMemberCardMapper baseUserMemberCardMapper;
 
     /**
      * 获取当前用户信息
@@ -172,6 +173,18 @@ public class UserInfoServiceImpl implements IUserInfoService {
     }
 
     /**
+     * 查询会员卡使用详情
+     *
+     * @param cardId
+     * @return
+     */
+    @Override
+    public BaseUserVo queryCardUseDetail(Long cardId) {
+//        List<> baseUserMemberCardMapper.queryCardUseDetail(cardId);
+        return null;
+    }
+
+    /**
      * 收藏或取消收藏
      *
      * @param collectBo 收藏对象

xyzc-start/src/main/resources/mapper/WebStart/AgentConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xyzc.start.mapper.AgentConfigMapper">
+<mapper namespace="com.xyzc.start.mapper.BaseUserMemberCardMapper">
 
 
 

xyzc-start/src/main/resources/mapper/WebStart/BaseUserMemberCardMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xyzc.start.mapper.AgentConfigMapper">
+
+
+
+</mapper>

xyzc-start/src/main/resources/mapper/WebStart/SchemeMapper.xml

@@ -5,13 +5,9 @@
 <mapper namespace="com.xyzc.start.mapper.SchemeMapper">
 
 
-    <select id="queryMemberCardByMemberId" resultType="com.xyzc.start.domain.vo.MemberCardVo">
-
-    </select>
-
 
     <select id="queryFuelPackageById" resultType="com.xyzc.start.domain.vo.FuelPackageVo">
-
+        select * from xy_fuel_package where id = #{id}
     </select>