添加记录

yujian

2019-08-23 4936fa79494c5a2111664b63576340da245e6580

添加记录

 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java

@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestMapping;



import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;

import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;

import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;

@@ -21,6 +22,7 @@
import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -49,6 +51,9 @@


    @Resource

    private UserAccountMsgNotificationService userAccountMsgNotificationService;

	
    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;



    @Resource

    private RedisManager redisManager;

@@ -129,6 +134,8 @@
                    LogHelper.test(e.getMsg());

                    errCode = 5;

                }

				
                final String relationId2  = relationId;

                // 异步申请会员ID

                ThreadUtil.run(new Runnable() {



@@ -146,6 +153,9 @@
                            LogHelper.test(uid + "会员备案失败");

                        try {

                            userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, name, true);

							
                            if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))

                                userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);

                        } catch (UserExtraTaoBaoInfoException e) {

                            LogHelper.test(e.getMsg());

                        }

@@ -174,6 +184,7 @@
                    errCode = 5;

                }



                final String specialId2 = specialId;

                // 异步申请渠道ID

                ThreadUtil.run(new Runnable() {



@@ -189,6 +200,9 @@
                            LogHelper.test(uid + "渠道备案失败");

                        try {

                            userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, name, true);

							
                            if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))

                                userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);

                        } catch (UserExtraTaoBaoInfoException e) {

                            LogHelper.test(e.getMsg());

                        }

@@ -239,6 +253,9 @@
                    try {

                        userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName,

                                true);

						
                        if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId))

                            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);

                    } catch (UserExtraTaoBaoInfoException e) {

                        LogHelper.test(e.getMsg());

                        errCode = 6;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.bus.user.LoginResult;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

@@ -51,6 +52,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

@@ -150,6 +152,9 @@


    @Resource

    private UserTaoLiJinOriginService userTaoLiJinOriginService;

	
    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;



    private static final String PASSWORD_MAX_ERROR = "password_max_error";

    private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -946,6 +951,8 @@
            else

                out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

                        "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。注：此0.1元将会在后续产生的余额中合理扣除，敬请知晓。"));

			
            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);

        } catch (AlipayTransferException e1) {

            if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {

                String msg = "系统未能成功转账0.1元，提现账号信息有误，请核对后重新填写。";


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -54,6 +54,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

@@ -96,6 +97,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

@@ -215,6 +217,8 @@
    @Resource

    private UserTaoLiJinDetailService userTaoLiJinDetailService;

    

    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;

    



    private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -2275,6 +2279,8 @@
                    return;

                }

                userInfoService.saveUserInfo(nickName, uid);

				
                userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.nickName, nickName);

            }

            

            // 修改微信号

@@ -2290,6 +2296,8 @@
                    extra.setId(userInfoExtra.getId());

                    extra.setWeiXin(weiXin);

                    userInfoExtraService.saveUserInfoExtra(extra);

					
                    userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.setWeiXinNum, weiXin);

                }

            }

            

