linxk 2 周之前
父节点
当前提交
db153eace4

+ 122 - 0
cif-api/src/main/java/com/txz/cif/dto/BizLogDTO.java

@@ -0,0 +1,122 @@
+/*
+*
+* BizLogDTO.java
+* Copyright(C) 2017-2020 fendo公司
+* @date 2025-07-29
+*/
+package com.txz.cif.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class BizLogDTO implements Serializable {
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String bizNo;
+
+    /**
+     * 类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请
+     */
+    private Integer type;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * c_biz_log
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 订单号
+     * @return biz_no 订单号
+     */
+    public String getBizNo() {
+        return bizNo;
+    }
+
+    /**
+     * 订单号
+     * @param bizNo 订单号
+     */
+    public void setBizNo(String bizNo) {
+        this.bizNo = bizNo;
+    }
+
+    /**
+     * 类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请
+     * @return type 类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * 类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请
+     * @param type 类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * 创建人
+     * @return create_user 创建人
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * 创建人
+     * @param createUser 创建人
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 7 - 0
cif-service/src/main/java/com/txz/cif/dao/BizLogMapper.java

@@ -0,0 +1,7 @@
+package com.txz.cif.dao;
+
+import com.txz.cif.core.Mapper;
+import com.txz.cif.model.BizLog;
+
+public interface BizLogMapper extends Mapper<BizLog> {
+}

+ 55 - 0
cif-service/src/main/java/com/txz/cif/model/BizLog.java

@@ -0,0 +1,55 @@
+package com.txz.cif.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value="com.txz.cif.model.BizLog")
+@Table(name = "c_biz_log")
+public class BizLog {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @Column(name = "biz_no")
+    @ApiModelProperty(value="bizNo订单号")
+    private String bizNo;
+
+    @Column(name = "biz_type")
+    @ApiModelProperty(value="类型1充值 2提现")
+    private String bizType;
+
+    /**
+     * type类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请 5提现审核通过 6提现审核失败 7提现调用第三方 8提现回调通知成功
+     */
+    @ApiModelProperty(value="type类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请 5提现审核通过 6提现审核失败 7提现调用第三方 8提现回调通知成功")
+    private Integer type;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    @ApiModelProperty(value="createUser创建人")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    @ApiModelProperty(value="createTime创建时间")
+    private Date createTime;
+
+
+}

+ 2 - 302
cif-service/src/main/java/com/txz/cif/model/WithdrawRecord.java

