YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by zhaoqing
Commit 4b2f91b3e6fda7d2db8426d535a872910323b337 2 parents 5b18b300 8049264b

Merge branch 'dev_cps_icard_190613' of http://git.yoho.cn/yoho30/yohobuy-union i… 

…nto dev_cps_icard_190613
Inline Side-by-side
Showing 3 changed files with 5 additions and 41 deletions
... ... @@ -5,8 +5,6 @@ import com.yoho.service.model.union.request.BaseBO;
public class UnionShareUserIdentityCard extends BaseBO{
private Integer id;
private Integer uid;
private String idCardNo;
private String name;
private String cardFrontUrl;
private String cardBackUrl;
private Byte status;
... ... @@ -29,22 +27,6 @@ public class UnionShareUserIdentityCard extends BaseBO{
this.uid = uid;
}
public String getIdCardNo() {
return idCardNo;
}
public void setIdCardNo(String idCardNo) {
this.idCardNo = idCardNo;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCardFrontUrl() {
return cardFrontUrl;
}
... ...
... ... @@ -4,8 +4,6 @@
<resultMap id="BaseResultMap" type="com.yoho.unions.dal.model.UnionShareUserIdentityCard" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="uid" property="uid" jdbcType="INTEGER" />
<result column="id_card_no" property="idCardNo" jdbcType="VARCHAR" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="card_front_url" property="cardFrontUrl" jdbcType="VARCHAR" />
<result column="card_back_url" property="cardBackUrl" jdbcType="VARCHAR" />
<result column="status" property="status" jdbcType="TINYINT" />
... ... @@ -13,7 +11,7 @@
<result column="update_time" property="updateTime" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
id, uid, id_card_no, name, card_front_url, card_back_url, status, create_time, update_time
id, uid, card_front_url, card_back_url, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
... ... @@ -37,9 +35,7 @@
</delete>
<insert id="insert" parameterType="com.yoho.unions.dal.model.UnionShareUserIdentityCard" >
insert into union_share_user_identity_card (uid, id_card_no,
name, card_front_url, card_back_url, status, create_time, update_time
)
insert into union_share_user_identity_card (uid, card_front_url, card_back_url, status, create_time, update_time)
values (#{uid,jdbcType=INTEGER}, #{idCardNo,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{cardFrontUrl,jdbcType=VARCHAR}, #{cardBackUrl,jdbcType=VARCHAR},
#{status,jdbcType=TINYINT}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER}
... ... @@ -49,12 +45,6 @@
<update id="updateByPrimaryKeySelective" parameterType="com.yoho.unions.dal.model.UnionShareUserIdentityCard" >
update union_share_user_identity_card
<set >
<if test="idCardNo != null" >
id_card_no = #{idCardNo,jdbcType=VARCHAR},
</if>
<if test="name != null" >
name = #{name,jdbcType=VARCHAR},
</if>
<if test="cardFrontUrl != null" >
card_front_url = #{cardFrontUrl,jdbcType=VARCHAR},
</if>
... ... @@ -74,8 +64,6 @@
<update id="updateByPrimaryKey" parameterType="com.yoho.unions.dal.model.UnionShareUserIdentityCard" >
update union_share_user_identity_card
set uid = #{uid,jdbcType=INTEGER},
id_card_no = #{idCardNo,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
card_front_url = #{cardFrontUrl,jdbcType=VARCHAR},
card_back_url = #{cardBackUrl,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
... ...
... ... @@ -1319,14 +1319,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
}
public void checkUserIdentityCard(UnionShareUserIdentityCardBo bo) {
// 校验姓名
if (!ChineseNameUtils.checkName(bo.getName())) {
throw new ServiceException(ServiceError.UNION_CHINESE_NAME_ERROR);
}
// 校验身份证
if (!checkIdCard(bo.getIdCardNo())) {
throw new ServiceException(ServiceError.UNION_IDCARD_ERROR);
}
// 校验身份证图片
if (!checkBankCard(bo.getCardFrontUrl())) {
throw new ServiceException(ServiceError.UNION_IDENTITYCARD_FRONT_IMAGE_ERROR);
... ... @@ -3745,7 +3737,9 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
return null;
}
UnionShareUserIdentityCardBo result = new UnionShareUserIdentityCardBo();
BeanUtils.copyProperties(identityCard, result);
result.setId(identityCard.getId());
result.setUid(identityCard.getUid());
result.setCreateTime(identityCard.getCreateTime());
addToRedis(ShareOrdersKeyEnum.USER_SETTLEMENT, uid, result, hashkey);
logger.info("getBankCard end,set redis cache ,uid is {},hashkey is {},IdentityCard is {}",uid,hashkey,result);
return result;
... ...