From ca797bbaa64af0839b1c42e040f359c153be34eb Mon Sep 17 00:00:00 2001 From: wgd <862422848@qq.com> Date: Mon, 11 Jul 2022 18:38:45 +0800 Subject: [PATCH] 投保导入多个替换人,不同套餐 --- src/main/java/cn/timer/api/bean/insure/InsureUser.java | 4 ++-- src/main/java/cn/timer/api/controller/insure/CallBackContorll.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/timer/api/bean/insure/InsureUser.java b/src/main/java/cn/timer/api/bean/insure/InsureUser.java index 410f338..9f1367a 100644 --- a/src/main/java/cn/timer/api/bean/insure/InsureUser.java +++ b/src/main/java/cn/timer/api/bean/insure/InsureUser.java @@ -170,6 +170,6 @@ public class InsureUser extends Model<InsureUser> { @Transient @TableField(exist = false) - @ApiModelProperty(value="新被保人",example="新被保人") - private InsureUser replaceUser; + @ApiModelProperty(value="原被保人",example="原被保人") + private InsureUser originaUser; } diff --git a/src/main/java/cn/timer/api/controller/insure/CallBackContorll.java b/src/main/java/cn/timer/api/controller/insure/CallBackContorll.java index 1f349b9..f0da502 100644 --- a/src/main/java/cn/timer/api/controller/insure/CallBackContorll.java +++ b/src/main/java/cn/timer/api/controller/insure/CallBackContorll.java @@ -124,6 +124,9 @@ public class CallBackContorll { CallBack callBack = JSONObject.parseObject(sb.toString(), CallBack.class); if (callBack.getCallback_type().equals("1")) { List<InsureUser> insureUserList = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getTransId, callBack.getOrder_import_info().getThird_uuid())); + if(insureUserList.size()<=0){ + insureUserList = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getBatchNo, callBack.getOrder_import_info().getUuid())); + } InsurePolicy insurePolicy = InsurePolicy.builder().id(insureUserList.get(0).getPolicyId()).build().selectById(); if (callBack.getStatus().equals("1")) { if (insureUserList.size() > 0) { @@ -264,6 +267,10 @@ public class CallBackContorll { } catch (Exception e) { log.error("保全增员申请回调异常:",e); throw new CustomException("保全增员申请回调异常"); + //TODO 写入日志 +// InsureLog.builder().requestParam(JSONObject.toJSONString(paramsMap)).type(7) +// .requestData(sb.toString()).createTime(new Date()).requestType(1).returnBody(JSONObject.toJSONString(callBack)).requestPath(base_api_url + "/callBack/policy/CallBack") +// .returnCode(callBack.getStatus()).returnMsg(errorMsg).policyId(insurePolicy.getId()).build().insert(); } finally { Map trueMap = Maps.newHashMap(); trueMap.put("status", "1"); -- libgit2 0.26.0