Skip to content

C
customer-service
Commit 9ec20093 authored by 吴琼's avatar 吴琼
Browse files
Options

合并master

parents aed1a2fc e984cf57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 679 additions and 324 deletions
pom.xml
View file @ 9ec20093
......@@ -52,7 +52,7 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<!-- <plugin>
<plugin>
<groupId>com.mysema.maven</groupId>
<artifactId>apt-maven-plugin</artifactId>
<version>1.1.3</version>
......@@ -67,7 +67,7 @@
</configuration>
</execution>
</executions>
</plugin>-->
</plugin>
</plugins>
</build>
......@@ -271,27 +271,6 @@
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13</version>
</dependency>
<dependency>
<groupId>com.itextpdf.tool</groupId>
<artifactId>xmlworker</artifactId>
<version>5.5.6</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.4.1</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.54</version>
</dependency>
<!--<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<version>4.2.1</version>
......@@ -302,8 +281,9 @@
<artifactId>querydsl-apt</artifactId>
<version>4.2.1</version>
<scope>provided</scope>
</dependency>-->
</dependency>
<!-- fastdfs start -->
<dependency>
<groupId>com.github.tobato</groupId>
<artifactId>fastdfs-client</artifactId>
......@@ -334,6 +314,22 @@
<artifactId>jsch</artifactId>
<version>0.1.54</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13</version>
</dependency>
<dependency>
<groupId>com.itextpdf.tool</groupId>
<artifactId>xmlworker</artifactId>
<version>5.5.6</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.4.1</version>
</dependency>
</dependencies>
</project>
src/main/java/cn/quantgroup/customer/repo/OfflineRepaySubmitRecordRepo.java
View file @ 9ec20093
/*
package cn.quantgroup.customer.repo;
import cn.quantgroup.customer.entity.OfflineRepaySubmitRecord;
......@@ -20,4 +19,3 @@ public interface OfflineRepaySubmitRecordRepo extends JpaRepository<OfflineRepay
OfflineRepaySubmitRecord findBySerialNoEqualsAndApprovalStatusEquals(String serialNo,Integer approvalStatus);
}
*/
src/main/java/cn/quantgroup/customer/rest/VccRest.java
View file @ 9ec20093
/*
package cn.quantgroup.customer.rest;
import cn.quantgroup.customer.aop.OperateLog;
......@@ -28,13 +27,11 @@ public class VccRest {
@Autowired
private IVccService vccService;
*/
/**
/**
* 查询用户的待还款信息
* @param query
* @return
*//*
*/
@PostMapping("/offline_pre_repay/query_page")
@OperateLog(moduleName = "查询用户的待还款信息")
public JsonResult queryPage(@RequestBody @Valid UserPreRepayInfoQuery query, BindingResult bindingResult){
......@@ -48,7 +45,7 @@ public class VccRest {
return JsonResult.buildErrorStateResult("请求参数userId，phone，billId，orderNo不能同时为空");
}
try {
JsonResult jsonResult = //vccService.queryPage(query);
JsonResult jsonResult = vccService.queryPage(query);
log.info("queryPage | 结束用户待还款查询，param={}",query);
return jsonResult;
} catch (Exception e){
......@@ -57,14 +54,12 @@ public class VccRest {
}
}
*/
/**
/**
* 查询分期账单的详情
* @param uniqueId
* @param repayType
* @return
*//*
*/
@GetMapping("/pre_repay_cal/detail")
@OperateLog(moduleName = "查询分期账单的详情")
public JsonResult repayPlanDetail(@NotNull String uniqueId,@NotNull Integer repayType){
......@@ -79,14 +74,12 @@ public class VccRest {
}
}
*/
/**
/**
* 保存线下还款的申请记录
* @param request
* @param param
* @return
*//*
*/
@PostMapping("/offline_repay/save_submit")
@OperateLog(moduleName = "保存线下还款的申请记录")
public JsonResult saveSubmit(HttpServletRequest request, @RequestBody@Valid OfflineRepaySubmitParam param,BindingResult bindingResult){
......@@ -118,13 +111,11 @@ public class VccRest {
}
}
*/
/**
/**
* 审批回显提交的线下还款申请记录
* @param serialNo
* @return
*//*
*/
@GetMapping("/offline_repay/approval")
@OperateLog(moduleName = "审批回显提交的线下还款申请记录")
public JsonResult approval(@NotNull String serialNo){
......@@ -139,13 +130,11 @@ public class VccRest {
}
}
*/
/**
/**
* 查看审批流水记录
* @param serialNo
* @return
*//*
*/
@GetMapping("/approval/detail")
@OperateLog(moduleName = "查看审批流水记录")
public JsonResult queryApprovalRecord(@NotNull String serialNo){
......@@ -160,16 +149,14 @@ public class VccRest {
}
}
*/
/**
/**
* 审批结果：通过/拒绝
* @param request
* @param serialNo
* @param remark
* @param status
* @return
*//*
*/
@GetMapping("/approval/result")
@OperateLog(moduleName = "审批结果：通过/拒绝")
public JsonResult approvalResult(HttpServletRequest request,@NotNull String serialNo,String remark,@NotNull Integer status){
......@@ -185,13 +172,11 @@ public class VccRest {
}
}
*/
/**
/**
* 上传打款凭证
* @param file
* @return
*//*
*/
@PostMapping("/offline_repay_file/upload")
@OperateLog(moduleName = "上传打款凭证")
public JsonResult fileUpload (MultipartFile file){
......@@ -206,13 +191,11 @@ public class VccRest {
}
}
*/
/**
/**
* 查询线下还款的申请记录
* @param query
* @return
*//*
*/
@PostMapping("/approval/query_applly_record")
@OperateLog(moduleName = "查询线下还款的申请记录")
public JsonResult queryApplyRecord(@RequestBody@Valid UserPreRepayInfoQuery query,BindingResult bindingResult){
......@@ -235,4 +218,3 @@ public class VccRest {
}
}
}
*/
src/main/java/cn/quantgroup/customer/service/IFastDFSService.java
View file @ 9ec20093
package cn.quantgroup.customer.service;
import java.io.IOException;
import java.io.InputStream;
/**
* fastDFS 接入 http://confluence.quantgroup.cn/x/bMU5AQ
*
* @author jingfeng.guo
* @since 2019-08-24 17:04
*/
public interface IFastDFSService {
/**
* 上传文件
*
* @param fileInput
* @param fileSize
* @param fileExtName 扩展名
* @return
* @throws IOException
*/
String uploadFile(InputStream fileInput, Long fileSize, String fileExtName) throws IOException;
/**
* 上传文件
*
* @param bytes
* @param fileExtName
* @return
* @throws IOException
*/
String uploadFile(byte[] bytes, String fileExtName) throws IOException;
/**
* 文件上传, 下载url 再传
*
* @param url
* @param fileExtName
* @return
* @throws IOException
*/
String uploadFile(String url, String fileExtName) throws IOException;
/**
* 上传文件 base64
*
* @param base64String
* @param fileExtName
* @return
* @throws IOException
*/
String uploadFileOfBase64String(String base64String, String fileExtName) throws IOException;
/**
* 下载文件
*
* @param path
* @return
* @throws IOException
*/
byte[] downloadFile(String path) throws IOException;
/**
* 转成一个临时可用的url
*
* @param path
* @return
* @throws IOException
*/
String toUrl(String path) throws IOException;
}
//package cn.quantgroup.customer.service;
//
//import java.io.IOException;
//import java.io.InputStream;
//
///**
// * fastDFS 接入 http://confluence.quantgroup.cn/x/bMU5AQ
// *
// * @author jingfeng.guo
// * @since 2019-08-24 17:04
// */
//
//public interface IFastDFSService {
//
// /**
// * 上传文件
// *
// * @param fileInput
// * @param fileSize
// * @param fileExtName 扩展名
// * @return
// * @throws IOException
// */
// String uploadFile(InputStream fileInput, Long fileSize, String fileExtName) throws IOException;
//
// /**
// * 上传文件
// *
// * @param bytes
// * @param fileExtName
// * @return
// * @throws IOException
// */
// String uploadFile(byte[] bytes, String fileExtName) throws IOException;
//
// /**
// * 文件上传, 下载url 再传
// *
// * @param url
// * @param fileExtName
// * @return
// * @throws IOException
// */
// String uploadFile(String url, String fileExtName) throws IOException;
//
//
// /**
// * 上传文件 base64
// *
// * @param base64String
// * @param fileExtName
// * @return
// * @throws IOException
// */
// String uploadFileOfBase64String(String base64String, String fileExtName) throws IOException;
//
// /**
// * 下载文件
// *
// * @param path
// * @return
// * @throws IOException
// */
// byte[] downloadFile(String path) throws IOException;
//
// /**
// * 转成一个临时可用的url
// *
// * @param path
// * @return
// * @throws IOException
// */
// String toUrl(String path) throws IOException;
//}
src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java
View file @ 9ec20093
......@@ -9,8 +9,6 @@ import cn.quantgroup.customer.repo.TransactionReceiptRecordRepo;
import cn.quantgroup.customer.rest.param.transactionreceipt.TransactionReceiptRecordQuery;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.rest.vo.transaction.*;
import cn.quantgroup.customer.service.IFastDFSService;
import cn.quantgroup.customer.service.IFileService;
import cn.quantgroup.customer.service.ITransactionReceiptRecordService;
import cn.quantgroup.customer.service.http.IHttpService;
import cn.quantgroup.customer.util.ExcelUtil;
......
src/test/xiaoman/WorkOrderTest.java
View file @ 9ec20093
......@@ -31,8 +31,7 @@ public class WorkOrderTest {
@Autowired
private IWorkOrderService workOrderService;
@Autowired
private IHttpService httpService;
@Test
public void queryPage() {
......@@ -40,14 +39,6 @@ public class WorkOrderTest {
System.out.println(JSONTools.serialize(pageJsonResult));
}
@Test
public void testUser (){
String url ="https://passportapi-qa2.liangkebang.net/api/sync/listByUserIds?userIds=70356056,70356055";
String result = httpService.get(url);
JSONObject userJsonObject = JSONObject.parseObject(userResult);
JSONObject userData = userJsonObject.getJSONObject("data");
}
public static void main(String[] args) {
System.out.println(DesensitizeUtil.mobileDesensitization("13597778033"));
System.out.println(DesensitizeUtil.idcardDesensitization("422802199007261711"));
......
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