支付通道第一版

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

@@ -25,6 +25,11 @@ public class PaymentMethodDTO implements Serializable {
      */
     private String methodName;
 
+
+
+    private Byte status;
+
+
     /**
      * 创建人
      */
@@ -203,4 +208,13 @@ public class PaymentMethodDTO implements Serializable {
     public void setVersion(Integer version) {
         this.version = version;
     }
+
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
 }

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

@@ -27,6 +27,14 @@ public class PaymentMethod {
     @ApiModelProperty(value="methodName支付方式名称")
     private String methodName;
 
+
+
+    /**
+     * 1开启 0关闭
+     */
+    @ApiModelProperty(value="status1开启 0关闭")
+    private Byte status;
+
     /**
      * 创建人
      */
@@ -225,4 +233,12 @@ public class PaymentMethod {
     public void setVersion(Integer version) {
         this.version = version;
     }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
 }

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

@@ -7,5 +7,7 @@ import com.txz.cif.core.Service;
  * Created by CodeGenerator on 2025/08/04.
  */
 public interface PaymentChannelService extends Service<PaymentChannel> {
+    int add(PaymentChannel model);
+
 
 }

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

@@ -1,13 +1,21 @@
 package com.txz.cif.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.txz.cif.dao.PaymentChannelMapper;
+import com.txz.cif.model.MidChannelMethod;
 import com.txz.cif.model.PaymentChannel;
+import com.txz.cif.model.PaymentMethod;
+import com.txz.cif.service.MidChannelMethodService;
 import com.txz.cif.service.PaymentChannelService;
 import com.txz.cif.core.AbstractService;
+import com.txz.cif.service.PaymentMethodService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -19,4 +27,129 @@ public class PaymentChannelServiceImpl extends AbstractService<PaymentChannel> i
     @Resource
     private PaymentChannelMapper cPaymentChannelMapper;
 
+
+    @Resource
+    private PaymentMethodService paymentMethodService;
+
+    @Resource
+    private MidChannelMethodService midChannelMethodService;
+    @Override
+    public int add(PaymentChannel model) {
+
+
+    //    List<PaymentMethod> paymentMethodList = new ArrayList<>();
+       // PaymentMethod paymentMethod = new PaymentMethod();
+//        int save = paymentMethodService.save(paymentMethodList);
+        DateTime date = DateUtil.date();
+        model.setId(null);
+        model.setCreateUser("opt");
+        model.setCreateTime(date);
+        int insert = cPaymentChannelMapper.insert(model);
+
+        List<MidChannelMethod> midChannelMethodList = createMidChannelMethodList(model.getId(),date);
+        return midChannelMethodService.save(midChannelMethodList);
+    }
+
+  private  List<MidChannelMethod> createMidChannelMethodList(Long paymentChannelId,DateTime date){
+      List<MidChannelMethod>  midChannelMethodList = new ArrayList<>();
+      MidChannelMethod midChannelMethod = new MidChannelMethod();
+
+     // midChannelMethod.setId(1001L); // 主键ID
+      midChannelMethod.setChannelId(paymentChannelId); // 关联的通道ID
+      midChannelMethod.setMethodId(1L); // 关联的支付方式ID
+      midChannelMethod.setAgencyService(1); // 2表示代付（1为代收）
+      midChannelMethod.setWeight((byte) 5); // 权重8（1-10之间，数值越高优先级越高）
+      midChannelMethod.setStatus((byte) 1); // 1表示开启状态
+      midChannelMethod.setCreateUser("admin"); // 创建人：系统管理员
+      midChannelMethod.setUpdateUser("operator"); // 更新人：运营人员
+      midChannelMethod.setCreateTime(date); // 2021-05-03 00:00:00
+      midChannelMethod.setUpdateTime(date); // 2021-05-05 00:00:00
+      midChannelMethod.setIsValid((byte) 1); // 1表示未删除（有效状态）
+      midChannelMethod.setVersion(1); // 版本号3（经过3次更新）
+      midChannelMethodList.add(midChannelMethod);
+
+
+      MidChannelMethod midChannelMethod2 = new MidChannelMethod();
+      // midChannelMethod.setId(1001L); // 主键ID
+      midChannelMethod2.setChannelId(paymentChannelId); // 关联的通道ID
+      midChannelMethod2.setMethodId(2L); // 关联的支付方式ID
+      midChannelMethod2.setAgencyService(1); // 2表示代付（1为代收）
+      midChannelMethod2.setWeight((byte) 5); // 权重8（1-10之间，数值越高优先级越高）
+      midChannelMethod2.setStatus((byte) 1); // 1表示开启状态
+      midChannelMethod2.setCreateUser("admin"); // 创建人：系统管理员
+      midChannelMethod2.setUpdateUser("operator"); // 更新人：运营人员
+      midChannelMethod2.setCreateTime(date); // 2021-05-03 00:00:00
+      midChannelMethod2.setUpdateTime(date); // 2021-05-05 00:00:00
+      midChannelMethod2.setIsValid((byte) 1); // 1表示未删除（有效状态）
+      midChannelMethod2.setVersion(1); // 版本号3（经过3次更新）
+      midChannelMethodList.add(midChannelMethod2);
+
+
+      MidChannelMethod midChannelMethod3 = new MidChannelMethod();
+      // midChannelMethod.setId(1001L); // 主键ID
+      midChannelMethod3.setChannelId(paymentChannelId); // 关联的通道ID
+      midChannelMethod3.setMethodId(3L); // 关联的支付方式ID
+      midChannelMethod3.setAgencyService(1); // 2表示代付（1为代收）
+      midChannelMethod3.setWeight((byte) 5); // 权重8（1-10之间，数值越高优先级越高）
+      midChannelMethod3.setStatus((byte) 1); // 1表示开启状态
+      midChannelMethod3.setCreateUser("admin"); // 创建人：系统管理员
+      midChannelMethod3.setUpdateUser("operator"); // 更新人：运营人员
+      midChannelMethod3.setCreateTime(date); // 2021-05-03 00:00:00
+      midChannelMethod3.setUpdateTime(date); // 2021-05-05 00:00:00
+      midChannelMethod3.setIsValid((byte) 1); // 1表示未删除（有效状态）
+      midChannelMethod3.setVersion(1); // 版本号3（经过3次更新）
+      midChannelMethodList.add(midChannelMethod3);
+
+
+      MidChannelMethod midChannelMethod4 = new MidChannelMethod();
+      // midChannelMethod.setId(1001L); // 主键ID
+      midChannelMethod4.setChannelId(paymentChannelId); // 关联的通道ID
+      midChannelMethod4.setMethodId(1L); // 关联的支付方式ID
+      midChannelMethod4.setAgencyService(2); // 2表示代付（1为代收）
+      midChannelMethod4.setWeight((byte) 5); // 权重8（1-10之间，数值越高优先级越高）
+      midChannelMethod4.setStatus((byte) 1); // 1表示开启状态
+      midChannelMethod4.setCreateUser("admin"); // 创建人：系统管理员
+      midChannelMethod4.setUpdateUser("operator"); // 更新人：运营人员
+      midChannelMethod4.setCreateTime(date); // 2021-05-03 00:00:00
+      midChannelMethod4.setUpdateTime(date); // 2021-05-05 00:00:00
+      midChannelMethod4.setIsValid((byte) 1); // 1表示未删除（有效状态）
+      midChannelMethod4.setVersion(1); // 版本号3（经过3次更新）
+      midChannelMethodList.add(midChannelMethod4);
+
+
+      MidChannelMethod midChannelMethod5 = new MidChannelMethod();
+      // midChannelMethod.setId(1001L); // 主键ID
+      midChannelMethod5.setChannelId(paymentChannelId); // 关联的通道ID
+      midChannelMethod5.setMethodId(2L); // 关联的支付方式ID
+      midChannelMethod5.setAgencyService(2); // 2表示代付（1为代收）
+      midChannelMethod5.setWeight((byte) 5); // 权重8（1-10之间，数值越高优先级越高）
+      midChannelMethod5.setStatus((byte) 1); // 1表示开启状态
+      midChannelMethod5.setCreateUser("admin"); // 创建人：系统管理员
+      midChannelMethod5.setUpdateUser("operator"); // 更新人：运营人员
+      midChannelMethod5.setCreateTime(date); // 2021-05-03 00:00:00
+      midChannelMethod5.setUpdateTime(date); // 2021-05-05 00:00:00
+      midChannelMethod5.setIsValid((byte) 1); // 1表示未删除（有效状态）
+      midChannelMethod5.setVersion(1); // 版本号3（经过3次更新）
+      midChannelMethodList.add(midChannelMethod5);
+
+
+      MidChannelMethod midChannelMethod6 = new MidChannelMethod();
+      // midChannelMethod.setId(1001L); // 主键ID
+      midChannelMethod6.setChannelId(paymentChannelId); // 关联的通道ID
+      midChannelMethod6.setMethodId(3L); // 关联的支付方式ID
+      midChannelMethod6.setAgencyService(2); // 2表示代付（1为代收）
+      midChannelMethod6.setWeight((byte) 5); // 权重8（1-10之间，数值越高优先级越高）
+      midChannelMethod6.setStatus((byte) 1); // 1表示开启状态
+      midChannelMethod6.setCreateUser("admin"); // 创建人：系统管理员
+      midChannelMethod6.setUpdateUser("operator"); // 更新人：运营人员
+      midChannelMethod6.setCreateTime(date); // 2021-05-03 00:00:00
+      midChannelMethod6.setUpdateTime(date); // 2021-05-05 00:00:00
+      midChannelMethod6.setIsValid((byte) 1); // 1表示未删除（有效状态）
+      midChannelMethod6.setVersion(1); // 版本号3（经过3次更新）
+      midChannelMethodList.add(midChannelMethod6);
+
+      return midChannelMethodList;
+  }
+
+
 }

cif-service/src/main/java/com/txz/cif/web/bo/MidChannelMethodBO.java

@@ -0,0 +1,18 @@
+package com.txz.cif.web.bo;
+
+import com.txz.cif.model.MidChannelMethod;
+import com.txz.cif.model.PaymentChannel;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "支付通道中间表")
+public class MidChannelMethodBO extends MidChannelMethod {
+
+     private PaymentChannel paymentChannel;
+
+}