@@ -47,9 +47,9 @@ public class WithdrawRecord {
     private BigDecimal fee;
 
     /**
-     * 状态 1处理中 2提现成功 3提现失败 4超时取消
+     * 状态 1处理中 2审核通过请求第三方 3审核不通过 4提现成功 5提现失败 6超时取消
      */
-    @ApiModelProperty(value="status状态 1处理中 2提现成功 3提现失败 4超时取消")
+    @ApiModelProperty(value="status状态 1处理中 2审核通过请求第三方 3审核不通过 4提现成功 5提现失败 6超时取消")
     private Integer status;
 
     @Column(name = "account_type")
@@ -130,305 +130,5 @@ public class WithdrawRecord {
     @ApiModelProperty(value="version版本号")
     private String version;
 
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取订单号
-     *
-     * @return order_no - 订单号
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * 设置订单号
-     *
-     * @param orderNo 订单号
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    /**
-     * 获取用户id
-     *
-     * @return user_id - 用户id
-     */
-    public Long getUserId() {
-        return userId;
-    }
-
-    /**
-     * 设置用户id
-     *
-     * @param userId 用户id
-     */
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    /**
-     * 获取交易金额
-     *
-     * @return amount - 交易金额
-     */
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    /**
-     * 设置交易金额
-     *
-     * @param amount 交易金额
-     */
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    /**
-     * 获取手续费
-     *
-     * @return fee - 手续费
-     */
-    public BigDecimal getFee() {
-        return fee;
-    }
-
-    /**
-     * 设置手续费
-     *
-     * @param fee 手续费
-     */
-    public void setFee(BigDecimal fee) {
-        this.fee = fee;
-    }
-
-    /**
-     * 获取状态 1处理中 2提现成功 3提现失败 4超时取消
-     *
-     * @return status - 状态 1处理中 2提现成功 3提现失败 4超时取消
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1处理中 2提现成功 3提现失败 4超时取消
-     *
-     * @param status 状态 1处理中 2提现成功 3提现失败 4超时取消
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取渠道
-     *
-     * @return channel - 渠道
-     */
-    public String getChannel() {
-        return channel;
-    }
-
-    /**
-     * 设置渠道
-     *
-     * @param channel 渠道
-     */
-    public void setChannel(String channel) {
-        this.channel = channel;
-    }
-
-    /**
-     * 获取币种
-     *
-     * @return currency - 币种
-     */
-    public String getCurrency() {
-        return currency;
-    }
-
-    /**
-     * 设置币种
-     *
-     * @param currency 币种
-     */
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    /**
-     * 获取用户名
-     *
-     * @return user_name - 用户名
-     */
-    public String getUserName() {
-        return userName;
-    }
 
-    /**
-     * 设置用户名
-     *
-     * @param userName 用户名
-     */
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    /**
-     * 获取手机号
-     *
-     * @return user_phone - 手机号
-     */
-    public String getUserPhone() {
-        return userPhone;
-    }
-
-    /**
-     * 设置手机号
-     *
-     * @param userPhone 手机号
-     */
-    public void setUserPhone(String userPhone) {
-        this.userPhone = userPhone;
-    }
-
-    /**
-     * 获取交易时间
-     *
-     * @return trans_time - 交易时间
-     */
-    public Date getTransTime() {
-        return transTime;
-    }
-
-    /**
-     * 设置交易时间
-     *
-     * @param transTime 交易时间
-     */
-    public void setTransTime(Date transTime) {
-        this.transTime = transTime;
-    }
-
-    /**
-     * 获取交易成功时间
-     *
-     * @return success_time - 交易成功时间
-     */
-    public Date getSuccessTime() {
-        return successTime;
-    }
-
-    /**
-     * 设置交易成功时间
-     *
-     * @param successTime 交易成功时间
-     */
-    public void setSuccessTime(Date successTime) {
-        this.successTime = successTime;
-    }
-
-    /**
-     * 获取创建人
-     *
-     * @return create_user - 创建人
-     */
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    /**
-     * 设置创建人
-     *
-     * @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;
-    }
-
-    /**
-     * 获取版本号
-     *
-     * @return version - 版本号
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * 设置版本号
-     *
-     * @param version 版本号
-     */
-    public void setVersion(String version) {
-        this.version = version;
-    }
 }

+ 11 - 0
cif-service/src/main/java/com/txz/cif/service/BizLogService.java

@@ -0,0 +1,11 @@
+package com.txz.cif.service;
+import com.txz.cif.model.BizLog;
+import com.txz.cif.core.Service;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/29.
+ */
+public interface BizLogService extends Service<BizLog> {
+
+}

+ 22 - 0
cif-service/src/main/java/com/txz/cif/service/impl/BizLogServiceImpl.java

@@ -0,0 +1,22 @@
+package com.txz.cif.service.impl;
+
+import com.txz.cif.dao.BizLogMapper;
+import com.txz.cif.model.BizLog;
+import com.txz.cif.service.BizLogService;
+import com.txz.cif.core.AbstractService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/29.
+ */
+@Service
+@Transactional
+public class BizLogServiceImpl extends AbstractService<BizLog> implements BizLogService {
+    @Resource
+    private BizLogMapper cBizLogMapper;
+
+}

+ 17 - 1
cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -2,6 +2,7 @@ package com.txz.cif.web;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
@@ -14,7 +15,9 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.enums.BizTypeEnum;
 import com.txz.cif.util.IpUtils;
+import com.txz.cif.web.bo.EnumBo;
 import com.txz.cif.web.bo.UserBo;
 import com.txz.cif.web.bo.UserInfoBO;
 import com.txz.cif.web.para.LoginAccountParameters;
@@ -54,6 +57,19 @@ public class UserApiController extends AbstractApiController {
     @Resource
     private RedEnvelopeService redEnvelopeService;
 
+    @GetMapping("/getEnum")
+    @ApiOperation(value = "获取枚举(1支付方式)",httpMethod = "GET")
+    public Result<List<EnumBo>> getEnum(@RequestParam Integer id) {
+        if(id == null){
+            id = 1;
+        }
+        switch (id){
+            case 1:
+                return ResultGenerator.genSuccessResult(Arrays.stream(BizTypeEnum.values())
+                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build()).collect(Collectors.toList()));
+        }
+        return ResultGenerator.genSuccessResult();
+    }
 
 
     @ApiOperation(value = "用户登陆", notes = "",httpMethod = "POST")
@@ -125,7 +141,7 @@ public class UserApiController extends AbstractApiController {
             redisUtil.del(lastToken);
         }
         String token = authService.buildJwtToken( userId);
-    //设置redis缓存1小时
+        //设置redis缓存1小时
         if (dateTime == null) {
             dateTime = 7;
         }

+ 2 - 2
cif-service/src/main/java/com/txz/cif/web/bo/EnumBo.java

@@ -7,7 +7,7 @@ import lombok.*;
 
 /**
  * 枚举对象
- * @author :yuzhengqun
+ * @author :lxk
  * @date :Created in 2020/7/9 13:40
  */
 @Builder
@@ -28,7 +28,7 @@ public class EnumBo {
      * 编码
      */
     @ApiModelProperty("编码")
-    private Byte code;
+    private Integer code;
 
 
 }

+ 107 - 0
cif-service/src/main/java/com/txz/cif/web/bo/RechargeRecordBO.java

@@ -0,0 +1,107 @@
+package com.txz.cif.web.bo;
+
+import com.txz.cif.model.BizLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import javax.persistence.*;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+
+@ApiModel(value="充值对象")
+public class RechargeRecordBO {
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @ApiModelProperty(value="orderNo订单号")
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value="userId用户id")
+    private Long userId;
+
+    /**
+     * 交易金额
+     */
+    @ApiModelProperty(value="amount交易金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value="折扣金额")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value="钱包余额")
+    private BigDecimal walletBalance;
+
+    @ApiModelProperty(value="收益余额")
+    private BigDecimal earningsBalance;
+
+    /**
+     * 状态 1处理中 2充值成功 3充值失败 4超时取消
+     */
+    @ApiModelProperty(value="status状态 1处理中 2充值成功 3充值失败 4超时取消")
+    private Integer status;
+
+    /**
+     * 渠道
+     */
+    @ApiModelProperty(value="channel渠道")
+    private String channel;
+
+    /**
+     * 币种
+     */
+    @ApiModelProperty(value="currency币种")
+    private String currency;
+
+    /**
+     * 用户名
+     */
+    @Column(name = "user_name")
+    @ApiModelProperty(value="userName用户名")
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @Column(name = "user_phone")
+    @ApiModelProperty(value="userPhone手机号")
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    @Column(name = "trans_time")
+    @ApiModelProperty(value="transTime交易时间")
+    private Date transTime;
+
+    /**
+     * 交易成功时间
+     */
+    @Column(name = "success_time")
+    @ApiModelProperty(value="successTime交易成功时间")
+    private Date successTime;
+
+
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value="version版本号")
+    private String version;
+
+    @ApiModelProperty(value="日志")
+    private List<BizLog> bizLogs;
+
+}

