fix some bug

remove price config

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

@@ -1,13 +0,0 @@
-package com.txz.cif.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.txz.cif.model.PaymentPriceConfig;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author: MTD®️
- * @date: 2025/8/28
- */
-@Mapper
-public interface PaymentPriceConfigMapper extends BaseMapper<PaymentPriceConfig> {
-}

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

@@ -1,61 +0,0 @@
-package com.txz.cif.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * @author: MTD®️
- * @date: 2025/8/28
- */
-@Data
-@TableName("c_payment_price_config")
-@EqualsAndHashCode(callSuper = true)
-public class PaymentPriceConfig extends Model<PaymentPriceConfig> {
-    
-    /**
-     * null
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-    
-    /**
-     * 有效标识 1是0否
-     */
-    private Integer isValid;
-    
-    /**
-     * 渠道id
-     */
-    private Long paymentId;
-    
-    /**
-     * 金额
-     */
-    private Integer priceVal;
-    
-    /**
-     * 创建人
-     */
-    private String createUser;
-    
-    /**
-     * 更新人
-     */
-    private String updateUser;
-    
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-}

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

@@ -1,12 +0,0 @@
-package com.txz.cif.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.txz.cif.model.PaymentPriceConfig;
-
-/**
- * @author: MTD®️
- * @date: 2025/8/28
- */
-
-public interface PaymentPriceConfigService extends IService<PaymentPriceConfig> {
-}

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

@@ -1,17 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.txz.cif.dao.PaymentPriceConfigMapper;
-import com.txz.cif.model.PaymentPriceConfig;
-import com.txz.cif.service.PaymentPriceConfigService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author: MTD®️
- * @date: 2025/8/28
- */
-@Slf4j
-@Service
-public class PaymentPriceConfigServiceImpl extends ServiceImpl<PaymentPriceConfigMapper, PaymentPriceConfig> implements PaymentPriceConfigService {
-}

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

@@ -15,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;
@@ -59,14 +60,25 @@ public class RechargeRecordApiController {
     @Resource
     private PaymentChannelService paymentChannelService;
     
+    @Resource
+    private PaymentMethodService paymentMethodService;
+    
     @GetMapping("/goodsList/{methodId:^\\d+$}")
     @ApiOperation(value = "充值商品", httpMethod = "GET")
-    public Result<List<Goods>> goodsList(@PathVariable("methodId") Long methodId) {
+    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 desc");
         List<Goods> goods = goodsService.findByCondition(c);
-        return ResultGenerator.genSuccessResult(goods);
+        
+        PaymentMethod paymentMethod = paymentMethodService.findById(methodId);
+        return Result.success(PaymentPriceVO.builder()
+                .list(goods)
+                .miniPrice(paymentMethod.getMiniPrice())
+                .maxPrice(paymentMethod.getMaxPrice())
+                .build()
+        );
     }
     
     

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,96 +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();
         criteria.andEqualTo("methodId", param.getMethodId());
-		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);
+        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/ro/PaymentPriceConfigRO.java

@@ -12,11 +12,6 @@ import javax.validation.constraints.NotNull;
 @Data
 public class PaymentPriceConfigRO {
     
-    @NotNull(message = "金额不能为空", groups = {Add.class, Edit.class})
-    @Min(value = 1, message = "金额不能为空不能小于1", groups = {Add.class, Edit.class})
-    // @Max(value = Integer.MAX_VALUE, message = "金额不能为空不能大于")
-    private Integer priceVal;
-    
     @NotNull(message = "金额不能为空", groups = {EditInterval.class})
     @Min(value = 1, message = "金额不能为空不能小于1", groups = {EditInterval.class})
     private Integer miniPrice;
@@ -25,12 +20,6 @@ public class PaymentPriceConfigRO {
     @Min(value = 1, message = "金额不能为空不能小于1", groups = {EditInterval.class})
     private Integer maxPrice;
     
-    public interface Add {
-    }
-    
-    public interface Edit {
-    }
-    
     public interface EditInterval {
     }
     

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

@@ -1,6 +1,6 @@
 package com.txz.cif.web.vo;
 
-import com.txz.cif.model.PaymentPriceConfig;
+import com.txz.cif.model.Goods;
 import lombok.Builder;
 import lombok.Data;
 
@@ -17,7 +17,7 @@ public class PaymentPriceVO {
     /**
      * 配置列表
      */
-    private List<PaymentPriceConfig> list;
+    private List<Goods> list;
     
     /**
      * 充值最低限额