linxk 2 долоо хоног өмнө
parent
commit
736f7d734e

+ 2 - 2
cif-service/src/main/java/com/txz/cif/core/ResultCode.java

@@ -29,7 +29,7 @@ public enum ResultCode {
     SEQ_IS_NULL("6004", "排序不能为空"),
     USERID_IS_NULL("6006", "用户id不能为空"),
     RESULT_IS_NULL("6007", "查询结果为空"),
-    TYPE_IS_NULL("6008", "查询结果为空"),
+    TYPE_IS_NULL("6008", "类型为空"),
     SQL_ERROR("6009", "数据库异常"),
     OPERATOR_IS_NULL("1001", "没有找到该用户的操作员信息"),
     OPERATOR_IS_ERROR("1002", "该用户的操作员信息有误"),
@@ -60,7 +60,7 @@ public enum ResultCode {
     LOGINACCOUNT_IS_NULL("1068", "登录账号不能为空"),
     ORG_IS_NULL("1069", "组织机构未找到" ),
     USER_IS_EXIST("7008", "用户已注册"), CODE_CHECK_FAIL("1070", "验证码校验失败"),
-    BANK_IS_NULL("1071", "提现银行不能为空" );
+    BANK_IS_NULL("1071", "提现银行不能为空" ), REVIEW_IS_NULL("1072", "审核内容为空");
 
     private final String code;   //状态码
     private final String message;

+ 4 - 0
cif-service/src/main/java/com/txz/cif/model/WithdrawRecord.java

@@ -27,6 +27,10 @@ public class WithdrawRecord {
     @ApiModelProperty(value="orderNo订单号")
     private String orderNo;
 
+
+    @ApiModelProperty(value="审核内容")
+    private String review;
+
     /**
      * 用户id
      */

+ 2 - 0
cif-service/src/main/java/com/txz/cif/service/WithdrawRecordService.java

@@ -9,4 +9,6 @@ import com.txz.cif.core.Service;
 public interface WithdrawRecordService extends Service<WithdrawRecord> {
 
     void add(WithdrawRecord withdrawRecord);
+
+    void review(WithdrawRecord build);
 }

+ 8 - 0
cif-service/src/main/java/com/txz/cif/service/impl/WithdrawRecordServiceImpl.java

@@ -46,4 +46,12 @@ public class WithdrawRecordServiceImpl extends AbstractService<WithdrawRecord> i
                         .status(1)
                 .build());
     }
+
+    @Override
+    public void review(WithdrawRecord record) {
+        if (record.getStatus() == 2){
+            //TODO 发起第三方提现
+        }
+        update(record);
+    }
 }

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

@@ -95,14 +95,12 @@ public class RechargeRecordBO {
     /**
      * 交易时间
      */
-    @Column(name = "trans_time")
     @ApiModelProperty(value="transTime交易时间")
     private Date transTime;
 
     /**
      * 交易成功时间
      */
-    @Column(name = "success_time")
     @ApiModelProperty(value="successTime交易成功时间")
     private Date successTime;
 

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

@@ -67,7 +67,6 @@ public class WithdrawRecordBO {
     /**
      * 用户名
      */
-    @Column(name = "user_name")
     @ApiModelProperty(value="userName用户名")
     private String userName;
 
@@ -86,7 +85,6 @@ public class WithdrawRecordBO {
     /**
      * 交易成功时间
      */
-    @Column(name = "success_time")
     @ApiModelProperty(value="successTime交易成功时间")
     private Date successTime;
 
@@ -99,6 +97,9 @@ public class WithdrawRecordBO {
     @ApiModelProperty(value="收益余额")
     private BigDecimal earningsBalance;
 
+    @ApiModelProperty(value="审核内容")
+    private String review;
+
     @ApiModelProperty(value="银行")
     private String bank;
 

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

@@ -18,6 +18,7 @@ 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 com.txz.cif.web.para.ReviewParam;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,7 +87,37 @@ public class WithdrawRecordController {
 
     }
 
-    @PostMapping("/list")
+	@PostMapping("/review")
+	@ApiOperation(value = "审核",httpMethod = "POST")
+	public Result review(@RequestBody ReviewParam param) {
+		if (param == null){
+			return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+		}
+		if (param.getId() == null){
+			return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+		}
+		if (param.getType() == null){
+			return ResultGenerator.genFailResult(ResultCode.TYPE_IS_NULL);
+		}
+		if (param.getType() == 2){
+			if (StrUtil.isNotBlank(param.getReview())){
+				return ResultGenerator.genFailResult(ResultCode.REVIEW_IS_NULL);
+			}
+		}
+		WithdrawRecord w = withdrawRecordService.findById(param.getId());
+		if (w == null){
+			return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+		}
+		if (w.getStatus() != 1){
+			return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
+		}
+
+		withdrawRecordService.review(WithdrawRecord.builder().id(param.getId())
+				.review(param.getReview()).status(param.getType() == 1?2:3).build());
+		return ResultGenerator.genSuccessResult();
+	}
+
+		@PostMapping("/list")
 	@ApiOperation(value = "withdrawRecord获取列表",httpMethod = "POST")
 	public Result<List<WithdrawRecord>> list(@RequestBody RecordParam param) {
 

+ 34 - 0
cif-service/src/main/java/com/txz/cif/web/para/ReviewParam.java

@@ -0,0 +1,34 @@
+package com.txz.cif.web.para;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+
+@ApiModel(value="审核入参")
+public class ReviewParam {
+
+
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 审核内容
+     */
+    @ApiModelProperty(value="审核内容")
+    private String review;
+
+    @ApiModelProperty(value="类型 1通过 2不通过")
+    private Integer type;
+
+
+
+}

+ 4 - 0
cif-service/src/main/resources/mapper/WithdrawRecordMapper.xml

@@ -30,5 +30,9 @@
 
     <result column="bank_account" jdbcType="VARCHAR" property="bankAccount" />
 
+    <result column="review" jdbcType="VARCHAR" property="review" />
+
+
+
   </resultMap>
 </mapper>