+ 95 - 0
cif-service/src/main/java/com/txz/cif/web/bo/WithdrawRecordBO.java

@@ -0,0 +1,95 @@
+package com.txz.cif.web.bo;
+
+import com.txz.cif.model.BizLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import javax.persistence.*;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value="提现对象")
+public class WithdrawRecordBO {
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @ApiModelProperty(value="orderNo订单号")
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value="userId用户id")
+    private Long userId;
+
+    /**
+     * 交易金额
+     */
+    @ApiModelProperty(value="amount交易金额")
+    private BigDecimal amount;
+
+    /**
+     * 手续费
+     */
+    @ApiModelProperty(value="fee手续费")
+    private BigDecimal fee;
+
+    /**
+     * 状态 1处理中 2审核通过请求第三方 3审核不通过 4提现成功 5提现失败 6超时取消
+     */
+    @ApiModelProperty(value="status状态 1处理中 2审核通过请求第三方 3审核不通过 4提现成功 5提现失败 6超时取消")
+    private Integer status;
+
+    @ApiModelProperty(value="账号类型 1钱包 2收益")
+    private Integer accountType;
+
+    /**
+     * 渠道
+     */
+    @ApiModelProperty(value="channel渠道")
+    private String channel;
+
+    /**
+     * 币种
+     */
+    @ApiModelProperty(value="currency币种")
+    private String currency;
+
+    /**
+     * 用户名
+     */
+    @Column(name = "user_name")
+    @ApiModelProperty(value="userName用户名")
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value="userPhone手机号")
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    @ApiModelProperty(value="transTime交易时间")
+    private Date transTime;
+
+    /**
+     * 交易成功时间
+     */
+    @Column(name = "success_time")
+    @ApiModelProperty(value="successTime交易成功时间")
+    private Date successTime;
+
+    @ApiModelProperty(value="日志")
+    private List<BizLog> bizLogs;
+}

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

