Merge branch 'master' of http://124.220.229.80:9093/root/cif

cif-api/src/main/java/com/txz/cif/dto/AccountDTO.java

@@ -2,6 +2,7 @@ package com.txz.cif.dto;
 
 import lombok.*;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @Getter
@@ -9,7 +10,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class AccountDTO {
+public class AccountDTO implements Serializable {
     private Long id;
 
     private Long userId;

cif-api/src/main/java/com/txz/cif/service/UserDubboService.java

@@ -4,6 +4,8 @@ package com.txz.cif.service;
 import com.txz.cif.dto.Result;
 import com.txz.cif.dto.UserDTO;
 
+import java.util.List;
+
 public interface UserDubboService {
 
     /**
@@ -16,5 +18,7 @@ public interface UserDubboService {
     UserDTO getUser(Long userId);
 
     void updateLastTime(Long userId);
+    
+    List<UserDTO> getUsersByIds(List<Long> userIds);
 
 }

cif-service/src/main/java/com/txz/cif/configurer/MybatisConfigurer.java

@@ -1,50 +1,67 @@
 package com.txz.cif.configurer;
 
-import java.util.Properties;
-
-import javax.sql.DataSource;
-
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-
 import tk.mybatis.spring.mapper.MapperScannerConfigurer;
 
+import javax.sql.DataSource;
+import java.util.Properties;
+
 /**
  * Mybatis & Mapper & PageHelper 配置
  */
 @Configuration
 public class MybatisConfigurer {
-
+    
     @Bean
     public SqlSessionFactory sqlSessionFactoryBean(DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean factory = new SqlSessionFactoryBean();
+        // 使用MyBatis-Plus的SqlSessionFactoryBean以支持两个框架
+        MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean();
         factory.setDataSource(dataSource);
         factory.setTypeAliasesPackage(ProjectConstant.MODEL_PACKAGE);
-
-        //添加XML目录
+        
+        // 添加XML目录
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         factory.setMapperLocations(resolver.getResources("classpath:mapper/*.xml"));
         return factory.getObject();
     }
-
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
+    
+    @Bean("tkMapperScannerConfigurer")
+    public MapperScannerConfigurer tkMapperScannerConfigurer() {
         MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
         mapperScannerConfigurer.setSqlSessionFactoryBeanName("sqlSessionFactoryBean");
         mapperScannerConfigurer.setBasePackage(ProjectConstant.MAPPER_PACKAGE);
-
-        //配置通用Mapper，详情请查阅官方文档
+        
+        // 配置通用Mapper，详情请查阅官方文档
         Properties properties = new Properties();
         properties.setProperty("mappers", ProjectConstant.MAPPER_INTERFACE_REFERENCE);
-        properties.setProperty("notEmpty", "false");//insert、update是否判断字符串类型!='' 即 test="str != null"表达式内是否追加 and str != ''
+        properties.setProperty("notEmpty", "false");// insert、update是否判断字符串类型!='' 即 test="str != null"表达式内是否追加 and str != ''
         properties.setProperty("IDENTITY", "MYSQL");
         mapperScannerConfigurer.setProperties(properties);
-
+        
         return mapperScannerConfigurer;
     }
-
+    
+    /**
+     * MyBatis-Plus Mapper扫描配置
+     */
+    @Bean("mybatisPlusMapperScannerConfigurer")
+    public MapperScannerConfigurer mybatisPlusMapperScannerConfigurer() {
+        MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
+        mapperScannerConfigurer.setSqlSessionFactoryBeanName("sqlSessionFactoryBean");
+        // 只扫描特定包下的MyBatis-Plus Mapper
+        mapperScannerConfigurer.setBasePackage("com.txz.cif.dao");
+        
+        Properties properties = new Properties();
+        properties.setProperty("notEmpty", "false");
+        properties.setProperty("IDENTITY", "MYSQL");
+        mapperScannerConfigurer.setProperties(properties);
+        
+        return mapperScannerConfigurer;
+    }
+    
 }

cif-service/src/main/java/com/txz/cif/dao/UserMapper.java

@@ -1,7 +1,15 @@
 package com.txz.cif.dao;
 
 import com.txz.cif.core.Mapper;
+import com.txz.cif.dao.impl.UserMapperImpl;
+import com.txz.cif.dto.UserDTO;
 import com.txz.cif.model.User;
+import org.apache.ibatis.annotations.SelectProvider;
+
+import java.util.List;
 
 public interface UserMapper extends Mapper<User> {
+    
+    @SelectProvider(type = UserMapperImpl.class, method = "getUsersByIds")
+    List<UserDTO> getUsersByIds(String userIds);
 }

cif-service/src/main/java/com/txz/cif/dao/impl/UserMapperImpl.java

@@ -0,0 +1,13 @@
+package com.txz.cif.dao.impl;
+
+/**
+ * @author: MTD®️
+ * @date: 2025/8/27
+ */
+
+public class UserMapperImpl {
+    
+    public String getUsersByIds(String userIds){
+        return "select id , head_pic as headPic , name from c_user where id in (${userIds})";
+    }
+}

cif-service/src/main/java/com/txz/cif/dubbo/impl/UserDubboServiceImpl.java

@@ -1,6 +1,7 @@
 package com.txz.cif.dubbo.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.txz.cif.core.RedisUtil;
 import com.txz.cif.core.cache.CacheKey;
@@ -15,27 +16,29 @@ import org.apache.dubbo.config.annotation.DubboService;
 import org.apache.dubbo.config.annotation.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 @Slf4j
 @DubboService(timeout = 1200000)
 public class UserDubboServiceImpl implements UserDubboService {
-
+    
     @Resource
     private RedisUtil redisUtil;
-
+    
     @Resource
     private UserService userService;
-
-
-
+    
+    
     @Override
     public Result<UserDTO> validateLogin(String token) {
         CacheKey key = CacheKey.generateKey(CacheType.UserToken, token);
         Object j = redisUtil.get(key.toString());
-        if (j  != null) {
-            User user = userService.findById(Long.parseLong( j.toString()));
-            if (user != null){
-                return Result.genSuccessResult(BeanUtil.toBean(user,UserDTO.class));
+        if (j != null) {
+            User user = userService.findById(Long.parseLong(j.toString()));
+            if (user != null) {
+                return Result.genSuccessResult(BeanUtil.toBean(user, UserDTO.class));
             } else {
                 return Result.genFailResult("用户未找到");
             }
@@ -43,25 +46,33 @@ public class UserDubboServiceImpl implements UserDubboService {
             return Result.genFailResult("用户未登录");
         }
     }
-
+    
     @Override
     public UserDTO getUser(Long userId) {
         User user = userService.findById(userId);
-        if (user == null){
+        if (user == null) {
             return null;
         }
-        UserDTO userDTO =  BeanUtil.toBean(user,UserDTO.class);
+        UserDTO userDTO = BeanUtil.toBean(user, UserDTO.class);
         userDTO.setHeadPic(user.getHeadPic());
         return userDTO;
     }
-
+    
     @Override
     public void updateLastTime(Long userId) {
         User user = userService.findById(userId);
-        if (user == null){
-            return ;
+        if (user == null) {
+            return;
         }
         userService.update(User.builder().id(userId).lastLoginTime(DateUtil.date()).build());
     }
-
+    
+    @Override
+    public List<UserDTO> getUsersByIds(List<Long> userIds) {
+        if (CollectionUtil.isEmpty(userIds)) {
+            return new ArrayList<>();
+        }
+        return userService.getUsersByIds(userIds);
+    }
+    
 }

cif-service/src/main/java/com/txz/cif/model/Goods.java

@@ -6,9 +6,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Date;
-import javax.persistence.*;
 
 @Getter
 @Setter
@@ -16,78 +16,79 @@ import javax.persistence.*;
 @AllArgsConstructor
 @Builder
 
-@ApiModel(value="com.txz.cif.model.Goods")
+@ApiModel(value = "com.txz.cif.model.Goods")
 @Table(name = "c_goods")
 public class Goods {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
+    @ApiModelProperty(value = "id")
     private Integer id;
-
+    
     /**
      * 商品名称
      */
-    @ApiModelProperty(value="name商品名称")
+    @ApiModelProperty(value = "name商品名称")
     private String name;
-
+    
     /**
      * 均价说明
      */
-    @ApiModelProperty(value="intro均价说明")
+    @ApiModelProperty(value = "intro均价说明")
     private String intro;
-
+    
     /**
      * 小图
      */
-    @ApiModelProperty(value="pic小图")
+    @ApiModelProperty(value = "pic小图")
     private String pic;
-
-    @ApiModelProperty(value="折扣金额")
+    
+    @ApiModelProperty(value = "折扣金额")
     private BigDecimal discount;
-
-    @ApiModelProperty(value="折扣率")
+    
+    @ApiModelProperty(value = "折扣率")
     private BigDecimal discountRate;
-
-
+    
+    /**
+     * 渠道id
+     */
+    private Long methodId;
+    
     /**
      * 大图
      */
     @Column(name = "big_pic")
-    @ApiModelProperty(value="bigPic大图")
+    @ApiModelProperty(value = "bigPic大图")
     private String bigPic;
-
-
-
+    
+    
     /**
      * 状态 0未启用 1正常 2停用
      */
-    @ApiModelProperty(value="status状态 0未启用 1正常 2停用")
+    @ApiModelProperty(value = "status状态 0未启用 1正常 2停用")
     private Byte status;
-
+    
     /**
      * 定价
      */
-    @ApiModelProperty(value="amount定价")
+    @ApiModelProperty(value = "amount定价")
     private BigDecimal amount;
-
-
-
+    
+    
     @Column(name = "sort_num")
-    @ApiModelProperty(value="sortNum")
+    @ApiModelProperty(value = "sortNum")
     private Integer sortNum;
-
+    
     @Column(name = "create_time")
-    @ApiModelProperty(value="createTime")
+    @ApiModelProperty(value = "createTime")
     private Date createTime;
-
+    
     @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime")
+    @ApiModelProperty(value = "updateTime")
     private Date updateTime;
-
-
-
+    
+    
     public GoodsBO generator() {
-        GoodsBO bo = BeanUtil.toBean(this,GoodsBO.class);
+        GoodsBO bo = BeanUtil.toBean(this, GoodsBO.class);
         bo.setGoodsId(this.id);
         return bo;
     }

cif-service/src/main/java/com/txz/cif/model/PaymentMethod.java

@@ -2,243 +2,92 @@ package com.txz.cif.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import lombok.Data;
+
 import javax.persistence.*;
+import java.util.Date;
 
-@ApiModel(value="com.txz.cif.model.PaymentMethod")
+@ApiModel(value = "com.txz.cif.model.PaymentMethod")
 @Table(name = "c_payment_method")
+@Data
 public class PaymentMethod {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
+    @ApiModelProperty(value = "id")
     private Long id;
-
+    
     /**
      * 支付方式编码
      */
     @Column(name = "method_code")
-    @ApiModelProperty(value="methodCode支付方式编码")
+    @ApiModelProperty(value = "methodCode支付方式编码")
     private String methodCode;
-
+    
     /**
      * 支付方式名称
      */
     @Column(name = "method_name")
-    @ApiModelProperty(value="methodName支付方式名称")
+    @ApiModelProperty(value = "methodName支付方式名称")
     private String methodName;
-
-
-
+    
+    
     /**
      * 1开启 0关闭
      */
-    @ApiModelProperty(value="status1开启 0关闭")
+    @ApiModelProperty(value = "status1开启 0关闭")
     private Byte status;
-
+    
     /**
      * 创建人
      */
     @Column(name = "create_user")
-    @ApiModelProperty(value="createUser创建人")
+    @ApiModelProperty(value = "createUser创建人")
     private String createUser;
-
+    
     /**
      * 更新人
      */
     @Column(name = "update_user")
-    @ApiModelProperty(value="updateUser更新人")
+    @ApiModelProperty(value = "updateUser更新人")
     private String updateUser;
-
+    
     /**
      * 更新时间
      */
     @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
+    @ApiModelProperty(value = "updateTime更新时间")
     private Date updateTime;
-
+    
     /**
      * 创建时间
      */
     @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
+    @ApiModelProperty(value = "createTime创建时间")
     private Date createTime;
-
+    
     /**
      * 删除标识 1是0否
      */
     @Column(name = "is_valid")
-    @ApiModelProperty(value="isValid删除标识 1是0否")
+    @ApiModelProperty(value = "isValid删除标识 1是0否")
     private Byte isValid;
-
+    
     /**
      * 版本号
      */
-    @ApiModelProperty(value="version版本号")
+    @ApiModelProperty(value = "version版本号")
     private Integer version;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取支付方式编码
-     *
-     * @return method_code - 支付方式编码
-     */
-    public String getMethodCode() {
-        return methodCode;
-    }
-
-    /**
-     * 设置支付方式编码
-     *
-     * @param methodCode 支付方式编码
-     */
-    public void setMethodCode(String methodCode) {
-        this.methodCode = methodCode;
-    }
-
-    /**
-     * 获取支付方式名称
-     *
-     * @return method_name - 支付方式名称
-     */
-    public String getMethodName() {
-        return methodName;
-    }
-
-    /**
-     * 设置支付方式名称
-     *
-     * @param methodName 支付方式名称
-     */
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
+    
     /**
-     * 获取创建人
-     *
-     * @return create_user - 创建人
+     * 充值最低限额
      */
-    public String getCreateUser() {
-        return createUser;
-    }
-
+    @Column(name = "mini_price")
+    private Integer miniPrice;
+    
     /**
-     * 设置创建人
-     *
-     * @param createUser 创建人
+     * 充值最高限额
      */
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser;
-    }
-
-    /**
-     * 获取更新人
-     *
-     * @return update_user - 更新人
-     */
-    public String getUpdateUser() {
-        return updateUser;
-    }
-
-    /**
-     * 设置更新人
-     *
-     * @param updateUser 更新人
-     */
-    public void setUpdateUser(String updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取删除标识 1是0否
-     *
-     * @return is_valid - 删除标识 1是0否
-     */
-    public Byte getIsValid() {
-        return isValid;
-    }
-
-    /**
-     * 设置删除标识 1是0否
-     *
-     * @param isValid 删除标识 1是0否
-     */
-    public void setIsValid(Byte isValid) {
-        this.isValid = isValid;
-    }
-
-    /**
-     * 获取版本号
-     *
-     * @return version - 版本号
-     */
-    public Integer getVersion() {
-        return version;
-    }
-
-    /**
-     * 设置版本号
-     *
-     * @param version 版本号
-     */
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    public Byte getStatus() {
-        return status;
-    }
+    @Column(name = "max_price")
+    private Integer maxPrice;
+    
 }

cif-service/src/main/java/com/txz/cif/service/UserService.java

@@ -1,41 +1,48 @@
 package com.txz.cif.service;
 
 import com.txz.cif.core.Service;
+import com.txz.cif.dto.UserDTO;
 import com.txz.cif.model.User;
 import com.txz.cif.web.para.UserAddParam;
 import com.txz.cif.core.Result;
 
+import java.util.List;
+
 /**
  * Created by CodeGenerator on 2019/11/18.
  */
 public interface UserService extends Service<User> {
-
-
+    
+    
     Boolean checkMail(String email);
-
-    Result<Object> sendCode(String phoneNo );
-
+    
+    Result<Object> sendCode(String phoneNo);
+    
     Boolean checkCode(String phoneNo, String code);
-
+    
     Result<Object> resetPwd(Long userId, String pwd, String newPwd);
-
+    
     Boolean resetPhoneNo(Long userId, String phoneNo);
-
+    
     Boolean resetLoginAccount(Long userId, String loginAccount);
-
-
-//    Boolean resetEmail(Long userId, String email);
+    
+    
+    //    Boolean resetEmail(Long userId, String email);
+    
     /**
      * 创建用户
-     * @param param 入参
+     *
+     * @param param    入参
      * @param userName 创建人
-     * @param type 类型 1群组 2专家  3医院
+     * @param type     类型 1群组 2专家  3医院
      */
     Long createUser(UserAddParam param, String userName, Integer type);
-
+    
     void add(User user);
-
+    
     Result<Object> resetPwdByCode(String phoneNo, String verifyCode, String newPwd);
-
-//    boolean sendMsg(MessageParam param);
+    
+    //    boolean sendMsg(MessageParam param);
+    
+    List<UserDTO> getUsersByIds(List<Long> userIds);
 }

cif-service/src/main/java/com/txz/cif/service/impl/FlowServiceImpl.java

@@ -216,7 +216,7 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
                 .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
-                .debitAccount(account.getId()).creditAccount(MyConstants.INNER_INCOME)
+                .debitAccount(account.getId()).creditAccount(MyConstants.INNER_INCOME).createUser(param.getUserId()+"")
                 .bizId(param.getBizId()).type(6)
                 .build();
         saveUseGeneratedKeys(flow);
@@ -254,7 +254,7 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
                 .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .debitAccount(MyConstants.INNER_REFUND).creditAccount(account.getId())
-                .bizId(param.getBizId()).type(9)
+                .bizId(param.getBizId()).type(9).createUser(param.getUserId()+"")
                 .build();
         saveUseGeneratedKeys(flow);
         //借：主营支出-退款（借）     +100元

cif-service/src/main/java/com/txz/cif/service/impl/RedEnvelopeServiceImpl.java

@@ -188,6 +188,7 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
                 .userId(param.getUserIds().get(0))
                 .tranNo(id+"")
                 .settleTime(settleTime)
+                .createUser(param.getUserIds().get(0)+"")
                 .build();
         return redEnvelope;
     }

cif-service/src/main/java/com/txz/cif/service/impl/UserServiceImpl.java

@@ -6,8 +6,10 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
+import com.google.common.base.Joiner;
 import com.txz.cif.constants.RedisConstants;
 import com.txz.cif.core.*;
+import com.txz.cif.dto.UserDTO;
 import com.txz.cif.dubbo.client.OperatingConfigDubboServiceClient;
 import com.txz.cif.model.*;
 import com.txz.cif.dao.UserMapper;
@@ -20,7 +22,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 import static java.util.regex.Pattern.compile;
 
@@ -35,7 +39,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
     private static Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
 
     @Resource
-    private UserMapper cUserMapper;
+    private UserMapper userMapper;
 
 
     @Resource
@@ -206,8 +210,13 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
 
         return Result.success();
     }
-
-//    @Override
+    
+    @Override
+    public List<UserDTO> getUsersByIds(List<Long> userIds) {
+       return userMapper.getUsersByIds(Joiner.on(",").join(userIds));
+    }
+    
+    //    @Override
 //    public boolean sendMsg(MessageParam param) {
 //        if (param == null){
 //            return false;

cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -1,4 +1,5 @@
 package com.txz.cif.web;
+
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
@@ -14,6 +15,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.core.AuthService;
 import com.txz.cif.web.para.RecordParam;
+import com.txz.cif.web.vo.PaymentPriceVO;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,198 +27,212 @@ import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
-* Created by CodeGenerator on 2025/07/15.
-*/
+ * Created by CodeGenerator on 2025/07/15.
+ */
 @Api(tags = "[api]充值记录")
 @RestController
 @RequestMapping("/api/recharge/record")
 public class RechargeRecordApiController {
-
-	private static Logger log = LoggerFactory.getLogger(RechargeRecordApiController.class);
-
+    
+    private static Logger log = LoggerFactory.getLogger(RechargeRecordApiController.class);
+    
     @Resource
     private RechargeRecordService rechargeRecordService;
-
-	@Resource
-	private GoodsService goodsService;
-
-	@Resource
-	private AuthService authService;
-
-	@Resource
-	private UserService userService;
-
-	@Resource
-	private BizLogService bizLogService;
-
-	@Resource
-	private SequenceService sequenceService;
-
-	@Resource
-	private  PaymentChannelService paymentChannelService;
-
-	@GetMapping("/goodsList")
-	@ApiOperation(value = "充值商品",httpMethod = "GET")
-	public Result<List<Goods>> goodsList() {
-		Condition c = new Condition(Goods.class);
-		c.createCriteria().andEqualTo("status",1);
-		List<Goods> goods = goodsService.findByCondition(c);
-		return ResultGenerator.genSuccessResult(goods);
-	}
-
-
-	@GetMapping("/add")
-	@ApiOperation(value = "创建充值订单",httpMethod = "GET")
-    public Result add(@RequestParam Integer goodsId,@RequestParam Long methodId, HttpServletRequest request) {
-		Long userId = authService.getTokenUserId(request);
-		if(goodsId == null){
-			return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
-		}
-		try {
-			Goods goods = goodsService.findById(goodsId);
-			if (goods == null){
-				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-			}
-			if (goods.getStatus() != 1){
-				return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
-			}
-			User user = userService.findById(userId);
-			if (user == null){
-				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-			}
-			PaymentChannel paymentChannel = paymentChannelService.paymentChannelReturnsByWeight(methodId);
-
-//			long id = IdUtil.getSnowflake(1, 1).nextId();
-			String orderNo = sequenceService.genSerialNumber("recharge_rule",null);
-			RechargeRecord rechargeRecord = RechargeRecord.builder()
-					.discount(goods.getDiscount())
-					.amount(goods.getAmount())
-					.currency("BDT").userId(userId)
-					.userName(user.getName()).userPhone(user.getPhoneNo())
-					.bank(user.getBank())
-					.methodId(methodId)
-					.channelId(paymentChannel == null? null:paymentChannel.getId())
-					.bankAccount(user.getBankAccount())
-					.bankAccountName(user.getBankAccountName())
-					.orderNo(orderNo).goodsId(goodsId)
-					.createUser(user.getName())
-					.status(1).createTime(DateUtil.date())
-					.build();
-    		rechargeRecordService.save(rechargeRecord);
-			//TODO 发起第三方支付
-
-
-			try{
-				//新增日志
-				bizLogService.save(BizLog.builder().bizType(1).bizNo(orderNo)
-						.type(1).createTime(DateUtil.date()).createUser(user.getName())
-						.memo("提交充值订单").build());
-			}catch (Exception e){
-				log.error("新增充值提交订单日志失败",e);
-			}
-			return ResultGenerator.genSuccessResult(rechargeRecord);
-		} catch (Exception e) {
-			log.error("新增对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
+    
+    @Resource
+    private GoodsService goodsService;
+    
+    @Resource
+    private AuthService authService;
+    
+    @Resource
+    private UserService userService;
+    
+    @Resource
+    private BizLogService bizLogService;
+    
+    @Resource
+    private SequenceService sequenceService;
+    
+    @Resource
+    private PaymentChannelService paymentChannelService;
+    
+    @Resource
+    private PaymentMethodService paymentMethodService;
+    
+    @GetMapping("/goodsList/{methodId:^\\d+$}")
+    @ApiOperation(value = "充值商品", httpMethod = "GET")
+    public Result<PaymentPriceVO> goodsList(@PathVariable("methodId") Long methodId) {
+        Condition c = new Condition(Goods.class);
+        c.createCriteria().andEqualTo("status", 1);
+        c.createCriteria().andEqualTo("methodId", methodId);
+        c.setOrderByClause("amount asc");
+        List<Goods> goods = goodsService.findByCondition(c);
+        
+        PaymentMethod paymentMethod = paymentMethodService.findById(methodId);
+        return Result.success(PaymentPriceVO.builder()
+                .list(goods)
+                .miniPrice(paymentMethod.getMiniPrice())
+                .maxPrice(paymentMethod.getMaxPrice())
+                .build()
+        );
     }
-
-	@GetMapping("/callback")
-	@ApiOperation(value = "三方回调",httpMethod = "GET")
-	public Result<RechargeRecord> detail(@RequestParam String data) {
-		//TODO 回调成功
-		JSONObject json = JSONUtil.parseObj(data);
-		String orderNo = json.getStr("orderNo");
-		RechargeRecord record = rechargeRecordService.findBy("orderNo", orderNo);
-		if (record == null){
-			return ResultGenerator.genFailResult("订单未找到");
-		}
-		if (StrUtil.equals("1",json.getStr("status"))){
-			rechargeRecordService.success(record);
-		} else {
-			rechargeRecordService.fail(record);
-		}
-		try{
-			//新增充值回调日志
-			bizLogService.save(BizLog.builder().bizType(1).bizNo(orderNo)
-					.type(3).createTime(DateUtil.date()).createUser("第三方")
-					.memo("充值回调").build());
-		}catch (Exception e){
-			log.error("新增充值回调日志失败",e);
-		}
-		return ResultGenerator.genSuccessResult();
-	}
-
-
+    
+    
+    @GetMapping("/add")
+    @ApiOperation(value = "创建充值订单", httpMethod = "GET")
+    public Result add(@RequestParam BigDecimal amount, @RequestParam Long methodId, HttpServletRequest request) {
+        Long userId = authService.getTokenUserId(request);
+        // if (goodsId == null) {
+        //     return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
+        // }
+        try {
+            // Goods goods = goodsService.findById(goodsId);
+            // if (goods == null) {
+            //     return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+            // }
+            // if (goods.getStatus() != 1) {
+            //     return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
+            // }
+            User user = userService.findById(userId);
+            if (user == null) {
+                return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+            }
+            PaymentChannel paymentChannel = paymentChannelService.paymentChannelReturnsByWeight(methodId);
+            
+            //			long id = IdUtil.getSnowflake(1, 1).nextId();
+            String orderNo = sequenceService.genSerialNumber("recharge_rule", null);
+            RechargeRecord rechargeRecord = RechargeRecord.builder()
+                    .discount(BigDecimal.ZERO)
+                    .amount(amount)
+                    .currency("BDT").userId(userId)
+                    .userName(user.getName()).userPhone(user.getPhoneNo())
+                    .bank(user.getBank())
+                    .methodId(methodId)
+                    .channelId(paymentChannel == null ? null : paymentChannel.getId())
+                    .bankAccount(user.getBankAccount())
+                    .bankAccountName(user.getBankAccountName())
+                    .orderNo(orderNo)
+                    .goodsId(-1)
+                    .createUser(user.getName())
+                    .status(1).createTime(DateUtil.date())
+                    .build();
+            rechargeRecordService.save(rechargeRecord);
+            // TODO 发起第三方支付
+            
+            
+            try {
+                // 新增日志
+                bizLogService.save(BizLog.builder().bizType(1).bizNo(orderNo)
+                        .type(1).createTime(DateUtil.date()).createUser(user.getName())
+                        .memo("提交充值订单").build());
+            } catch (Exception e) {
+                log.error("新增充值提交订单日志失败", e);
+            }
+            return ResultGenerator.genSuccessResult(rechargeRecord);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        
+    }
+    
+    @GetMapping("/callback")
+    @ApiOperation(value = "三方回调", httpMethod = "GET")
+    public Result<RechargeRecord> detail(@RequestParam String data) {
+        // TODO 回调成功
+        JSONObject json = JSONUtil.parseObj(data);
+        String orderNo = json.getStr("orderNo");
+        RechargeRecord record = rechargeRecordService.findBy("orderNo", orderNo);
+        if (record == null) {
+            return ResultGenerator.genFailResult("订单未找到");
+        }
+        if (StrUtil.equals("1", json.getStr("status"))) {
+            rechargeRecordService.success(record);
+        } else {
+            rechargeRecordService.fail(record);
+        }
+        try {
+            // 新增充值回调日志
+            bizLogService.save(BizLog.builder().bizType(1).bizNo(orderNo)
+                    .type(3).createTime(DateUtil.date()).createUser("第三方")
+                    .memo("充值回调").build());
+        } catch (Exception e) {
+            log.error("新增充值回调日志失败", e);
+        }
+        return ResultGenerator.genSuccessResult();
+    }
+    
+    
     @GetMapping("/detail")
-	@ApiOperation(value = "rechargeRecord获取详情",httpMethod = "GET")
+    @ApiOperation(value = "rechargeRecord获取详情", httpMethod = "GET")
     public Result<RechargeRecord> detail(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-
-    	RechargeRecord rechargeRecord = null;
-    	try {
-    		rechargeRecord = rechargeRecordService.findById(id);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
+        if (id == null) {
+            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+        }
+        
+        RechargeRecord rechargeRecord = null;
+        try {
+            rechargeRecord = rechargeRecordService.findById(id);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        
         return ResultGenerator.genSuccessResult(rechargeRecord);
     }
-
+    
     @PostMapping("/list")
-	@ApiOperation(value = "rechargeRecord获取列表",httpMethod = "POST")
-	public Result<List<RechargeRecord>> list(@RequestBody RecordParam param, HttpServletRequest request) {
-		Long userId = authService.getTokenUserId(request);
-		if (userId == null ){
-			ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
-		}
-		PageHelper.startPage(param.getPage(), param.getSize());
-
-		Condition condition = new Condition(RechargeRecord.class);
-		Criteria criteria = condition.createCriteria();
-		criteria.andEqualTo("userId", userId);
-		if (StrUtil.isNotBlank(param.getChannel())){
-			criteria.andEqualTo("channel", param.getChannel());
-		}
-		if (StrUtil.isNotBlank(param.getUserName())){
-			criteria.andEqualTo("userName", param.getUserName());
-		}
-		if (StrUtil.isNotBlank(param.getUserPhone())){
-			criteria.andEqualTo("userPhone", param.getUserPhone());
-		}
-		if (StrUtil.isNotBlank(param.getOrderNo())){
-			criteria.andEqualTo("orderNo", param.getOrderNo());
-		}
-		if (param.getStatus() != null){
-			criteria.andEqualTo("status", param.getStatus());
-		}
-		if (param.getTimeType() != null){
-			if (param.getTimeType() ==1 ){
-				if (StrUtil.isNotBlank(param.getStartTime())){
-					criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
-				}
-			} else  if (param.getTimeType() ==2 ){
-				if (StrUtil.isNotBlank(param.getStartTime())){
-					criteria.andBetween("successTime", param.getStartTime(),param.getEndTime());
-				}
-			}
-		}
-		PageInfo pageInfo = null;
-		try {
-			condition.setOrderByClause("create_time desc");
-			List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
-			pageInfo = new PageInfo(list);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-		return ResultGenerator.genSuccessResult(pageInfo);
-	}
+    @ApiOperation(value = "rechargeRecord获取列表", httpMethod = "POST")
+    public Result<List<RechargeRecord>> list(@RequestBody RecordParam param, HttpServletRequest request) {
+        Long userId = authService.getTokenUserId(request);
+        if (userId == null) {
+            ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
+        }
+        PageHelper.startPage(param.getPage(), param.getSize());
+        
+        Condition condition = new Condition(RechargeRecord.class);
+        Criteria criteria = condition.createCriteria();
+        criteria.andEqualTo("userId", userId);
+        if (StrUtil.isNotBlank(param.getChannel())) {
+            criteria.andEqualTo("channel", param.getChannel());
+        }
+        if (StrUtil.isNotBlank(param.getUserName())) {
+            criteria.andEqualTo("userName", param.getUserName());
+        }
+        if (StrUtil.isNotBlank(param.getUserPhone())) {
+            criteria.andEqualTo("userPhone", param.getUserPhone());
+        }
+        if (StrUtil.isNotBlank(param.getOrderNo())) {
+            criteria.andEqualTo("orderNo", param.getOrderNo());
+        }
+        if (param.getStatus() != null) {
+            criteria.andEqualTo("status", param.getStatus());
+        }
+        if (param.getTimeType() != null) {
+            if (param.getTimeType() == 1) {
+                if (StrUtil.isNotBlank(param.getStartTime())) {
+                    criteria.andBetween("createTime", param.getStartTime(), param.getEndTime());
+                }
+            } else if (param.getTimeType() == 2) {
+                if (StrUtil.isNotBlank(param.getStartTime())) {
+                    criteria.andBetween("successTime", param.getStartTime(), param.getEndTime());
+                }
+            }
+        }
+        PageInfo pageInfo = null;
+        try {
+            condition.setOrderByClause("create_time desc");
+            List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
 }

cif-service/src/main/java/com/txz/cif/web/mng/GoodsController.java

@@ -1,22 +1,22 @@
 package com.txz.cif.web.mng;
-import cn.hutool.core.util.StrUtil;
+
 import com.txz.cif.core.Result;
+import com.txz.cif.core.ResultCode;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.Goods;
+import com.txz.cif.model.PaymentMethod;
 import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.service.GoodsService;
-
-import com.txz.cif.core.ResultCode;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+import com.txz.cif.service.PaymentMethodService;
 import com.txz.cif.web.para.GoodsParam;
-import org.springframework.web.bind.annotation.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.txz.cif.web.ro.PaymentPriceConfigRO;
+import com.txz.cif.web.vo.PaymentPriceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
@@ -24,95 +24,134 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
-* Created by CodeGenerator on 2025/07/15.
-*/
+ * Created by CodeGenerator on 2025/07/15.
+ */
 @Api(tags = "[后台]充值商品管理")
 @RestController
 @RequestMapping("/goods")
 public class GoodsController {
-
-	private static Logger log = LoggerFactory.getLogger(GoodsController.class);
-
-	@Resource
-	private GoodsService goodsService;
-
-	@PostMapping("/update")
-	@ApiOperation(value = "更新",httpMethod = "POST")
-	public Result update(@RequestBody Goods goods) {
-		if (goods.getId() == null) {
-			return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-		}
-		goodsService.update(goods);
-		return ResultGenerator.genSuccessResult();
-	}
-
-	@PostMapping("/add")
-	@ApiOperation(value = "新增",httpMethod = "POST")
-	public Result add(@RequestBody Goods goods) {
-		goods.setId(null);
-		goodsService.save(goods);
-		return ResultGenerator.genSuccessResult();
-	}
-
-	@GetMapping("/delete")
-	@ApiOperation(value = "删除",httpMethod = "GET")
-	public Result<Goods> delete(@RequestParam Long id) {
-		if(id == null){
-			return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-		}
-		try {
-			goodsService.deleteById(id);
-			return ResultGenerator.genSuccessResult();
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-	}
-
+    
+    private static Logger log = LoggerFactory.getLogger(GoodsController.class);
+    
+    @Resource
+    private GoodsService goodsService;
+    
+    @Resource
+    private PaymentMethodService paymentMethodService;
+    
+    @PostMapping("/update")
+    @ApiOperation(value = "更新", httpMethod = "POST")
+    public Result update(@RequestBody Goods goods) {
+        if (goods.getId() == null) {
+            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+        }
+        goodsService.update(goods);
+        return ResultGenerator.genSuccessResult();
+    }
+    
+    @PostMapping("/add")
+    @ApiOperation(value = "新增", httpMethod = "POST")
+    public Result add(@RequestBody Goods goods) {
+        goods.setId(null);
+        goodsService.save(goods);
+        return ResultGenerator.genSuccessResult();
+    }
+    
+    @GetMapping("/delete")
+    @ApiOperation(value = "删除", httpMethod = "GET")
+    public Result<Goods> delete(@RequestParam Long id) {
+        if (id == null) {
+            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+        }
+        try {
+            goodsService.deleteById(id);
+            return ResultGenerator.genSuccessResult();
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        
+    }
+    
     @GetMapping("/detail")
-	@ApiOperation(value = "获取详情",httpMethod = "GET")
+    @ApiOperation(value = "获取详情", httpMethod = "GET")
     public Result<Goods> detail(@RequestParam Long id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-
-    	try {
-			Goods goods = goodsService.findById(id);
-			if (goods == null){
-				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-			}
-			return ResultGenerator.genSuccessResult(goods);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
+        if (id == null) {
+            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+        }
+        
+        try {
+            Goods goods = goodsService.findById(id);
+            if (goods == null) {
+                return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+            }
+            return ResultGenerator.genSuccessResult(goods);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        
     }
-
+    
     @PostMapping("/list")
-	@ApiOperation(value = "获取列表",httpMethod = "POST")
+    @ApiOperation(value = "获取列表", httpMethod = "POST")
     public Result<List<Goods>> list(@RequestBody GoodsParam param) {
-
-        PageHelper.startPage(param.getPage(), param.getSize());
-
+        
+        PaymentMethod paymentMethod = paymentMethodService.findById(param.getMethodId());
+        
         Condition condition = new Condition(RechargeRecord.class);
         Criteria criteria = condition.createCriteria();
-		if (param.getStatus() != null){
-			criteria.andEqualTo("status", param.getStatus());
-		}
-		if (StrUtil.isNotBlank(param.getStartTime())){
-			criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
-		}
-		PageInfo pageInfo = null;
-		try {
-			condition.setOrderByClause("create_time desc");
-    		 List<Goods> list = goodsService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult(pageInfo);
+        criteria.andEqualTo("methodId", param.getMethodId());
+        if (param.getStatus() != null) {
+            criteria.andEqualTo("status", param.getStatus());
+        }
+        condition.setOrderByClause("create_time desc");
+        List<Goods> list = goodsService.findByCondition(condition);
+        
+        return Result.success(PaymentPriceVO.builder()
+                .list(list)
+                .miniPrice(paymentMethod.getMiniPrice())
+                .maxPrice(paymentMethod.getMaxPrice())
+                .build()
+        );
+    }
+    
+    /**
+     * 修改区间
+     */
+    @PatchMapping("editInterval/{paymentId:^\\d+$}")
+    public Result editInterval(@PathVariable("paymentId") Long paymentId, @RequestBody @Validated({PaymentPriceConfigRO.EditInterval.class}) PaymentPriceConfigRO ro) {
+        // PaymentPriceConfig mini = paymentPriceConfigService.getOne(Wrappers.<PaymentPriceConfig>lambdaQuery()
+        //         .eq(PaymentPriceConfig::getPaymentId, paymentId)
+        //         .lt(PaymentPriceConfig::getPriceVal, ro.getMiniPrice())
+        //         .eq(PaymentPriceConfig::getIsValid, 1)
+        //         .last("limit 1")
+        // );
+        // if (ObjectUtil.isNotEmpty(mini)) {
+        //     return Result.fail("最小金额不能小于已配置金额");
+        // }
+        //
+        // PaymentPriceConfig max = paymentPriceConfigService.getOne(Wrappers.<PaymentPriceConfig>lambdaQuery()
+        //         .eq(PaymentPriceConfig::getPaymentId, paymentId)
+        //         .gt(PaymentPriceConfig::getPriceVal, ro.getMaxPrice())
+        //         .eq(PaymentPriceConfig::getIsValid, 1)
+        //         .last("limit 1")
+        // );
+        // if (ObjectUtil.isNotEmpty(max)) {
+        //     return Result.fail("最大金额不能大于已配置金额");
+        // }
+        
+        if (ro.getMiniPrice() > ro.getMaxPrice()) {
+            return Result.fail("最小金额不能大于最大金额");
+        }
+        
+        PaymentMethod updateMethod = new PaymentMethod();
+        updateMethod.setId(paymentId);
+        updateMethod.setMiniPrice(ro.getMiniPrice());
+        updateMethod.setMaxPrice(ro.getMaxPrice());
+        
+        paymentMethodService.update(updateMethod);
+        
+        return Result.success();
     }
 }

cif-service/src/main/java/com/txz/cif/web/mng/appcontroller/PaymentMethodAppController.java

@@ -141,9 +141,9 @@ public class PaymentMethodAppController {
 //        return ResultGenerator.genSuccessResult(paymentChannel);
 //    }
 
-    @PostMapping("/list")
-    @ApiOperation(value = "app端paymentMethod获取列表", httpMethod = "POST")
-    public Result<List<PaymentMethodBO>> list(@RequestBody PaymentMethodParam paymentMethodParam) {
+    @GetMapping("/list")
+    @ApiOperation(value = "app端paymentMethod获取列表", httpMethod = "GET")
+    public Result<List<PaymentMethodBO>> list() {
 
         List<PaymentMethodBO> paymentMethodListBO = new ArrayList<>();
         try {

cif-service/src/main/java/com/txz/cif/web/para/GoodsParam.java

@@ -4,46 +4,48 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 
-@ApiModel(value="充值集合查询")
+@ApiModel(value = "充值集合查询")
 public class GoodsParam {
-
-
+    
+    
     /**
+     *
      */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
+    @ApiModelProperty(value = "status状态 1正常 2禁用")
     private Integer status;
-
-
+    
+    
     /**
      * 交易时间
      */
-    @ApiModelProperty(value="开始时间")
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
-
+    
     /**
      * 交易成功时间
      */
-    @ApiModelProperty(value="结束时间")
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
-
-
+    
+    /**
+     * 渠道id
+     */
+    private Long methodId;
+    
     /**
      * 商品id
      */
-    @ApiModelProperty(value="page")
+    @ApiModelProperty(value = "page")
     private Integer page;
-
-    @ApiModelProperty(value="size")
+    
+    @ApiModelProperty(value = "size")
     private Integer size;
-
-
+    
+    
 }

cif-service/src/main/java/com/txz/cif/web/ro/PaymentPriceConfigRO.java

@@ -0,0 +1,26 @@
+package com.txz.cif.web.ro;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author: MTD®️
+ * @date: 2025/8/28
+ */
+@Data
+public class PaymentPriceConfigRO {
+    
+    @NotNull(message = "金额不能为空", groups = {EditInterval.class})
+    @Min(value = 1, message = "金额不能为空不能小于1", groups = {EditInterval.class})
+    private Integer miniPrice;
+    
+    @NotNull(message = "金额不能为空", groups = {EditInterval.class})
+    @Min(value = 1, message = "金额不能为空不能小于1", groups = {EditInterval.class})
+    private Integer maxPrice;
+    
+    public interface EditInterval {
+    }
+    
+}

cif-service/src/main/java/com/txz/cif/web/vo/PaymentPriceVO.java

@@ -0,0 +1,32 @@
+package com.txz.cif.web.vo;
+
+import com.txz.cif.model.Goods;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author: MTD®️
+ * @date: 2025/8/28
+ */
+@Data
+@Builder
+public class PaymentPriceVO {
+    
+    /**
+     * 配置列表
+     */
+    private List<Goods> list;
+    
+    /**
+     * 充值最低限额
+     */
+    private Integer miniPrice;
+    
+    /**
+     * 充值最高限额
+     */
+    private Integer maxPrice;
+    
+}