fix 基础用户信息修改

xyzc-common/xyzc-common-core/src/main/java/com/xyzc/common/core/exception/ErrorCode.java

@@ -48,6 +48,7 @@ public enum ErrorCode {
     DISCOUNT_NO_CONFIG(2008, "折扣未配置"),
     NO_SELECT_DATA(2009, "未查询到数据"),
 
+
     // 用户燃料不足
     SURPLUS_FUEL_NOT_ENOUGH(2300, "燃料不足"),
 
@@ -67,14 +68,11 @@ public enum ErrorCode {
     COMFYUI_INPUT_PRIMITIVE(11007, "请输入正向提示词！"),
     COMFYUI_INPUT_OPPOSITEPRIMITIVE(11008, "请输入反向提示词！！"),
     COMFYUI_INPUT_WIDTH_SIZE(11009, "请输入宽度512-2024！"),
-    COMFYUI_INPUT_HEIGHT_SIZE(11010, "请输入高度512-2024！"),
+    COMFYUI_INPUT_HEIGHT_SIZE(11010, "请输入高度512-2024！");
+
+
 
     // 5000自定义编码
-    /**
-     * 5000  表示法人姓名和身份证的错误码  -认证
-     * 5001  表示业务人员姓名和身份证的错误码 -认证
-     */
-    ;
     private final int code;
     private final String msg;
 }

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

@@ -62,6 +62,16 @@ public class UserInfoController {
         return Result.ok(baseUserMemberCardDetail);
     }
 
+    /**
+     * 指定会员卡状态
+     */
+    @GetMapping("/cardStatus/{cardId}")
+    public Result<BaseUserMemberCardVo> cardStatus(@PathVariable("cardId") Long cardId) {
+        BaseUserMemberCardVo baseUserMemberCardDetail = userInfoService.queryCardStatus(cardId);
+
+        return Result.ok(baseUserMemberCardDetail);
+    }
+
 
     /**
      * 燃料流水

xyzc-start/src/main/java/com/xyzc/start/domain/query/BaseUserCollectQuery.java

@@ -37,4 +37,9 @@ public class BaseUserCollectQuery {
     @Range(min=0, max=1, message = "传入的查询类型不正确")
     private Integer isCollect;
 
+    /**
+     * 每页条数
+     */
+    @Range(min=1, max=100, message = "传入的查询类型不正确")
+    private Integer length;
 }

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

@@ -105,4 +105,10 @@ public interface IUserInfoService {
      */
     BaseUserMemberCardVo queryCardUseDetail(Long cardId);
 
+    /**
+     * 会员卡状态
+     * @param cardId
+     * @return
+     */
+    BaseUserMemberCardVo queryCardStatus(Long cardId);
 }

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

@@ -185,6 +185,8 @@ public class UserInfoServiceImpl implements IUserInfoService {
         // todo: 目前商户是写死的
         BaseUserMemberCardVo baseUserMemberCardVo = baseUserMemberCardMapper.queryMemberCard(SecurityUser.getUserId(), cardId, 1810310843224322049L);
 
+        AssertUtils.notNull(baseUserMemberCardVo, ErrorCode.NO_SELECT_DATA);
+
         List<MemberCardUseDetail> objects = new ArrayList<>();
 
         MemberCardUseDetail memberCardUseDetail = new MemberCardUseDetail();
@@ -349,5 +351,17 @@ public class UserInfoServiceImpl implements IUserInfoService {
         // 然后扣除燃料返回成功
         baseUserMapper.updateById(baseUser);
     }
+
+    /**
+     * 查询用户会员卡状态
+     *
+     * @param cardId
+     * @return
+     */
+    @Override
+    public BaseUserMemberCardVo queryCardStatus(Long cardId) {
+        // 商户id 写死
+        return baseUserMemberCardMapper.queryMemberCard(SecurityUser.getUserId(), cardId, 1810310843224322049L);
+    }
 }
 

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

@@ -6,20 +6,20 @@
 
     <select id="queryDrawModelByBo" resultType="com.xyzc.start.domain.vo.BaseUserCollectVo">
         SELECT
-        xdm.oss_id AS pic_url,
-        xdm.model_name AS ai_model_name,
-        xdm.description AS description
+            xdm.oss_id AS pic_url,
+            xdm.model_name AS ai_model_name,
+            xdm.description AS description
         FROM
-        xy_base_user_collect xbuc
+            xy_base_user_collect xbuc
         LEFT JOIN xy_draw_model xdm ON xbuc.collect_id = xdm.id
-        WHERE
-        xbuc.base_user_id = #{baseUserId}
-        AND xbuc.id > #{bo.id}
-        AND xbuc.is_collect = #{bo.isCollect}
+        WHERE xbuc.base_user_id = #{baseUserId}
+            AND xbuc.id > #{bo.id}
+            AND xbuc.is_collect = #{bo.isCollect}
         <if test="bo.likeName != null">
             AND xdm.`model_name` LIKE CONCAT( '%',#{bo.likeName}, '%')
         </if>
         ORDER BY xbuc.use_time DESC
+        <if test=""></if>
         LIMIT 10
     </select>