问题列表分页;增加代充备注字段以及编辑接口

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsRelation.java

@@ -82,6 +82,11 @@ public class GroupsRelation extends BaseEntity {
      */
     private String rechargeErrorInfo;
 
+    /**
+     * 代充备注
+     */
+    private String rechargeRemark;
+
     /**
      * 邀请制家庭组链接
      */

netflix-dao/src/main/java/com/cyksj/model/views/GroupsRelationRechargeView.java

@@ -74,6 +74,12 @@ public class GroupsRelationRechargeView {
 	@DbField("gr.recharge_remain_num")
 	private Integer rechargeRemainNum;
 
+	/**
+	 * 代充备注
+	 */
+	@DbField("gr.recharge_remark")
+	private String rechargeRemark;
+
 	/**
 	 * 代充任务id
 	 */

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -32,7 +32,8 @@
         gpt_token = null,
         is_frozen = 0,
         unfrozen_time = null,
-        reserved_days = null
+        reserved_days = null,
+        recharge_remark = null
         where id = #{entity.id}
         <if test="expireTime != null">
             and expiry_time = #{expireTime}

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -942,6 +942,31 @@ public class GroupRelationController {
     }
 
 
+    /**
+     * 车票常见问题 分页
+     */
+    @GetMapping("/get/questions/page")
+    public Result<SearchResult<GoodsDonQaFrontView>> getTicketQuestionsPage(String participle) {
+        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+        if (StrUtil.isNotBlank(participle)) {
+            char[] charArray = participle.toCharArray();
+            StringBuilder p = new StringBuilder();
+            p.append("and (");
+            for (int i = 0; i < charArray.length; i++) {
+                char c = charArray[i];
+                p.append(String.format(" ga.problem like '%%%s%%'", c));
+                if (i != charArray.length - 1) {
+                    p.append(" or ");
+                }
+            }
+            p.append(")");
+            builder.put("p", p);
+        }
+        SearchResult<GoodsDonQaFrontView> donQaFrontViews = beanSearcher.search(GoodsDonQaFrontView.class, builder.build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(donQaFrontViews);
+    }
+
+
     /**
      * 是否首次购买车票
      */

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -317,6 +317,16 @@ public class CmsGroupRelationController {
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 
+    /**
+     * 编辑代充备注
+     */
+    @PutMapping("/set/recharge/remark")
+    public Result<String> setRechargeRemark(@RequestBody GroupsRelation relation) {
+        String rechargeRemark = relation.getRechargeRemark();
+        groupsRelationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class).set(GroupsRelation::getRechargeRemark, rechargeRemark).eq(GroupsRelation::getId, relation.getId()));
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
     /**
      * GPT代充卡密列表
      */