Commit b5da1bac authored by 吴琼's avatar 吴琼

修改成base64

parent 3def4efb
/*
package cn.quantgroup.customer.repo; package cn.quantgroup.customer.repo;
import cn.quantgroup.customer.entity.OfflineRepaySubmitRecord; import cn.quantgroup.customer.entity.OfflineRepaySubmitRecord;
...@@ -19,3 +20,4 @@ public interface OfflineRepaySubmitRecordRepo extends JpaRepository<OfflineRepay ...@@ -19,3 +20,4 @@ public interface OfflineRepaySubmitRecordRepo extends JpaRepository<OfflineRepay
OfflineRepaySubmitRecord findBySerialNoEqualsAndApprovalStatusEquals(String serialNo,Integer approvalStatus); OfflineRepaySubmitRecord findBySerialNoEqualsAndApprovalStatusEquals(String serialNo,Integer approvalStatus);
} }
*/
/*
package cn.quantgroup.customer.rest; package cn.quantgroup.customer.rest;
import cn.quantgroup.customer.aop.OperateLog; import cn.quantgroup.customer.aop.OperateLog;
...@@ -27,11 +28,13 @@ public class VccRest { ...@@ -27,11 +28,13 @@ public class VccRest {
@Autowired @Autowired
private IVccService vccService; private IVccService vccService;
/** */
/**
* 查询用户的待还款信息 * 查询用户的待还款信息
* @param query * @param query
* @return * @return
*/ *//*
@PostMapping("/offline_pre_repay/query_page") @PostMapping("/offline_pre_repay/query_page")
@OperateLog(moduleName = "查询用户的待还款信息") @OperateLog(moduleName = "查询用户的待还款信息")
public JsonResult queryPage(@RequestBody @Valid UserPreRepayInfoQuery query, BindingResult bindingResult){ public JsonResult queryPage(@RequestBody @Valid UserPreRepayInfoQuery query, BindingResult bindingResult){
...@@ -45,7 +48,7 @@ public class VccRest { ...@@ -45,7 +48,7 @@ public class VccRest {
return JsonResult.buildErrorStateResult("请求参数userId,phone,billId,orderNo不能同时为空"); return JsonResult.buildErrorStateResult("请求参数userId,phone,billId,orderNo不能同时为空");
} }
try { try {
JsonResult jsonResult = vccService.queryPage(query); JsonResult jsonResult = //vccService.queryPage(query);
log.info("queryPage | 结束用户待还款查询,param={}",query); log.info("queryPage | 结束用户待还款查询,param={}",query);
return jsonResult; return jsonResult;
} catch (Exception e){ } catch (Exception e){
...@@ -54,12 +57,14 @@ public class VccRest { ...@@ -54,12 +57,14 @@ public class VccRest {
} }
} }
/** */
/**
* 查询分期账单的详情 * 查询分期账单的详情
* @param uniqueId * @param uniqueId
* @param repayType * @param repayType
* @return * @return
*/ *//*
@GetMapping("/pre_repay_cal/detail") @GetMapping("/pre_repay_cal/detail")
@OperateLog(moduleName = "查询分期账单的详情") @OperateLog(moduleName = "查询分期账单的详情")
public JsonResult repayPlanDetail(@NotNull String uniqueId,@NotNull Integer repayType){ public JsonResult repayPlanDetail(@NotNull String uniqueId,@NotNull Integer repayType){
...@@ -74,12 +79,14 @@ public class VccRest { ...@@ -74,12 +79,14 @@ public class VccRest {
} }
} }
/** */
/**
* 保存线下还款的申请记录 * 保存线下还款的申请记录
* @param request * @param request
* @param param * @param param
* @return * @return
*/ *//*
@PostMapping("/offline_repay/save_submit") @PostMapping("/offline_repay/save_submit")
@OperateLog(moduleName = "保存线下还款的申请记录") @OperateLog(moduleName = "保存线下还款的申请记录")
public JsonResult saveSubmit(HttpServletRequest request, @RequestBody@Valid OfflineRepaySubmitParam param,BindingResult bindingResult){ public JsonResult saveSubmit(HttpServletRequest request, @RequestBody@Valid OfflineRepaySubmitParam param,BindingResult bindingResult){
...@@ -111,11 +118,13 @@ public class VccRest { ...@@ -111,11 +118,13 @@ public class VccRest {
} }
} }
/** */
/**
* 审批回显提交的线下还款申请记录 * 审批回显提交的线下还款申请记录
* @param serialNo * @param serialNo
* @return * @return
*/ *//*
@GetMapping("/offline_repay/approval") @GetMapping("/offline_repay/approval")
@OperateLog(moduleName = "审批回显提交的线下还款申请记录") @OperateLog(moduleName = "审批回显提交的线下还款申请记录")
public JsonResult approval(@NotNull String serialNo){ public JsonResult approval(@NotNull String serialNo){
...@@ -130,11 +139,13 @@ public class VccRest { ...@@ -130,11 +139,13 @@ public class VccRest {
} }
} }
/** */
/**
* 查看审批流水记录 * 查看审批流水记录
* @param serialNo * @param serialNo
* @return * @return
*/ *//*
@GetMapping("/approval/detail") @GetMapping("/approval/detail")
@OperateLog(moduleName = "查看审批流水记录") @OperateLog(moduleName = "查看审批流水记录")
public JsonResult queryApprovalRecord(@NotNull String serialNo){ public JsonResult queryApprovalRecord(@NotNull String serialNo){
...@@ -149,14 +160,16 @@ public class VccRest { ...@@ -149,14 +160,16 @@ public class VccRest {
} }
} }
/** */
/**
* 审批结果:通过/拒绝 * 审批结果:通过/拒绝
* @param request * @param request
* @param serialNo * @param serialNo
* @param remark * @param remark
* @param status * @param status
* @return * @return
*/ *//*
@GetMapping("/approval/result") @GetMapping("/approval/result")
@OperateLog(moduleName = "审批结果:通过/拒绝") @OperateLog(moduleName = "审批结果:通过/拒绝")
public JsonResult approvalResult(HttpServletRequest request,@NotNull String serialNo,String remark,@NotNull Integer status){ public JsonResult approvalResult(HttpServletRequest request,@NotNull String serialNo,String remark,@NotNull Integer status){
...@@ -172,11 +185,13 @@ public class VccRest { ...@@ -172,11 +185,13 @@ public class VccRest {
} }
} }
/** */
/**
* 上传打款凭证 * 上传打款凭证
* @param file * @param file
* @return * @return
*/ *//*
@PostMapping("/offline_repay_file/upload") @PostMapping("/offline_repay_file/upload")
@OperateLog(moduleName = "上传打款凭证") @OperateLog(moduleName = "上传打款凭证")
public JsonResult fileUpload (MultipartFile file){ public JsonResult fileUpload (MultipartFile file){
...@@ -191,11 +206,13 @@ public class VccRest { ...@@ -191,11 +206,13 @@ public class VccRest {
} }
} }
/** */
/**
* 查询线下还款的申请记录 * 查询线下还款的申请记录
* @param query * @param query
* @return * @return
*/ *//*
@PostMapping("/approval/query_applly_record") @PostMapping("/approval/query_applly_record")
@OperateLog(moduleName = "查询线下还款的申请记录") @OperateLog(moduleName = "查询线下还款的申请记录")
public JsonResult queryApplyRecord(@RequestBody@Valid UserPreRepayInfoQuery query,BindingResult bindingResult){ public JsonResult queryApplyRecord(@RequestBody@Valid UserPreRepayInfoQuery query,BindingResult bindingResult){
...@@ -218,3 +235,4 @@ public class VccRest { ...@@ -218,3 +235,4 @@ public class VccRest {
} }
} }
} }
*/
...@@ -385,8 +385,13 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR ...@@ -385,8 +385,13 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
File file = ZipUtil.zip(downloadLocalPath, downloadLocalPath+".zip");//zip 包保存路径 File file = ZipUtil.zip(downloadLocalPath, downloadLocalPath+".zip");//zip 包保存路径
FileInputStream is = new FileInputStream(file); FileInputStream is = new FileInputStream(file);
byte[] fileData = IOUtils.readNBytes(is, is.available()); byte[] fileData = IOUtils.readNBytes(is, is.available());
Map<String,Object> map = new HashMap<>();
map.put("base64",Base64.getEncoder().encodeToString(fileData));
map.put("successCount",100);
map.put("failCount",20);
return JsonResult.buildSuccessResult("ok",map);
//返回给前端 //返回给前端
return this.outputFile(response,"交易凭证.zip",fileData ,100,20); //sreturn this.outputFile(response,"交易凭证.zip",fileData ,100,20);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment