投保导入多个替换人，不同套餐

src/main/java/cn/timer/api/bean/insure/InsureUser.java

@@ -170,6 +170,6 @@ public class InsureUser extends Model<InsureUser> {
 
 
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)
-	@ApiModelProperty(value="新被保人",example="新被保人")
-	private InsureUser replaceUser;
+	@ApiModelProperty(value="原被保人",example="原被保人")
+	private InsureUser originaUser;
 }
 }

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);
             CallBack callBack = JSONObject.parseObject(sb.toString(), CallBack.class);
             if (callBack.getCallback_type().equals("1")) {
             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()));
                 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();
                 InsurePolicy insurePolicy = InsurePolicy.builder().id(insureUserList.get(0).getPolicyId()).build().selectById();
                 if (callBack.getStatus().equals("1")) {
                 if (callBack.getStatus().equals("1")) {
                     if (insureUserList.size() > 0) {
                     if (insureUserList.size() > 0) {
@@ -264,6 +267,10 @@ public class CallBackContorll {
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("保全增员申请回调异常：",e);
             log.error("保全增员申请回调异常：",e);
             throw new CustomException("保全增员申请回调异常");
             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 {
         } finally {
             Map trueMap = Maps.newHashMap();
             Map trueMap = Maps.newHashMap();
             trueMap.put("status", "1");
             trueMap.put("status", "1");