Commit 47856f5e authored by yexiong.wang's avatar yexiong.wang

edit

parent 7304bf8b
...@@ -5,6 +5,7 @@ import org.hibernate.annotations.DynamicInsert; ...@@ -5,6 +5,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Entity @Entity
...@@ -17,8 +18,9 @@ import java.time.LocalDateTime; ...@@ -17,8 +18,9 @@ import java.time.LocalDateTime;
@NoArgsConstructor @NoArgsConstructor
@DynamicUpdate @DynamicUpdate
@DynamicInsert @DynamicInsert
public class OfflineRepayOperateRecord { public class OfflineRepayOperateRecord implements Serializable {
private static final long serialVersionUID = -9206318459421433518L;
@Id @Id
@Column(name = "id") @Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -5,6 +5,7 @@ import org.hibernate.annotations.DynamicInsert; ...@@ -5,6 +5,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -20,8 +21,9 @@ import java.util.Date; ...@@ -20,8 +21,9 @@ import java.util.Date;
@NoArgsConstructor @NoArgsConstructor
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
public class OfflineRepaySubmitRecord { public class OfflineRepaySubmitRecord implements Serializable {
private static final long serialVersionUID = 2930019435843122345L;
@Id @Id
@Column(name = "id") @Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
package cn.quantgroup.customer.rest; package cn.quantgroup.customer.rest;
import cn.quantgroup.customer.aop.OperateLog;
import cn.quantgroup.customer.rest.param.vcc.OfflineRepaySubmitParam; import cn.quantgroup.customer.rest.param.vcc.OfflineRepaySubmitParam;
import cn.quantgroup.customer.rest.param.vcc.UserPreRepayInfoQuery; import cn.quantgroup.customer.rest.param.vcc.UserPreRepayInfoQuery;
import cn.quantgroup.customer.rest.vo.JsonResult; import cn.quantgroup.customer.rest.vo.JsonResult;
...@@ -48,7 +49,7 @@ public class VccRest { ...@@ -48,7 +49,7 @@ public class VccRest {
return jsonResult; return jsonResult;
} catch (Exception e){ } catch (Exception e){
log.error("queryPage | 用户待还款查询发生异常",e); log.error("queryPage | 用户待还款查询发生异常",e);
return JsonResult.buildErrorStateResult("用户待还款查询发生异常"); return JsonResult.buildErrorStateResult("用户待还款查询发生异常:"+ e.getMessage());
} }
} }
...@@ -67,7 +68,7 @@ public class VccRest { ...@@ -67,7 +68,7 @@ public class VccRest {
return jsonResult; return jsonResult;
} catch (Exception e){ } catch (Exception e){
log.error("repayPlanDetail | 查询用户分期的详情及试算详情发生异常",e); log.error("repayPlanDetail | 查询用户分期的详情及试算详情发生异常",e);
return JsonResult.buildErrorStateResult("查询用户分期的详情及试算详情发生异常"); return JsonResult.buildErrorStateResult("查询用户分期的详情及试算详情发生异常:"+e.getMessage());
} }
} }
...@@ -78,6 +79,7 @@ public class VccRest { ...@@ -78,6 +79,7 @@ public class VccRest {
* @return * @return
*/ */
@PostMapping("/offline_repay/save_submit") @PostMapping("/offline_repay/save_submit")
@OperateLog
public JsonResult saveSubmit(HttpServletRequest request, @RequestBody@Valid OfflineRepaySubmitParam param,BindingResult bindingResult){ public JsonResult saveSubmit(HttpServletRequest request, @RequestBody@Valid OfflineRepaySubmitParam param,BindingResult bindingResult){
if (bindingResult.hasErrors()){ if (bindingResult.hasErrors()){
return JsonResult.buildErrorStateResult(bindingResult.getFieldError().getField() + ":" + bindingResult.getFieldError().getDefaultMessage()); return JsonResult.buildErrorStateResult(bindingResult.getFieldError().getField() + ":" + bindingResult.getFieldError().getDefaultMessage());
...@@ -103,7 +105,7 @@ public class VccRest { ...@@ -103,7 +105,7 @@ public class VccRest {
return JsonResult.buildSuccessResult("请求成功",null); return JsonResult.buildSuccessResult("请求成功",null);
} catch (Exception e){ } catch (Exception e){
log.error("saveSubmit | 保存线下还款提交申请时发生异常",e); log.error("saveSubmit | 保存线下还款提交申请时发生异常",e);
return JsonResult.buildErrorStateResult("保存线下还款提交申请时发生异常"); return JsonResult.buildErrorStateResult("保存线下还款提交申请时发生异常:"+e.getMessage());
} }
} }
...@@ -121,7 +123,7 @@ public class VccRest { ...@@ -121,7 +123,7 @@ public class VccRest {
return JsonResult.buildSuccessResult("请求成功",param); return JsonResult.buildSuccessResult("请求成功",param);
} catch (Exception e){ } catch (Exception e){
log.error("approval | 点击审批按钮查询信息时发生异常",e); log.error("approval | 点击审批按钮查询信息时发生异常",e);
return JsonResult.buildErrorStateResult("点击审批按钮查询信息时发生异常"); return JsonResult.buildErrorStateResult("点击审批按钮查询信息时发生异常:",e.getMessage());
} }
} }
...@@ -139,7 +141,7 @@ public class VccRest { ...@@ -139,7 +141,7 @@ public class VccRest {
return jsonResult; return jsonResult;
} catch (Exception e){ } catch (Exception e){
log.error("queryApprovalRecord | 查询审批流水时发生异常",e); log.error("queryApprovalRecord | 查询审批流水时发生异常",e);
return JsonResult.buildErrorStateResult("查询审批流水时发生异常"); return JsonResult.buildErrorStateResult("查询审批流水时发生异常:"+e.getMessage());
} }
} }
...@@ -152,6 +154,7 @@ public class VccRest { ...@@ -152,6 +154,7 @@ public class VccRest {
* @return * @return
*/ */
@GetMapping("/approval/result") @GetMapping("/approval/result")
@OperateLog
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){
log.info("approvalResult | 开始提交审批结果,serialNo={},remark={},status={}",serialNo,remark,status); log.info("approvalResult | 开始提交审批结果,serialNo={},remark={},status={}",serialNo,remark,status);
try { try {
...@@ -161,7 +164,7 @@ public class VccRest { ...@@ -161,7 +164,7 @@ public class VccRest {
return JsonResult.buildSuccessResult("请求成功",null); return JsonResult.buildSuccessResult("请求成功",null);
}catch (Exception e){ }catch (Exception e){
log.error("approvalResult | 通过/拒绝审批时发生异常",e); log.error("approvalResult | 通过/拒绝审批时发生异常",e);
return JsonResult.buildErrorStateResult("通过/拒绝审批时发生异常"); return JsonResult.buildErrorStateResult("通过/拒绝审批时发生异常:"+ e.getMessage());
} }
} }
...@@ -179,7 +182,7 @@ public class VccRest { ...@@ -179,7 +182,7 @@ public class VccRest {
return JsonResult.buildSuccessResult("请求成功",map); return JsonResult.buildSuccessResult("请求成功",map);
}catch (Exception e){ }catch (Exception e){
log.error("fileUpload | 文件上传时发生异常",e); log.error("fileUpload | 文件上传时发生异常",e);
return JsonResult.buildErrorStateResult("文件上传时发生异常"); return JsonResult.buildErrorStateResult("文件上传时发生异常:"+e.getMessage());
} }
} }
...@@ -205,7 +208,7 @@ public class VccRest { ...@@ -205,7 +208,7 @@ public class VccRest {
return jsonResult; return jsonResult;
}catch (Exception e){ }catch (Exception e){
log.error("queryApplyRecord | 查询线下还款申请记录时发生异常",e); log.error("queryApplyRecord | 查询线下还款申请记录时发生异常",e);
return JsonResult.buildErrorStateResult("查询线下还款申请记录时发生异常"); return JsonResult.buildErrorStateResult("查询线下还款申请记录时发生异常:"+e.getMessage());
} }
} }
} }
...@@ -59,12 +59,8 @@ public class VccServiceImpl implements IVccService { ...@@ -59,12 +59,8 @@ public class VccServiceImpl implements IVccService {
@Autowired @Autowired
private IFastDFSService fastDfsService; private IFastDFSService fastDfsService;
private final UserSdkImpl userSdk;
@Autowired @Autowired
public VccServiceImpl(UserSdkImpl userSdk) { private UserSdkImpl userSdk;
this.userSdk = userSdk;
}
@Override @Override
public JsonResult queryPage(UserPreRepayInfoQuery query) throws Exception{ public JsonResult queryPage(UserPreRepayInfoQuery query) throws Exception{
...@@ -197,7 +193,12 @@ public class VccServiceImpl implements IVccService { ...@@ -197,7 +193,12 @@ public class VccServiceImpl implements IVccService {
param.setList(billList); param.setList(billList);
String[] split = bySerialNoEquals.getCredentialsAddress().split(","); String[] split = bySerialNoEquals.getCredentialsAddress().split(",");
List<String> list = Arrays.asList(split); List<String> list = Arrays.asList(split);
param.setCredentialsAddress(list); List<String> addressList = new ArrayList<>();
for (String baseUrl:list){
String viewUrl = fastDfsService.toUrl(baseUrl);
addressList.add(viewUrl);
}
param.setCredentialsAddress(addressList);
return param; return param;
} }
...@@ -277,6 +278,7 @@ public class VccServiceImpl implements IVccService { ...@@ -277,6 +278,7 @@ public class VccServiceImpl implements IVccService {
String phone = ""; String phone = "";
if (StringUtils.isNotBlank(query.getUserId())){ if (StringUtils.isNotBlank(query.getUserId())){
log.info("userSdk={}",userSdk);
UserSysResult<XUser> userByUserId = userSdk.getService().findUserByUserId(Long.getLong(query.getUserId())); UserSysResult<XUser> userByUserId = userSdk.getService().findUserByUserId(Long.getLong(query.getUserId()));
phone = userByUserId.getData().getPhoneNo(); phone = userByUserId.getData().getPhoneNo();
} }
......
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