Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserWithdrawalController.java

@@ -3,12 +3,14 @@ package com.yonge.cooleshow.admin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.biz.dal.dto.excel.UserWithdrawalExport;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.*;
 import io.swagger.annotations.*;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -17,6 +19,7 @@ import com.yonge.cooleshow.biz.dal.vo.UserWithdrawalVo;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.service.UserWithdrawalService;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 @RestController
@@ -57,26 +60,26 @@ public class UserWithdrawalController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('userWithdrawal/exportExcel')")
     public void exportExcel(@RequestBody TeacherWithdrawalSearch query) {
         List<UserWithdrawalVo> withdrawalVoList = userWithdrawalService.selectList(query);
-        /*List<UserWithdrawalExport> list = new ArrayList<>();
+        List<UserWithdrawalExport> list = new ArrayList<>();
         withdrawalVoList.forEach(o -> {
             UserWithdrawalExport export = new UserWithdrawalExport();
             try {
                 BeanUtils.copyProperties(export, o);
-                StringBuffer buffer = new StringBuffer(export.getId().toString());
+                /*StringBuffer buffer = new StringBuffer(export.getId().toString());
                 buffer.append(export.getUserId());
                 buffer.append(export.getAmount().setScale(2, RoundingMode.HALF_UP));
                 buffer.append(export.getPlantformFee().setScale(2, RoundingMode.HALF_UP));
                 buffer.append(export.getActualAmount().setScale(2, RoundingMode.HALF_UP));
                 String s = DigestUtils.md5DigestAsHex(buffer.toString().getBytes());
-                export.setSign(s);
+                export.setSign(s);*/
                 list.add(export);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             } catch (InvocationTargetException e) {
                 e.printStackTrace();
             }
-        });*/
-        ExcelUtils.exportExcel(withdrawalVoList, "提现列表数据" + System.currentTimeMillis(),
+        });
+        ExcelUtils.exportExcel(list, "提现列表数据" + System.currentTimeMillis(),
                 "列表数据");
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/convert/WithdrawalStatusConvert.java

@@ -6,12 +6,13 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.toolset.payment.base.enums.TradeStatusEnum;
 
 /**
  * @Author: liweifan
  * @Data: 2022/4/15 15:36
  */
-public class WithdrawalStatusConvert implements Converter<AuthStatusEnum> {
+public class WithdrawalStatusConvert implements Converter<TradeStatusEnum> {
 
     @Override
     public Class supportJavaTypeKey() {
@@ -24,18 +25,18 @@ public class WithdrawalStatusConvert implements Converter<AuthStatusEnum> {
     }
 
     @Override
-    public AuthStatusEnum convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+    public TradeStatusEnum convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         try {
-            return AuthStatusEnum.valueOf(cellData.getStringValue().trim());
+            return TradeStatusEnum.valueOf(cellData.getStringValue().trim());
         } catch (Exception e) {
             return null;
         }
     }
 
     @Override
-    public CellData convertToExcelData(AuthStatusEnum statusEnum, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+    public CellData convertToExcelData(TradeStatusEnum statusEnum, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         if (null != statusEnum) {
-            return new CellData(statusEnum.getName());
+            return new CellData(statusEnum.getMsg());
         }
         return new CellData("异常数据");
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/excel/UserWithdrawalExport.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.convert.WithdrawalStatusConvert;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.toolset.payment.base.enums.TradeStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
@@ -39,14 +40,14 @@ public class UserWithdrawalExport {
 
     @NotNull(message = "提现状态不能为空")
     @ExcelProperty(value = "提现状态 审核中/通过/不通过", index = 8,converter = WithdrawalStatusConvert.class)
-    private AuthStatusEnum status;
-    @ExcelProperty(value = "审核原因", index = 9)
-    private String verifyReason;
+    private TradeStatusEnum status;
+    /*@ExcelProperty(value = "审核原因", index = 9)
+    private String verifyReason;*/
     @ExcelProperty(value = "银行流水号", index = 10)
     private String bankFlowNo;
-    @NotBlank(message = "签名不能为空")
+    /*@NotBlank(message = "签名不能为空")
     @ExcelProperty(value = "签名", index = 11)
-    private String sign;
+    private String sign;*/
 
     public Long getId() {
         return id;
@@ -120,15 +121,15 @@ public class UserWithdrawalExport {
         this.bankFlowNo = bankFlowNo;
     }
 
-    public AuthStatusEnum getStatus() {
+    public TradeStatusEnum getStatus() {
         return status;
     }
 
-    public void setStatus(AuthStatusEnum status) {
+    public void setStatus(TradeStatusEnum status) {
         this.status = status;
     }
 
-    public String getVerifyReason() {
+    /*public String getVerifyReason() {
         return verifyReason;
     }
 
@@ -142,5 +143,5 @@ public class UserWithdrawalExport {
 
     public void setSign(String sign) {
         this.sign = sign;
-    }
+    }*/
 }