cif-service/src/main/java/com/txz/cif/web/bo/PaymentChannelBO.java

@@ -0,0 +1,19 @@
+package com.txz.cif.web.bo;
+
+import com.txz.cif.model.MidChannelMethod;
+import com.txz.cif.model.PaymentChannel;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "支付通道")
+public class PaymentChannelBO extends PaymentChannel {
+
+        private MidChannelMethod midChannelMethod;
+
+
+}

cif-service/src/main/java/com/txz/cif/web/bo/PaymentMethodBO.java

@@ -0,0 +1,20 @@
+package com.txz.cif.web.bo;
+
+import com.txz.cif.model.PaymentChannel;
+import com.txz.cif.model.PaymentMethod;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "支付方式")
+public class PaymentMethodBO extends PaymentMethod {
+
+    private List<MidChannelMethodBO> midChannelMethodBOList;
+
+}

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

@@ -1,4 +1,5 @@
 package com.txz.cif.web.mng;
+import cn.hutool.core.bean.BeanUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.MidChannelMethod;
@@ -8,6 +9,7 @@ import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.web.para.updateparam.MidChannelMethodUpdateParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,52 +37,54 @@ public class MidChannelMethodController {
     @Resource
     private MidChannelMethodService midChannelMethodService;
 
-    @PostMapping("/add")
-	@ApiOperation(value = "midChannelMethod新增",httpMethod = "POST")
-    public Result add(@RequestBody MidChannelMethod midChannelMethod) {
-    	if(midChannelMethod == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-    	}
-    	try {
-    //		midChannelMethod.setCreateTime(new Date());
-    //		midChannelMethod.setCreateUserId(userId);
-    		midChannelMethodService.save(midChannelMethod);
-		} catch (Exception e) {
-			log.error("新增对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-        return ResultGenerator.genSuccessResult(midChannelMethod);
-    }
-
-    @GetMapping("/delete")
-	@ApiOperation(value = "midChannelMethod删除",httpMethod = "GET")
-    public Result delete(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-    	try {
-    		midChannelMethodService.deleteById(id);
-		} catch (Exception e) {
-			log.error("删除对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult();
-    }
+//    @PostMapping("/add")
+//	@ApiOperation(value = "midChannelMethod新增",httpMethod = "POST")
+//    public Result add(@RequestBody MidChannelMethod midChannelMethod) {
+//    	if(midChannelMethod == null){
+//    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+//    	}
+//    	try {
+//    //		midChannelMethod.setCreateTime(new Date());
+//    //		midChannelMethod.setCreateUserId(userId);
+//    		midChannelMethodService.save(midChannelMethod);
+//		} catch (Exception e) {
+//			log.error("新增对象操作异常e:{}",e);
+//			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//
+//        return ResultGenerator.genSuccessResult(midChannelMethod);
+//    }
+
+//    @GetMapping("/delete")
+//	@ApiOperation(value = "midChannelMethod删除",httpMethod = "GET")
+//    public Result delete(@RequestParam Integer id) {
+//    	if(id == null){
+//    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+//    	}
+//    	try {
+//    		midChannelMethodService.deleteById(id);
+//		} catch (Exception e) {
+//			log.error("删除对象操作异常e:{}",e);
+//			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return ResultGenerator.genSuccessResult();
+//    }
 
     @PostMapping("/update")
-	@ApiOperation(value = "midChannelMethod更新",httpMethod = "POST")
-    public Result update(@RequestBody MidChannelMethod midChannelMethod) {
-    	if(midChannelMethod == null){
+	@ApiOperation(value = "支付通道启用/关停",httpMethod = "POST")
+    public Result update(@RequestBody MidChannelMethodUpdateParam midChannelMethodUpdateParam) {
+    	if(midChannelMethodUpdateParam == null){
     		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
     	}
-    	if(midChannelMethod.getId() == null){
+    	if(midChannelMethodUpdateParam.getId() == null){
     		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
     	}
-    	try {
+
+		MidChannelMethod bean = BeanUtil.toBean(midChannelMethodUpdateParam, MidChannelMethod.class);
+		try {
     //		midChannelMethod.setUpdateTime(new Date());
     //		midChannelMethod.setUpdateUserId(userId);
-    		midChannelMethodService.update(midChannelMethod);
+    		midChannelMethodService.update(bean);
 		} catch (Exception e) {
 			log.error("更新对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
@@ -88,41 +92,41 @@ public class MidChannelMethodController {
         return ResultGenerator.genSuccessResult();
     }
 
-    @GetMapping("/detail")
-	@ApiOperation(value = "midChannelMethod获取详情",httpMethod = "GET")
-    public Result<MidChannelMethod> detail(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-
-    	MidChannelMethod midChannelMethod = null;
-    	try {
-    		midChannelMethod = midChannelMethodService.findById(id);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-        return ResultGenerator.genSuccessResult(midChannelMethod);
-    }
-
-    @PostMapping("/list")
-	@ApiOperation(value = "midChannelMethod获取列表",httpMethod = "POST")
-    public Result<List<MidChannelMethod>> list(@RequestBody MidChannelMethod midChannelMethod, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(midChannelMethod.getClass());
-        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-		PageInfo pageInfo = null;
-		try {
-    		 List<MidChannelMethod> list = midChannelMethodService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult(pageInfo);
-    }
+//    @GetMapping("/detail")
+//	@ApiOperation(value = "midChannelMethod获取详情",httpMethod = "GET")
+//    public Result<MidChannelMethod> detail(@RequestParam Integer id) {
+//    	if(id == null){
+//    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+//    	}
+//
+//    	MidChannelMethod midChannelMethod = null;
+//    	try {
+//    		midChannelMethod = midChannelMethodService.findById(id);
+//		} catch (Exception e) {
+//			log.error("查询对象操作异常e:{}",e);
+//			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//
+//        return ResultGenerator.genSuccessResult(midChannelMethod);
+//    }
+
+//    @PostMapping("/list")
+//	@ApiOperation(value = "midChannelMethod获取列表",httpMethod = "POST")
+//    public Result<List<MidChannelMethod>> list(@RequestBody MidChannelMethod midChannelMethod, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(midChannelMethod.getClass());
+//        Criteria criteria = condition.createCriteria();
+////        criteria.andEqualTo("name", city.getName());
+//		PageInfo pageInfo = null;
+//		try {
+//    		 List<MidChannelMethod> list = midChannelMethodService.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/PaymentChannelController.java

@@ -1,13 +1,23 @@
 package com.txz.cif.web.mng;
+import cn.hutool.core.bean.BeanUtil;
+import com.txz.cif.core.AuthService;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.MidChannelMethod;
 import com.txz.cif.model.PaymentChannel;
+import com.txz.cif.model.PaymentMethod;
+import com.txz.cif.model.User;
+import com.txz.cif.service.MidChannelMethodService;
 import com.txz.cif.service.PaymentChannelService;
 
 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.service.UserService;
+import com.txz.cif.web.para.PaymentChannelParam;
+import com.txz.cif.web.para.updateparam.PaymentChannelUpdateParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,8 +29,10 @@ import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+
 
 /**
 * Created by CodeGenerator on 2025/08/04.
@@ -35,52 +47,70 @@ public class PaymentChannelController {
     @Resource
     private PaymentChannelService paymentChannelService;
 
+	@Resource
+	private UserService userService;
+	@Resource
+	private AuthService authService;
+
     @PostMapping("/add")
-	@ApiOperation(value = "paymentChannel新增",httpMethod = "POST")
-    public Result add(@RequestBody PaymentChannel paymentChannel) {
-    	if(paymentChannel == null){
+	@ApiOperation(value = "支付通道新增",httpMethod = "POST")
+    public Result add(@RequestBody PaymentChannelParam paymentChannelParam,HttpServletRequest request) {
+    	if(paymentChannelParam == null){
     		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
     	}
+//		Long userId = authService.getTokenUserId(request);
+//		if (userId == null ){
+//			ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
+//		}
+//		User user = userService.findById(userId);
+//		if (user == null ){
+//			ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
+//		}
     	try {
     //		paymentChannel.setCreateTime(new Date());
     //		paymentChannel.setCreateUserId(userId);
-    		paymentChannelService.save(paymentChannel);
+			PaymentChannel bean = BeanUtil.toBean(paymentChannelParam, PaymentChannel.class);
+			bean.setCreateUser("lala");
+			bean.setUpdateUser("lala");
+			paymentChannelService.add(bean);
+
 		} catch (Exception e) {
 			log.error("新增对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
 		}
 
-        return ResultGenerator.genSuccessResult(paymentChannel);
-    }
-
-    @GetMapping("/delete")
-	@ApiOperation(value = "paymentChannel删除",httpMethod = "GET")
-    public Result delete(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-    	try {
-    		paymentChannelService.deleteById(id);
-		} catch (Exception e) {
-			log.error("删除对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
         return ResultGenerator.genSuccessResult();
     }
 
+//    @GetMapping("/delete")
+//	@ApiOperation(value = "paymentChannel删除",httpMethod = "GET")
+//    public Result delete(@RequestParam Integer id) {
+//    	if(id == null){
+//    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+//    	}
+//    	try {
+//    		paymentChannelService.deleteById(id);
+//		} catch (Exception e) {
+//			log.error("删除对象操作异常e:{}",e);
+//			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return ResultGenerator.genSuccessResult();
+//    }
+
     @PostMapping("/update")
 	@ApiOperation(value = "paymentChannel更新",httpMethod = "POST")
-    public Result update(@RequestBody PaymentChannel paymentChannel) {
-    	if(paymentChannel == null){
+    public Result update(@RequestBody PaymentChannelUpdateParam paymentChannelUpdateParam) {
+    	if(paymentChannelUpdateParam == null){
     		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
     	}
-    	if(paymentChannel.getId() == null){
+    	if(paymentChannelUpdateParam.getId() == null){
     		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
     	}
-    	try {
+		PaymentChannel bean = BeanUtil.toBean(paymentChannelUpdateParam, PaymentChannel.class);
+		try {
     //		paymentChannel.setUpdateTime(new Date());
     //		paymentChannel.setUpdateUserId(userId);
-    		paymentChannelService.update(paymentChannel);
+    		paymentChannelService.update(bean);
 		} catch (Exception e) {
 			log.error("更新对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
@@ -88,41 +118,41 @@ public class PaymentChannelController {
         return ResultGenerator.genSuccessResult();
     }
 
-    @GetMapping("/detail")
-	@ApiOperation(value = "paymentChannel获取详情",httpMethod = "GET")
-    public Result<PaymentChannel> detail(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-
-    	PaymentChannel paymentChannel = null;
-    	try {
-    		paymentChannel = paymentChannelService.findById(id);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-        return ResultGenerator.genSuccessResult(paymentChannel);
-    }
-
-    @PostMapping("/list")
-	@ApiOperation(value = "paymentChannel获取列表",httpMethod = "POST")
-    public Result<List<PaymentChannel>> list(@RequestBody PaymentChannel paymentChannel, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(paymentChannel.getClass());
-        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-		PageInfo pageInfo = null;
-		try {
-    		 List<PaymentChannel> list = paymentChannelService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult(pageInfo);
-    }
+//    @GetMapping("/detail")
+//	@ApiOperation(value = "paymentChannel获取详情",httpMethod = "GET")
+//    public Result<PaymentChannel> detail(@RequestParam Integer id) {
+//    	if(id == null){
+//    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+//    	}
+//
+//    	PaymentChannel paymentChannel = null;
+//    	try {
+//    		paymentChannel = paymentChannelService.findById(id);
+//		} catch (Exception e) {
+//			log.error("查询对象操作异常e:{}",e);
+//			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//
+//        return ResultGenerator.genSuccessResult(paymentChannel);
+//    }
+
+//    @PostMapping("/list")
+//	@ApiOperation(value = "paymentChannel获取列表",httpMethod = "POST")
+//    public Result<List<PaymentChannel>> list(@RequestBody PaymentChannel paymentChannel, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(paymentChannel.getClass());
+//        Criteria criteria = condition.createCriteria();
+////        criteria.andEqualTo("name", city.getName());
+//		PageInfo pageInfo = null;
+//		try {
+//    		 List<PaymentChannel> list = paymentChannelService.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/PaymentMethodController.java

@@ -1,13 +1,25 @@
 package com.txz.cif.web.mng;
+
+import cn.hutool.core.bean.BeanUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.MidChannelMethod;
+import com.txz.cif.model.PaymentChannel;
 import com.txz.cif.model.PaymentMethod;
+import com.txz.cif.service.MidChannelMethodService;
+import com.txz.cif.service.PaymentChannelService;
 import com.txz.cif.service.PaymentMethodService;
 
 import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.web.bo.MidChannelMethodBO;
+import com.txz.cif.web.bo.PaymentMethodBO;
+import com.txz.cif.web.bo.UserBo2;
+import com.txz.cif.web.para.PaymentMethodParam;
+import com.txz.cif.web.para.updateparam.PaymentMethodUpdateParam;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,110 +31,150 @@ import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
-* Created by CodeGenerator on 2025/08/04.
-*/
+ * Created by CodeGenerator on 2025/08/04.
+ */
 @Api(tags = "[后台]paymentMethod管理")
 @RestController
 @RequestMapping("/payment/method")
 public class PaymentMethodController {
 
-	private static Logger log = LoggerFactory.getLogger(PaymentMethodController.class);
+    private static Logger log = LoggerFactory.getLogger(PaymentMethodController.class);
 
     @Resource
     private PaymentMethodService paymentMethodService;
 
-    @PostMapping("/add")
-	@ApiOperation(value = "paymentMethod新增",httpMethod = "POST")
-    public Result add(@RequestBody PaymentMethod paymentMethod) {
-    	if(paymentMethod == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-    	}
-    	try {
-    //		paymentMethod.setCreateTime(new Date());
-    //		paymentMethod.setCreateUserId(userId);
-    		paymentMethodService.save(paymentMethod);
-		} catch (Exception e) {
-			log.error("新增对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-        return ResultGenerator.genSuccessResult(paymentMethod);
-    }
-
-    @GetMapping("/delete")
-	@ApiOperation(value = "paymentMethod删除",httpMethod = "GET")
-    public Result delete(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-    	try {
-    		paymentMethodService.deleteById(id);
-		} catch (Exception e) {
-			log.error("删除对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult();
-    }
+//    @PostMapping("/add")
+//    @ApiOperation(value = "paymentMethod新增", httpMethod = "POST")
+//    public Result add(@RequestBody PaymentMethod paymentMethod) {
+//        if (paymentMethod == null) {
+//            return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+//        }
+//        try {
+//            //		paymentMethod.setCreateTime(new Date());
+//            //		paymentMethod.setCreateUserId(userId);
+//            paymentMethodService.save(paymentMethod);
+//        } catch (Exception e) {
+//            log.error("新增对象操作异常e:{}", e);
+//            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//
+//        return ResultGenerator.genSuccessResult(paymentMethod);
+//    }
+
+//    @GetMapping("/delete")
+//    @ApiOperation(value = "paymentMethod删除", httpMethod = "GET")
+//    public Result delete(@RequestParam Integer id) {
+//        if (id == null) {
+//            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+//        }
+//        try {
+//            paymentMethodService.deleteById(id);
+//        } catch (Exception e) {
+//            log.error("删除对象操作异常e:{}", e);
+//            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return ResultGenerator.genSuccessResult();
+//    }
 
     @PostMapping("/update")
-	@ApiOperation(value = "paymentMethod更新",httpMethod = "POST")
-    public Result update(@RequestBody PaymentMethod paymentMethod) {
-    	if(paymentMethod == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-    	}
-    	if(paymentMethod.getId() == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-    	try {
-    //		paymentMethod.setUpdateTime(new Date());
-    //		paymentMethod.setUpdateUserId(userId);
-    		paymentMethodService.update(paymentMethod);
-		} catch (Exception e) {
-			log.error("更新对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
+    @ApiOperation(value = "支付方式启用/关停", httpMethod = "POST")
+    public Result update(@RequestBody PaymentMethodUpdateParam paymentMethodUpdateParam) {
+        if (paymentMethodUpdateParam == null) {
+            return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+        }
+        if (paymentMethodUpdateParam.getId() == null) {
+            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+        }
+
+        PaymentMethod bean = BeanUtil.toBean(paymentMethodUpdateParam, PaymentMethod.class);
+        try {
+
+            bean.setUpdateUser("lala");
+
+            paymentMethodService.update(bean);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
         return ResultGenerator.genSuccessResult();
     }
 
-    @GetMapping("/detail")
-	@ApiOperation(value = "paymentMethod获取详情",httpMethod = "GET")
-    public Result<PaymentMethod> detail(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-
-    	PaymentMethod paymentMethod = null;
-    	try {
-    		paymentMethod = paymentMethodService.findById(id);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-        return ResultGenerator.genSuccessResult(paymentMethod);
-    }
+//    @GetMapping("/detail")
+//    @ApiOperation(value = "paymentMethod获取详情", httpMethod = "GET")
+//    public Result<PaymentMethod> detail(@RequestParam Integer id) {
+//        if (id == null) {
+//            return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+//        }
+//
+//        PaymentMethod paymentMethod = null;
+//        try {
+//            paymentMethod = paymentMethodService.findById(id);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//
+//        return ResultGenerator.genSuccessResult(paymentMethod);
+//    }
+
+    @Resource
+    private MidChannelMethodService midChannelMethodService;
+    @Resource
+    private PaymentChannelService paymentChannelService;
 
     @PostMapping("/list")
-	@ApiOperation(value = "paymentMethod获取列表",httpMethod = "POST")
-    public Result<List<PaymentMethod>> list(@RequestBody PaymentMethod paymentMethod, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(paymentMethod.getClass());
-        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-		PageInfo pageInfo = null;
-		try {
-    		 List<PaymentMethod> list = paymentMethodService.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 = "paymentMethod获取列表", httpMethod = "POST")
+    public Result<List<PaymentMethodBO>> list(@RequestBody PaymentMethodParam paymentMethodParam) {
+
+
+        List<PaymentMethodBO> paymentMethodListBO = new ArrayList<>();
+        try {
+            Map<Long, PaymentChannel> paymentChannelMap;
+            List<PaymentChannel> paymentChannelList = paymentChannelService.findAll();
+            if (!CollectionUtils.isEmpty(paymentChannelList)) {
+                paymentChannelMap = paymentChannelList.stream().collect(Collectors.toMap(PaymentChannel::getId, a -> a, (a, c) -> c));
+            } else {
+                paymentChannelMap = new HashMap<>();
+            }
+
+            List<MidChannelMethod> midChannelMethodList = midChannelMethodService.findAll();
+
+            Map<Long, List<MidChannelMethodBO>> midChannelMethodBOGroupMap;
+            if (!CollectionUtils.isEmpty(midChannelMethodList)) {
+                midChannelMethodBOGroupMap = midChannelMethodList.stream().filter(a -> a.getAgencyService().equals(paymentMethodParam.getAgencyService())).map(a -> {
+                    MidChannelMethodBO bean = BeanUtil.toBean(a, MidChannelMethodBO.class);
+                    bean.setPaymentChannel(paymentChannelMap.get(bean.getChannelId()));
+                    return bean;
+                }).collect(Collectors.groupingBy(MidChannelMethod::getMethodId));
+            } else {
+                midChannelMethodBOGroupMap = new HashMap<>();
+            }
+
+            List<PaymentMethod> paymentMethodList = paymentMethodService.findAll();
+
+            if (!CollectionUtils.isEmpty(paymentMethodList)) {
+                paymentMethodList.stream().forEach(a -> {
+                    PaymentMethodBO bean = BeanUtil.toBean(a, PaymentMethodBO.class);
+                    List<MidChannelMethodBO> midChannelMethodBOS = midChannelMethodBOGroupMap.get(bean.getId());
+                    if (!CollectionUtils.isEmpty(midChannelMethodBOS)) {
+                        bean.setMidChannelMethodBOList(midChannelMethodBOS);
+                        paymentMethodListBO.add(bean);
+                    }
+                });
+            }
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+
+        }
+        return ResultGenerator.genSuccessResult(paymentMethodListBO);
     }
 }

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

@@ -0,0 +1,22 @@
+package com.txz.cif.web.para;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value="支付通道中间表入参")
+public class MidChannelMethodParam {
+
+    @ApiModelProperty(value="id")
+    private Long id;
+
+
+    @ApiModelProperty(value="status1开启 0关闭")
+    private Byte status;
+
+}

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

@@ -0,0 +1,53 @@
+package com.txz.cif.web.para;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value="支付通道入参")
+public class PaymentChannelParam {
+
+
+    /**
+     * 支付通道编码
+     */
+
+    @ApiModelProperty(value="channelCode支付通道编码")
+    private String channelCode;
+
+    /**
+     * 通道名称
+     */
+    @ApiModelProperty(value="channelName通道名称")
+    private String channelName;
+
+    /**
+     * 商户号
+     */
+
+    @ApiModelProperty(value="merchantNum商户号")
+    private String merchantNum;
+
+    /**
+     * 应用id
+     */
+    @ApiModelProperty(value="appid应用id")
+    private String appid;
+
+    /**
+     * 密钥
+     */
+
+    @ApiModelProperty(value="secretKey密钥")
+    private String secretKey;
+
+
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.txz.cif.web.para;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.persistence.Column;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("支付方式入参")
+public class PaymentMethodParam {
+
+
+    @ApiModelProperty(value="id")
+    private Long id;
+    /**
+     * 1开启 0关闭
+     */
+    @ApiModelProperty(value="status1开启 0关闭")
+    private Byte status;
+
+    @ApiModelProperty(value="agencyService1代收 2代付")
+    private Integer agencyService;
+
+    @ApiModelProperty(value="isValid删除标识 1是0否")
+    private Byte isValid;
+
+
+}

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

@@ -0,0 +1,28 @@
+package com.txz.cif.web.para.updateparam;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("支付通启用关停入参")
+public class MidChannelMethodUpdateParam {
+
+
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 1开启 0关闭
+     */
+    @ApiModelProperty(value="status1开启 0关闭")
+    private Byte status;
+
+    @ApiModelProperty(value="isValid删除标识 1是0否")
+    private Byte isValid;
+
+}

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

@@ -0,0 +1,61 @@
+package com.txz.cif.web.para.updateparam;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("支付通道修改入参")
+public class PaymentChannelUpdateParam {
+
+
+    @ApiModelProperty(value="id")
+    private Long id;
+
+
+
+    /**
+     * 支付通道编码
+     */
+    @ApiModelProperty(value="channelCode支付通道编码")
+    private String channelCode;
+
+    /**
+     * 通道名称
+     */
+    @ApiModelProperty(value="channelName通道名称")
+    private String channelName;
+
+    /**
+     * 商户号
+     */
+
+    @ApiModelProperty(value="merchantNum商户号")
+    private String merchantNum;
+
+    /**
+     * 应用id
+     */
+    @ApiModelProperty(value="appid应用id")
+    private String appid;
+
+    /**
+     * 密钥
+     */
+
+    @ApiModelProperty(value="secretKey密钥")
+    private String secretKey;
+
+    /**
+     * 1开启 0关闭
+     */
+    @ApiModelProperty(value="status1开启 0关闭")
+    private Byte status;
+
+    @ApiModelProperty(value="isValid删除标识 1是0否")
+    private Byte isValid;
+}

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

@@ -0,0 +1,28 @@
+package com.txz.cif.web.para.updateparam;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("支付方式修改入参")
+public class PaymentMethodUpdateParam {
+
+
+    @ApiModelProperty(value="id")
+    private Long id;
+    /**
+     * 1开启 0关闭
+     */
+    @ApiModelProperty(value="status1开启 0关闭")
+    private Byte status;
+
+    @ApiModelProperty(value="isValid删除标识 1是0否")
+    private Byte isValid;
+
+
+}

cif-service/src/main/resources/mapper/AccountFreezdMapper.xml

@@ -14,4 +14,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
+
+
+
 </mapper>