diff --git a/sql/V2.3.sql b/sql/V2.3.sql index 9b4ec91..330c628 100644 --- a/sql/V2.3.sql +++ b/sql/V2.3.sql @@ -34,3 +34,6 @@ CREATE TABLE ` yggl_main_importLog ` ( ` org_code ` int(11) NULL DEFAULT NULL, PRIMARY KEY (` id `) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + +ALTER TABLE `timer_test`.`insure_user` +MODIFY COLUMN `apply_type` int(11) NULL DEFAULT NULL COMMENT '申请类型:1新增 2投保 3批改' AFTER `replace_trans_id`; 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 7073618..fc483ae 100644 --- a/src/main/java/cn/timer/api/bean/insure/InsureUser.java +++ b/src/main/java/cn/timer/api/bean/insure/InsureUser.java @@ -1,6 +1,7 @@ package cn.timer.api.bean.insure; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; @@ -16,8 +17,9 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; - +import java.util.List; /** @@ -152,7 +154,7 @@ public class InsureUser extends Model<InsureUser> { @ApiModelProperty(value = "替换流水号,使用trans_id,RP_开头") private String replaceTransId; - @ApiModelProperty(value = "申请类型:1新增 2投保 3批增") + @ApiModelProperty(value = "申请类型:1新增 2投保 3批改") private Integer applyType; @ApiModelProperty(value = "批改原因") @@ -161,5 +163,8 @@ public class InsureUser extends Model<InsureUser> { @ApiModelProperty(value = "录单时间") private Date createTime; - + @Transient + @TableField(exist = false) + @ApiModelProperty(value = "导入备注") + private String remake; } 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 7ac94b0..570d22a 100644 --- a/src/main/java/cn/timer/api/controller/insure/CallBackContorll.java +++ b/src/main/java/cn/timer/api/controller/insure/CallBackContorll.java @@ -8,6 +8,7 @@ import cn.timer.api.utils.ResultUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mysql.cj.util.StringUtils; import io.swagger.annotations.Api; @@ -199,7 +200,10 @@ public class CallBackContorll { paramsMap.put("timestamp", timestamp); paramsMap.put("sign", sign); CallBack callBack = JSONObject.parseObject(sb.toString(), CallBack.class); - List<InsureUser> list = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getBatchNo, callBack.getOrder_import_info().getUuid()).eq(InsureUser::getInsureStatus, 3)); + List<InsureUser> list = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getTransId, callBack.getOrder_import_info().getThird_uuid())); + if(list.size()<=0){ + list = InsureUser.builder().build().selectList(new QueryWrapper<InsureUser>().lambda().eq(InsureUser::getBatchNo, callBack.getOrder_import_info().getUuid())); + } InsurePolicy insurePolicy = InsurePolicy.builder().build().selectOne(new QueryWrapper<InsurePolicy>().lambda().eq(InsurePolicy::getPolicyNo, list.get(0).getPolicyNo())); if (callBack.getStatus().equals("1")) { list.forEach(i -> {