@@ -1,14 +1,18 @@
 package com.txz.cif.web.mng;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.BizLog;
 import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.service.BizLogService;
 import com.txz.cif.service.RechargeRecordService;
 
 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;
@@ -37,24 +41,33 @@ public class RechargeRecordController {
     @Resource
     private RechargeRecordService rechargeRecordService;
 
-
+	@Resource
+	private BizLogService bizLogService;
 
     @GetMapping("/detail")
 	@ApiOperation(value = "rechargeRecord获取详情",httpMethod = "GET")
-    public Result<RechargeRecord> detail(@RequestParam Integer id) {
+    public Result<RechargeRecordBO> detail(@RequestParam Integer id) {
     	if(id == null){
     		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
     	}
 
-    	RechargeRecord rechargeRecord = null;
     	try {
-    		rechargeRecord = rechargeRecordService.findById(id);
+			RechargeRecord rechargeRecord = rechargeRecordService.findById(id);
+			if (rechargeRecord == null){
+				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+			}
+			RechargeRecordBO bo = BeanUtil.toBean(rechargeRecord,RechargeRecordBO.class);
+			Condition c = new Condition(BizLog.class);
+			c.createCriteria().andEqualTo("bizType",1)
+					.andEqualTo("bizNo",rechargeRecord.getOrderNo());
+			List<BizLog> logs = bizLogService.findByCondition(c);
+			bo.setBizLogs(logs);
+			return ResultGenerator.genSuccessResult(bo);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
 		}
 
-        return ResultGenerator.genSuccessResult(rechargeRecord);
     }
 
     @PostMapping("/list")

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

@@ -1,15 +1,20 @@
 package com.txz.cif.web.mng;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.BizLog;
 import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.model.WithdrawRecord;
+import com.txz.cif.service.BizLogService;
 import com.txz.cif.service.WithdrawRecordService;
 
 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.bo.WithdrawRecordBO;
 import com.txz.cif.web.para.RecordParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
@@ -38,24 +43,33 @@ public class WithdrawRecordController {
     @Resource
     private WithdrawRecordService withdrawRecordService;
 
-
+	@Resource
+	private BizLogService bizLogService;
 
     @GetMapping("/detail")
 	@ApiOperation(value = "withdrawRecord获取详情",httpMethod = "GET")
-    public Result<WithdrawRecord> detail(@RequestParam Integer id) {
+    public Result<WithdrawRecordBO> detail(@RequestParam Integer id) {
     	if(id == null){
     		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
     	}
 
-    	WithdrawRecord withdrawRecord = null;
     	try {
-    		withdrawRecord = withdrawRecordService.findById(id);
+			WithdrawRecord withdrawRecord = withdrawRecordService.findById(id);
+			if (withdrawRecord == null){
+				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+			}
+			WithdrawRecordBO bo = BeanUtil.toBean(withdrawRecord,WithdrawRecordBO.class);
+			Condition c = new Condition(BizLog.class);
+			c.createCriteria().andEqualTo("bizType",2)
+					.andEqualTo("bizNo",withdrawRecord.getOrderNo());
+			List<BizLog> logs = bizLogService.findByCondition(c);
+			bo.setBizLogs(logs);
+			return ResultGenerator.genSuccessResult(bo);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
 			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
 		}
 
-        return ResultGenerator.genSuccessResult(withdrawRecord);
     }
 
     @PostMapping("/list")

+ 15 - 0
cif-service/src/main/resources/mapper/BizLogMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.txz.cif.dao.BizLogMapper">
+  <resultMap id="BaseResultMap" type="com.txz.cif.model.BizLog">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="biz_no" jdbcType="VARCHAR" property="bizNo" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="biz_type" jdbcType="INTEGER" property="bizType" />
+    <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+</mapper>