Merge main into miao33

Made-with: Cursor

backend/crmeb-front/src/main/java/com/zbkj/front/controller/ArticleController.java

@@ -1,6 +1,5 @@
 package com.zbkj.front.controller;
 
-import com.sun.org.apache.xalan.internal.xsltc.util.IntegerArray;
 import com.zbkj.common.model.article.Article;
 import com.zbkj.common.model.category.Category;
 import com.zbkj.common.page.CommonPage;
@@ -100,7 +99,6 @@ public class ArticleController {
 
     /**
      * 更新最新一条文章的发布状态
-     * @param id Integer
      */
     @ApiOperation(value = "发布状态更新")
     @RequestMapping(value = "/changeLatestStatusTask", method = RequestMethod.GET)

backend/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java

@@ -220,11 +220,13 @@ public class UserController {
 
     /**
      * 积分记录
+     * @param type 可选，记录类型：1=收入，2=支出，不传返回全部
      */
     @ApiOperation(value = "积分记录")
     @RequestMapping(value = "/integral/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<UserIntegralRecord>> getIntegralList(@Validated PageParamRequest pageParamRequest) {
+    public CommonResult<CommonPage<UserIntegralRecord>> getIntegralList(@Validated PageParamRequest pageParamRequest,
-        return CommonResult.success(CommonPage.restPage(userCenterService.getUserIntegralRecordList(pageParamRequest)));
+                                                                       @RequestParam(required = false) Integer type) {
+        return CommonResult.success(CommonPage.restPage(userCenterService.getUserIntegralRecordList(pageParamRequest, type)));
     }
 
     /**

backend/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java

@@ -176,9 +176,10 @@ public interface UserCenterService extends IService<User> {
     /**
      * 用户积分记录列表
      * @param pageParamRequest 分页参数
+     * @param type 可选，记录类型：1=收入，2=支出，null=全部
      * @return List<UserIntegralRecord>
      */
-    List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest);
+    List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest, Integer type);
 
     /**
      * 微信app登录

backend/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java

@@ -912,12 +912,13 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
      * 用户积分记录列表
      *
      * @param pageParamRequest 分页参数
+     * @param type 可选，记录类型：1=收入，2=支出，null=全部
      * @return List<UserIntegralRecord>
      */
     @Override
-    public List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest) {
+    public List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest, Integer type) {
         Integer uid = userService.getUserIdException();
-        return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest);
+        return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest, type);
     }
 
     /**

backend/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java

@@ -62,6 +62,15 @@ public interface UserIntegralRecordService extends IService<UserIntegralRecord>
      */
     List<UserIntegralRecord> findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest);
 
+    /**
+     * H5用户积分列表（按类型筛选）
+     * @param uid 用户uid
+     * @param pageParamRequest 分页参数
+     * @param type 可选，1=收入，2=支出，null=全部
+     * @return List
+     */
+    List<UserIntegralRecord> findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest, Integer type);
+
     /**
      * 获取用户冻结的积分
      * @param uid 用户uid

backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java

@@ -217,11 +217,19 @@ public class UserIntegralRecordServiceImpl extends ServiceImpl<UserIntegralRecor
      */
     @Override
     public List<UserIntegralRecord> findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest) {
+        return findUserIntegralRecordList(uid, pageParamRequest, null);
+    }
+
+    @Override
+    public List<UserIntegralRecord> findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest, Integer type) {
         PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
         LambdaQueryWrapper<UserIntegralRecord> lqw = Wrappers.lambdaQuery();
         lqw.select(UserIntegralRecord::getId, UserIntegralRecord::getTitle, UserIntegralRecord::getType, UserIntegralRecord::getIntegral, UserIntegralRecord::getUpdateTime);
         lqw.eq(UserIntegralRecord::getUid, uid);
         lqw.eq(UserIntegralRecord::getStatus, IntegralRecordConstants.INTEGRAL_RECORD_STATUS_COMPLETE);
+        if (type != null) {
+            lqw.eq(UserIntegralRecord::getType, type);
+        }
         lqw.orderByDesc(UserIntegralRecord::getUpdateTime);
         return dao.selectList(lqw);
     }

backend/shell/start-front-miao33.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# 使用 miao33 配置启动 crmeb-front 服务（nohup 后台）
+# 端口见 application-miao33.yml：30031
+
+set -e
+BACKEND_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$BACKEND_DIR"
+JAR="$BACKEND_DIR/crmeb-front/target/miao-front-2.2.jar"
+LOG="${LOG:-$BACKEND_DIR/front-miao33.log}"
+
+if [ ! -f "$JAR" ]; then
+  echo "未找到 jar，请先执行: mvn clean package -pl crmeb-front -am -DskipTests"
+  exit 1
+fi
+
+echo "启动: nohup java -jar $JAR --spring.profiles.active=miao33 > $LOG 2>&1 &"
+nohup java -jar "$JAR" --spring.profiles.active=miao33 >> "$LOG" 2>&1 &
+echo "PID: $!"
+echo "日志: $LOG"

backend/shell/test-integral-list.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# 测试 api/front/integral/list 是否返回支出明细（type=2）
+# 用法: BASE_URL=http://localhost:8081 ./test-integral-list.sh
+#   或: ./test-integral-list.sh   (默认 BASE_URL=http://localhost:8081)
+
+set -e
+BASE="${BASE_URL:-http://localhost:8081}"
+USER="13739117991"
+PASS="123456"
+
+echo "=== 测试 integral/list 支出明细 (type=2) ==="
+echo "BASE_URL=$BASE"
+echo ""
+
+echo "1. 登录 ($USER / $PASS) ..."
+LOGIN=$(curl -s -X POST "$BASE/api/front/loginV2" \
+  -H "Content-Type: application/json" \
+  -d "{\"account\":\"$USER\",\"password\":\"$PASS\"}")
+
+if echo "$LOGIN" | grep -qE '"code":\s*(0|200)'; then
+  echo "   登录成功"
+else
+  echo "   登录失败 (若为「此账号未注册」请在本环境用已注册账号或本地起后端测试): $LOGIN"
+  exit 1
+fi
+
+TOKEN=$(echo "$LOGIN" | sed -n 's/.*"token":"\([^"]*\)".*/\1/p')
+if [ -z "$TOKEN" ]; then
+  echo "   未获取到 token"
+  exit 1
+fi
+echo "   Token: ${TOKEN:0:24}..."
+echo ""
+
+echo "2. GET api/front/integral/list?page=1&limit=20&type=2 (支出明细) ..."
+RES=$(curl -s -X GET "$BASE/api/front/integral/list?page=1&limit=20&type=2" \
+  -H "Content-Type: application/json" \
+  -H "Authori-zation: $TOKEN")
+
+echo "$RES" | head -c 800
+echo ""
+echo ""
+
+if echo "$RES" | grep -qE '"code":\s*(0|200)'; then
+  echo "3. 结果: 接口返回成功 (code=0/200)"
+  if echo "$RES" | grep -q '"list":'; then
+    echo "   data.list 已返回；带 type=2 时仅包含支出明细，见上方 JSON。"
+  fi
+  exit 0
+else
+  echo "3. 结果: 接口未成功 (需登录或 code 非 0/200)"
+  exit 1
+fi