@@ -2301,6 +2309,8 @@
                    extra.setId(userInfoExtra.getId());

                    extra.setSex(sex);

                    userInfoExtraService.saveUserInfoExtra(extra);

					
                    userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");

                }

            }

            out.print(JsonUtil.loadTrueResult("保存成功"));


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -427,7 +427,7 @@


            JSONObject data = new JSONObject();

            data.put("result", gson.toJson(exchange));

            data.put("userGoldCoin", extraVO.getGoldCoin());

            data.put("goldCoin", extraVO.getGoldCoin() + "枚");

            out.print(JsonUtil.loadTrueResult(data));

        } catch (IntegralExchangeException e) {

            out.print(JsonUtil.loadFalseResult(1, e.getMsg()));


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoModifyRecordMapper.java

New file
@@ -0,0 +1,18 @@
package com.yeshi.fanli.dao.mybatis.user;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord;

public interface UserInfoModifyRecordMapper extends BaseMapper<UserInfoModifyRecord> {
	
    /**
     * 统计修改次数
     * @param uid
     * @param type 可为空则查询所有类型
     * @return
     */
    long countByUid(@Param("uid") Long uid, @Param("type") String type);

}

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoModifyRecordMapper.xml

New file
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.yeshi.fanli.dao.mybatis.user.UserInfoModifyRecordMapper">
  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">
    <id column="umr_id" property="id" jdbcType="BIGINT"/>
    <result column="umr_uid" property="uid" jdbcType="BIGINT"/>
    <result column="umr_type" property="type" jdbcType="VARCHAR"/>
    <result column="umr_value" property="value" jdbcType="VARCHAR"/>
    <result column="umr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
  </resultMap>
  <sql id="Base_Column_List">umr_id,umr_uid,umr_type,umr_value,umr_create_time</sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
    <include refid="Base_Column_List"/>from yeshi_ec_user_modify_record where umr_id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_modify_record where umr_id = #{id,jdbcType=BIGINT}</delete>
  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_modify_record (umr_id,umr_uid,umr_type,umr_value,umr_create_time) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})</insert>
  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_modify_record
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">umr_id,</if>
      <if test="uid != null">umr_uid,</if>
      <if test="type != null">umr_type,</if>
      <if test="value != null">umr_value,</if>
      <if test="createTime != null">umr_create_time,</if>
    </trim>values
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">#{id,jdbcType=BIGINT},</if>
      <if test="uid != null">#{uid,jdbcType=BIGINT},</if>
      <if test="type != null">#{type,jdbcType=VARCHAR},</if>
      <if test="value != null">#{value,jdbcType=VARCHAR},</if>
      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
    </trim>
  </insert>
  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">update yeshi_ec_user_modify_record set umr_uid = #{uid,jdbcType=BIGINT},umr_type = #{type,jdbcType=VARCHAR},umr_value = #{value,jdbcType=VARCHAR},umr_create_time = #{createTime,jdbcType=TIMESTAMP} where umr_id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">update yeshi_ec_user_modify_record
    <set>
      <if test="uid != null">umr_uid=#{uid,jdbcType=BIGINT},</if>
      <if test="type != null">umr_type=#{type,jdbcType=VARCHAR},</if>
      <if test="value != null">umr_value=#{value,jdbcType=VARCHAR},</if>
      <if test="createTime != null">umr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
    </set> where umr_id = #{id,jdbcType=BIGINT}
  </update>
  
  <select id="countByUid" resultMap="BaseResultMap">
      SELECT IFNULL(COUNT(d.`umr_id`),0) FROM yeshi_ec_user_modify_record d
    WHERE d.`umr_uid` = #{uid} 
         <if test="">AND d.`umr_type`= #{type}</if>
  </select>
</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java

@@ -243,6 +243,9 @@
                if(codePublishRecordService.countValidRecord(uid) > 0)

                    throw new IntegralExchangeException(1, "三天之内不可重复兑换");

                codePublishRecordService.publishInviteCode(uid);

				
                exchange.setNeedJump(true);

                exchange.setBtnName("去查看");

            } else if (ExchangeTypeEnum.taoLiJin == type) {

                thing = "推广红包";

                thingNum = exchange.getAmount() + "元";


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -33,6 +33,7 @@
import com.yeshi.fanli.entity.bus.user.UserConnectHistory;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

@@ -47,6 +48,7 @@
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

@@ -108,6 +110,10 @@


    @Resource

    private JedisPool jedisPool;

	
	
    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;



    @Transactional

    @Override

@@ -703,6 +709,14 @@
        } catch (Exception e) {

            e.printStackTrace();

        }

		
		
        if (!StringUtil.isNullOrEmpty(user.getPhone())) 
            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, user.getPhone());

		
        if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) 
            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, user.getWxUnionId());

		
    }



    @Override

@@ -727,6 +741,9 @@
        update.setPhone(phone);

        userInfoMapper.updateByPrimaryKeySelective(update);

        userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

		
		
        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, phone);

    }



    @Override

