Commit 79fb1449 by 阮思源

修改下

parent 3f86ad40
......@@ -1093,7 +1093,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
ownAltQrcodeInfoDTO.setAltQrcodeUrl(selfRobotDTO.getQrcodeUrl());
ownAltQrcodeInfoDTO.setAltHeadUrl(selfRobotDTO.getHeadPic());
//获取之前是否有没有使用的暗号
JoinGroupCipher joinGroupCipher = joinGroupCipherDao.getByCreateUser(wechatUserId, classifyId);
JoinGroupCipher joinGroupCipher = joinGroupCipherDao.getByWechatUserId(wechatUserId, classifyId);
String cipher;
if (joinGroupCipher != null) {
cipher = joinGroupCipher.getCipher();
......@@ -1107,7 +1107,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
}
JoinGroupCipher joinGroupCipherNew = new JoinGroupCipher();
joinGroupCipherNew.setCipher(cipher);
joinGroupCipherNew.setCreateUser(wechatUserId);
joinGroupCipherNew.setWechatUserId(wechatUserId);
joinGroupCipherNew.setClassifyId(classifyId);
joinGroupCipherDao.insert(joinGroupCipherNew);
}
......
......@@ -4,7 +4,7 @@ import com.pcloud.book.group.entity.JoinGroupCipher;
import com.pcloud.common.core.dao.BaseDao;
public interface JoinGroupCipherDao extends BaseDao<JoinGroupCipher> {
JoinGroupCipher getByCreateUser(Long wechatUserId,Long classifyId);
JoinGroupCipher getByWechatUserId(Long wechatUserId,Long classifyId);
JoinGroupCipher getByCipher(String cipher);
......
......@@ -16,11 +16,11 @@ import java.util.Map;
@Component("joinGroupCipherDao")
public class JoinGroupCipherDaoImpl extends BaseDaoImpl<JoinGroupCipher> implements JoinGroupCipherDao {
@Override
public JoinGroupCipher getByCreateUser(Long wechatUserId,Long classifyId) {
public JoinGroupCipher getByWechatUserId(Long wechatUserId,Long classifyId) {
Map<String,Object> map=new HashMap<>();
map.put("wechatUserId",wechatUserId);
map.put("classifyId",classifyId);
return this.getSqlSession().selectOne(this.getStatement("getByCreateUser"), map);
return this.getSqlSession().selectOne(this.getStatement("getByWechatUserId"), map);
}
@Override
......
......@@ -18,7 +18,7 @@ public class JoinGroupCipher extends BaseEntity {
private Long classifyId;
@ApiModelProperty("创建人")
private Long createUser;
private Long wechatUserId;
@ApiModelProperty("使用人微信id")
private String wxId;
......@@ -42,12 +42,12 @@ public class JoinGroupCipher extends BaseEntity {
this.classifyId = classifyId;
}
public Long getCreateUser() {
return createUser;
public Long getWechatUserId() {
return wechatUserId;
}
public void setCreateUser(Long createUser) {
this.createUser = createUser;
public void setWechatUserId(Long wechatUserId) {
this.wechatUserId = wechatUserId;
}
public String getWxId() {
......@@ -71,7 +71,7 @@ public class JoinGroupCipher extends BaseEntity {
return "JoinGroupCipher{" +
"cipher='" + cipher + '\'' +
", classifyId=" + classifyId +
", createUser=" + createUser +
", wechatUserId=" + wechatUserId +
", wxId='" + wxId + '\'' +
", hasUsed=" + hasUsed +
"} " + super.toString();
......
......@@ -5,7 +5,7 @@
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="cipher" property="cipher" jdbcType="VARCHAR"/>
<result column="classify_id" property="classifyId" jdbcType="BIGINT"/>
<result column="create_user" property="createUser" jdbcType="BIGINT"/>
<result column="wechat_user_id" property="wechatUserId" jdbcType="BIGINT"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="wx_id" property="wxId" jdbcType="BIGINT"/>
......@@ -13,7 +13,7 @@
</resultMap>
<sql id="Base_Column_List">
id, cipher, classify_id, create_time, create_user, update_time, wx_id, has_used
id, cipher, classify_id, create_time, wechat_user_id, update_time, wx_id, has_used
</sql>
<insert id="insert" parameterType="com.pcloud.book.group.entity.JoinGroupCipher" useGeneratedKeys="true"
......@@ -23,22 +23,22 @@
cipher,
classify_id,
create_time,
create_user,
wechat_user_id,
has_used
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{cipher,jdbcType=BIGINT},
#{classifyId,jdbcType=BIGINT},
now(),
#{createUser,jdbcType=BIGINT},
#{wechatUserId,jdbcType=BIGINT},
0
</trim>
</insert>
<!--获取基本信息-->
<select id="getByCreateUser" parameterType="map" resultMap="BaseResultMap">
<select id="getByWechatUserId" parameterType="map" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/> from join_group_cipher
where create_user=#{wechatUserId} and
where wechat_user_id=#{wechatUserId} and
classify_id=#{classifyId}
</select>
......
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