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

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

@@ -1,7 +1,17 @@
 package com.txz.cif.dao;
 
 import com.txz.cif.core.Mapper;
+import com.txz.cif.dao.impl.RechargeRecordMapperImpl;
 import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.web.bo.RechargeRecordBO;
+import com.txz.cif.web.para.RecordParam;
+import org.apache.ibatis.annotations.SelectProvider;
+
+import java.util.List;
 
 public interface RechargeRecordMapper extends Mapper<RechargeRecord> {
+    
+    @SelectProvider(type = RechargeRecordMapperImpl.class, method = "pageList")
+    List<RechargeRecordBO> pageList(RecordParam param);
+    
 }

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

@@ -0,0 +1,56 @@
+package com.txz.cif.dao.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.txz.cif.web.para.RecordParam;
+
+/**
+ * @author: MTD®️
+ * @date: 2025/9/9
+ */
+
+public class RechargeRecordMapperImpl {
+    
+    public String pageList(RecordParam param) {
+        String sql = " SELECT crr.id, crr.order_no, crr.user_id, crr.amount, crr.discount, crr.status " +
+                " ,crr.channel, cpc.channel_name, cpm.method_name, crr.currency, crr.user_name " +
+                " , crr.user_phone, crr.bank, crr.bank_account, crr.bank_account_name, crr.create_time " +
+                " , crr.success_time, crr.version " +
+                " FROM c_recharge_record crr " +
+                " LEFT JOIN c_payment_method cpm ON crr.method_id = cpm.id " +
+                " LEFT JOIN c_payment_channel cpc ON cpc.id = crr.channel_id " +
+                " WHERE 1=1 ";
+        if (StrUtil.isNotBlank(param.getChannel())) {
+            sql += " AND crr.channel = #{channel} ";
+        }
+        if (StrUtil.isNotBlank(param.getUserName())) {
+            sql += " AND crr.user_name = #{userName} ";
+        }
+        if (StrUtil.isNotBlank(param.getUserPhone())) {
+            sql += " AND crr.user_phone = #{userPhone} ";
+        }
+        if (StrUtil.isNotBlank(param.getOrderNo())) {
+            sql += " AND crr.order_no = #{orderNo} ";
+        }
+        if (ObjectUtil.isNotEmpty(param.getStatus())) {
+            sql += " AND crr.status = #{status} ";
+        }
+        if(StrUtil.isNotBlank(param.getMethodName())){
+            sql += " AND cpm.method_name = #{methodName} ";
+        }
+        if (param.getTimeType() != null) {
+            if (param.getTimeType() == 1) {
+                if (StrUtil.isNotBlank(param.getStartTime())) {
+                    sql += " AND crr.create_time BETWEEN #{startTime} AND #{endTime} ";
+                }
+            } else if (param.getTimeType() == 2) {
+                if (StrUtil.isNotBlank(param.getStartTime())) {
+                    sql += " AND crr.success_time BETWEEN #{startTime} AND #{endTime} ";
+                }
+            }
+        }
+        
+        sql+=" ORDER BY crr.create_time DESC ";
+        return sql;
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.txz.cif.core.ResultCode;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.core.ServiceException;
@@ -157,6 +158,7 @@ public class AccountDubboServiceImpl implements AccountDubboService {
     
     @Override
     public Result accomplishGroup(AccomplishParam param) {
+        log.info("accomplishGroup param :"+ JSONObject.toJSONString(param));
         // 类型 1001充值 2001提现  3001开团支付 3002参团支付  4001未成团退款 4002成团退款 5001开团红包收益 5002参团红包收益 5003签到红包收益 5004下级红包佣金 5005下下级红包佣金
         for (OrderParam orderParam : param.getUserIds()) {
             Result result = flowService.refund(RefundParam.builder()
@@ -172,8 +174,10 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         }
 
         if (param.getOpenGroupUserId() != null) {
+            log.info("param.getOpenGroupUserId() :"+ param.getOpenGroupUserId());
             // 计算开团红包金额
             com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = operatingConfigDubboServiceClient.getConfigByCode("open_red_envelope_rate");
+            log.info("operatingConfigDubboServiceClient.getConfigByCode openRedEnvelopeRate:"+ JSONObject.toJSONString(openRedEnvelopeRate));
             String rate = openRedEnvelopeRate.getData().getValueInfo();
             BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
 
@@ -195,7 +199,10 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         if (param.getWinnerUserId().compareTo(param.getOpenGroupUserId()) != 0){
             param.getUserIds().add(OrderParam.builder().orderNo(param.getWinnerOrderNo()).userId(param.getWinnerUserId()).build());
         }
+
+
         com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = operatingConfigDubboServiceClient.getConfigByCode("join_red_envelope_rate");
+        log.info("operatingConfigDubboServiceClient.getConfigByCode2 openRedEnvelopeRate:"+ JSONObject.toJSONString(openRedEnvelopeRate));
         String rate = openRedEnvelopeRate.getData().getValueInfo();
         BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
         // 参团红包
@@ -206,6 +213,8 @@ public class AccountDubboServiceImpl implements AccountDubboService {
                     .transTime(param.getTransTime())
                     .build());
         }
+
+        log.info("accomplishGroup end param :"+ JSONObject.toJSONString(param));
         return Result.genSuccessResult();
     }
     

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

@@ -2,6 +2,10 @@ package com.txz.cif.service;
 
 import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.core.Service;
+import com.txz.cif.web.bo.RechargeRecordBO;
+import com.txz.cif.web.para.RecordParam;
+
+import java.util.List;
 
 
 /**
@@ -14,4 +18,6 @@ public interface RechargeRecordService extends Service<RechargeRecord> {
     void fail(RechargeRecord record);
     
     void closeRecharge();
+    
+    List<RechargeRecordBO> pageList(RecordParam param);
 }

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

@@ -9,6 +9,8 @@ import com.txz.cif.param.RechargeParam;
 import com.txz.cif.service.AccountService;
 import com.txz.cif.service.FlowService;
 import com.txz.cif.service.RechargeRecordService;
+import com.txz.cif.web.bo.RechargeRecordBO;
+import com.txz.cif.web.para.RecordParam;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Condition;
@@ -26,7 +28,7 @@ import java.util.List;
 @Transactional
 public class RechargeRecordServiceImpl extends AbstractService<RechargeRecord> implements RechargeRecordService {
     @Resource
-    private RechargeRecordMapper cRechargeRecordMapper;
+    private RechargeRecordMapper rechargeRecordMapper;
     
     @Resource
     private FlowService flowService;
@@ -78,4 +80,9 @@ public class RechargeRecordServiceImpl extends AbstractService<RechargeRecord> i
                     .build());
         }
     }
+    
+    @Override
+    public List<RechargeRecordBO> pageList(RecordParam param) {
+        return rechargeRecordMapper.pageList(param);
+    }
 }

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

@@ -6,23 +6,20 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.txz.cif.core.Result;
+import com.txz.cif.core.ResultCode;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.*;
 import com.txz.cif.service.*;
-
-import com.txz.cif.core.ResultCode;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.txz.cif.web.bo.RechargeRecordBO;
 import com.txz.cif.web.para.RecordParam;
-import org.springframework.web.bind.annotation.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
@@ -31,7 +28,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Created by CodeGenerator on 2025/07/15.
@@ -112,64 +108,65 @@ public class RechargeRecordController {
     
     @PostMapping("/list")
     @ApiOperation(value = "rechargeRecord获取列表", httpMethod = "POST")
-    public Result<List<RechargeRecordBO>> list(@RequestBody RecordParam param) {
+    public Result<PageInfo<RechargeRecordBO>> list(@RequestBody RecordParam param) {
         
         PageHelper.startPage(param.getPage(), param.getSize());
         
-        Condition condition = new Condition(RechargeRecord.class);
-        Criteria criteria = condition.createCriteria();
-        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);
-            pageInfo.setList(list.stream().map(e -> {
-                RechargeRecordBO bo = BeanUtil.toBean(e, RechargeRecordBO.class);
-                if (e.getMethodId() != null) {
-                    PaymentMethod method = paymentMethodService.findById(e.getMethodId());
-                    if (method != null) {
-                        bo.setMethodName(method.getMethodName());
-                    }
-                }
-                if (e.getChannelId() != null) {
-                    PaymentChannel channel = paymentChannelService.findById(e.getChannelId());
-                    if (channel != null) {
-                        bo.setChannelName(channel.getChannelName());
-                    }
-                }
-                return bo;
-            }).collect(Collectors.toList()));
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return ResultGenerator.genSuccessResult(pageInfo);
+        return Result.success(new PageInfo(rechargeRecordService.pageList(param)));
+        
+        // Condition condition = new Condition(RechargeRecord.class);
+        // Criteria criteria = condition.createCriteria();
+        // 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);
+        //     pageInfo.setList(list.stream().map(e -> {
+        //         RechargeRecordBO bo = BeanUtil.toBean(e, RechargeRecordBO.class);
+        //         if (e.getMethodId() != null) {
+        //             PaymentMethod method = paymentMethodService.findById(e.getMethodId());
+        //             if (method != null) {
+        //                 bo.setMethodName(method.getMethodName());
+        //             }
+        //         }
+        //         if (e.getChannelId() != null) {
+        //             PaymentChannel channel = paymentChannelService.findById(e.getChannelId());
+        //             if (channel != null) {
+        //                 bo.setChannelName(channel.getChannelName());
+        //             }
+        //         }
+        //         return bo;
+        //     }).collect(Collectors.toList()));
+        // } catch (Exception e) {
+        //     log.error("查询对象操作异常e:{}", e);
+        //     return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        // }
     }
     
     @GetMapping("/report")

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

@@ -143,6 +143,9 @@ public class WithdrawRecordController {
         if (param.getStatus() != null) {
             criteria.andEqualTo("status", param.getStatus());
         }
+        if (param.getAccountType() != null) {
+            criteria.andEqualTo("accountType", param.getAccountType());
+        }
         if (param.getTimeType() != null) {
             if (param.getTimeType() == 1) {
                 if (StrUtil.isNotBlank(param.getStartTime())) {

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

@@ -4,9 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
+import javax.persistence.Column;
 @Getter
 @Setter
 @NoArgsConstructor
@@ -36,7 +34,11 @@ public class RecordParam {
      */
     @ApiModelProperty(value="channel渠道")
     private String channel;
-
+    
+    /**
+     * 充值方式
+     */
+    private String methodName;
 
 
     /**