Merge branch 'master' into pre

netflix-dao/src/main/java/com/cyksj/model/response/GptRechargeNumRecordResp.java

@@ -38,6 +38,21 @@ public class GptRechargeNumRecordResp {
      */
     private String cardKey;
 
+    /**
+     * 操作人(为空表示系统操作, 如下单/续费)
+     */
+    private String operator;
+
+    /**
+     * 次数 正为增加 负为扣除(以代码为准, 表注释写反了)
+     */
+    private Integer num;
+
+    /**
+     * 备注(下单/订单续费/自动代充/客服手动充值等)
+     */
+    private String remark;
+
     /**
      * 时间
      */

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

@@ -647,10 +647,11 @@ public class CmsGroupRelationController {
             throw BusinessRuntimeException.getInstance("用户ID不正确");
         }
 
-        // 只查需要返回的列, 不把 operator/remark 等多余字段带出来
+        // 只查需要返回的列
         LambdaQueryWrapper<GptUserRechargeNumRecord> wrapper = Wrappers.lambdaQuery(GptUserRechargeNumRecord.class)
                 .select(GptUserRechargeNumRecord::getId, GptUserRechargeNumRecord::getUserId, GptUserRechargeNumRecord::getRelationId,
-                        GptUserRechargeNumRecord::getAccount, GptUserRechargeNumRecord::getCardKey, GptUserRechargeNumRecord::getCreatedTime);
+                        GptUserRechargeNumRecord::getAccount, GptUserRechargeNumRecord::getCardKey, GptUserRechargeNumRecord::getOperator,
+                        GptUserRechargeNumRecord::getNum, GptUserRechargeNumRecord::getRemark, GptUserRechargeNumRecord::getCreatedTime);
 
         OrderDon queryOrder = null;
         if (StrUtil.isNotEmpty(orderNo)) {
@@ -698,6 +699,9 @@ public class CmsGroupRelationController {
             resp.setOrderNo(owner != null ? owner.getOrderNo() : null);
             resp.setAccount(record.getAccount());
             resp.setCardKey(record.getCardKey());
+            resp.setOperator(record.getOperator());
+            resp.setNum(record.getNum());
+            resp.setRemark(record.getRemark());
             resp.setCreatedTime(record.getCreatedTime());
             result.add(resp);
         }