@@ -841,6 +858,9 @@
        userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);



        userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

		
		
        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

    }



    @Override

@@ -1015,6 +1035,8 @@
                    } catch (Exception e) {

                        e.printStackTrace();

                    }

					
                    userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindPhone, phone);

                }

            

                return userInfo;

@@ -1099,6 +1121,8 @@
                    } catch (Exception e) {

                        e.printStackTrace();

                    }

					
                    userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

                }

                return userInfo;

            }

@@ -1164,6 +1188,9 @@


        // 发送消息

        userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

		
        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, phone);

		
    }



    @Override

@@ -1232,6 +1259,9 @@
        userAccountBindingHistoryService.addUserAccountBindingHistory(history);



        userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

		
		
        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, wxUnionId);

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java

New file
@@ -0,0 +1,70 @@
package com.yeshi.fanli.service.impl.user;



import java.util.Date;



import javax.annotation.Resource;



import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.user.UserInfoModifyRecordMapper;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.util.StringUtil;



@Service

public class UserInfoModifyRecordServiceImpl implements UserInfoModifyRecordService {



    @Resource

    private UserInfoModifyRecordMapper userInfoModifyRecordMapper;

	
    @Resource

    private IntegralGetService integralGetService;



    @Async()

    @Override

    public void addModifyRecord(Long uid, ModifyTypeEnum type, String value) {

        try {

            if (uid == null || StringUtil.isNullOrEmpty(value))

                return;

			
            long count = countByUid(uid, type.name());

            if (count == 0) {

                if (type == ModifyTypeEnum.bindPhone) {

                    integralGetService.addBindPhone(uid);

                } else if (type == ModifyTypeEnum.bindAlipay) {

                    integralGetService.addBindAlipay(uid);

                } else if (type == ModifyTypeEnum.bindTaoBao) {

                    integralGetService.addBindTaoBao(uid);

                } else if (type == ModifyTypeEnum.bindWeiXin) {

                    integralGetService.addBindWeiXin(uid);

                } else if (type == ModifyTypeEnum.gender) {

                    integralGetService.addSetGender(uid);

                } else if (type == ModifyTypeEnum.nickName) {

                    integralGetService.addSetNickname(uid);

                } else if (type == ModifyTypeEnum.portrait) {

                    integralGetService.addSetPortrait(uid);

                } else if (type == ModifyTypeEnum.setWeiXinNum) {

                    integralGetService.addSetWeiXinNum(uid);

                }

            }

			
            UserInfoModifyRecord record = new UserInfoModifyRecord();

            record.setUid(uid);

            record.setType(type);

            record.setValue(value);

            record.setCreateTime(new Date());

            userInfoModifyRecordMapper.insertSelective(record);

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

        }

    }



    @Override

    public long countByUid(Long uid, String type) {

        return userInfoModifyRecordMapper.countByUid(uid, type);

    }

}


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -45,6 +45,7 @@
import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.exception.ThreeSaleException;

@@ -60,6 +61,7 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.util.Constant;

@@ -132,6 +134,10 @@


    @Resource

    private BindingAccountService bindingAccountService;

	
    @Resource

    private UserInfoModifyRecordService userInfoModifyRecordService;

	


    public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {

        List<UserInfo> list = null;

@@ -972,6 +978,8 @@
            COSManager.getInstance().deleteFile(portrait);

        }



        userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.portrait, fileLink);

		
        executor.execute(new Runnable() {

            @Override

            public void run() {


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoModifyRecordService.java

New file
@@ -0,0 +1,19 @@
package com.yeshi.fanli.service.inter.user;



import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;



public interface UserInfoModifyRecordService {



    public void addModifyRecord(Long uid, ModifyTypeEnum type, String value);



    /**

     * 统计修改次数

     * @param uid

     * @param type 可为空则查询所有类型

     * @return

     */

    public long countByUid(Long uid, String type);







}