合并用户优化111

fwq

2024-01-19 913f0fa24f9b058a5672a908369fae9fa7959010

合并用户优化111

 phi_platform_user/src/main/java/com/hx/phip/service/user/impl/UserMergeLogServiceImpl.java

@@ -8,6 +8,7 @@
import com.hx.mybatis.aes.springbean.ConstantBean;
import com.hx.mybatisTool.SqlSentence;
import com.hx.phiappt.common.OperationReasonConstants;
import com.hx.phiappt.common.merge.MergeUserConstants;
import com.hx.phiappt.dto.MerUserFileDto;
import com.hx.phiappt.model.*;
import com.hx.phiappt.model.aliyun.call.AliyunSecretCallRecord;
@@ -75,8 +76,6 @@
public class UserMergeLogServiceImpl implements UserMergeLogService {
    private Logger logger = LoggerFactory.getLogger(UserMergeLogServiceImpl.class);

    @Resource
    private UserMergeLogMapper userMergeLogMapper;
    @Resource
    private UserMapper userMapper;
    @Resource
@@ -521,7 +520,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_INTERESTS);
            dUserLog.setType(MergeUserConstants.TYPE_USER_INTERESTS);
            dUserLog.setTableName("user_interests");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -570,7 +569,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_CONTACT);
            dUserLog.setType(MergeUserConstants.TYPE_USER_CONTACT);
            dUserLog.setTableName("user_contact_information");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -619,7 +618,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_ADDRESS);
            dUserLog.setType(MergeUserConstants.TYPE_USER_ADDRESS);
            dUserLog.setTableName("user_address_book");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -666,7 +665,7 @@
        dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
        dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

        dUserLog.setType(UserMergeLogItem.TYPE_USER_LABEL);
        dUserLog.setType(MergeUserConstants.TYPE_USER_LABEL);
        dUserLog.setTableName("user_general_label");
        dUserLog.setFieldId("userId");
        dUserLog.setFieldName("用户标识");
@@ -726,7 +725,7 @@
        bUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        bUserLog.setSortNum(0);

        bUserLog.setType(UserMergeLogItem.TYPE_RESERVE);
        bUserLog.setType(MergeUserConstants.TYPE_RESERVE);
        bUserLog.setTableName("user_money");
        bUserLog.setFieldId("storedValueFund");
        bUserLog.setFieldName("储值金");
@@ -786,7 +785,7 @@
        dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        dUserLog.setSortNum(1);

        dUserLog.setType(UserMergeLogItem.TYPE_RESERVE);
        dUserLog.setType(MergeUserConstants.TYPE_RESERVE);
        dUserLog.setTableName("user_money");
        dUserLog.setFieldId("storedValueFund");
        dUserLog.setFieldName("储值金");
@@ -862,7 +861,7 @@
        bFreezeUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        bFreezeUserLog.setSortNum(0);

        bFreezeUserLog.setType(UserMergeLogItem.TYPE_FREEZE_RESERVE);
        bFreezeUserLog.setType(MergeUserConstants.TYPE_FREEZE_RESERVE);
        bFreezeUserLog.setTableName("user_money");
        bFreezeUserLog.setFieldId("freezeStoredValueFund");
        bFreezeUserLog.setFieldName("冻结储值金");
@@ -914,7 +913,7 @@
        dFreezeUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        dFreezeUserLog.setSortNum(1);

        dFreezeUserLog.setType(UserMergeLogItem.TYPE_FREEZE_RESERVE);
        dFreezeUserLog.setType(MergeUserConstants.TYPE_FREEZE_RESERVE);
        dFreezeUserLog.setTableName("user_money");
        dFreezeUserLog.setFieldId("freezeStoredValueFund");
        dFreezeUserLog.setFieldName("冻结储值金");
@@ -975,7 +974,7 @@
        bUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        bUserLog.setSortNum(0);

        bUserLog.setType(UserMergeLogItem.TYPE_INCREMENT);
        bUserLog.setType(MergeUserConstants.TYPE_INCREMENT);
        bUserLog.setTableName("user_money");
        bUserLog.setFieldId("valueAddedFund");
        bUserLog.setFieldName("增值金");
@@ -1035,7 +1034,7 @@
        dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        dUserLog.setSortNum(1);

        dUserLog.setType(UserMergeLogItem.TYPE_INCREMENT);
        dUserLog.setType(MergeUserConstants.TYPE_INCREMENT);
        dUserLog.setTableName("user_money");
        dUserLog.setFieldId("valueAddedFund");
        dUserLog.setFieldName("增值金");
@@ -1108,11 +1107,11 @@
        bFreezeUserLog.setRepealUserId(userMergeLog.getRepealUserId());

        bFreezeUserLog.setIsHaveOther(1);
        bFreezeUserLog.setOpManType(UserMergeLogItem.TYPE_USER);
        bFreezeUserLog.setOpManType(0);
        bFreezeUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        bFreezeUserLog.setSortNum(0);

        bFreezeUserLog.setType(UserMergeLogItem.TYPE_FREEZE_INCREMENT);
        bFreezeUserLog.setType(MergeUserConstants.TYPE_FREEZE_INCREMENT);
        bFreezeUserLog.setTableName("user_money");
        bFreezeUserLog.setFieldId("freezeValueAddedFund");
        bFreezeUserLog.setFieldName("冻结增值金");
@@ -1162,7 +1161,7 @@
        dFreezeUserLog.setIsHaveOther(0);
        dFreezeUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
        dFreezeUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        dFreezeUserLog.setType(UserMergeLogItem.TYPE_FREEZE_INCREMENT);
        dFreezeUserLog.setType(MergeUserConstants.TYPE_FREEZE_INCREMENT);
        dFreezeUserLog.setSortNum(1);

        dFreezeUserLog.setTableName("user_money");
@@ -1223,7 +1222,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_INCREMENT_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_INCREMENT_LOG);
            dUserLog.setTableName("user_value_added_fund_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1273,7 +1272,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_INCREMENT_USE_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_INCREMENT_USE_LOG);
            dUserLog.setTableName("user_value_added_fund_use_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1324,7 +1323,7 @@
        bUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        bUserLog.setSortNum(0);

        bUserLog.setType(UserMergeLogItem.TYPE_INTEGRAL);
        bUserLog.setType(MergeUserConstants.TYPE_INTEGRAL);
        bUserLog.setTableName("user_money");
        bUserLog.setFieldId("integral");
        bUserLog.setFieldName("积分");
@@ -1384,7 +1383,7 @@
        dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        dUserLog.setSortNum(1);

        dUserLog.setType(UserMergeLogItem.TYPE_INTEGRAL);
        dUserLog.setType(MergeUserConstants.TYPE_INTEGRAL);
        dUserLog.setTableName("user_money");
        dUserLog.setFieldId("integral");
        dUserLog.setFieldName("积分");
@@ -1459,7 +1458,7 @@
        bFreezeUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        bFreezeUserLog.setSortNum(0);

        bFreezeUserLog.setType(UserMergeLogItem.TYPE_FREEZE_INTEGRAL);
        bFreezeUserLog.setType(MergeUserConstants.TYPE_FREEZE_INTEGRAL);
        bFreezeUserLog.setTableName("user_money");
        bFreezeUserLog.setFieldId("freezeIntegral");
        bFreezeUserLog.setFieldName("冻结积分");
@@ -1511,7 +1510,7 @@
        dFreezeUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        dFreezeUserLog.setSortNum(1);

        dFreezeUserLog.setType(UserMergeLogItem.TYPE_FREEZE_INTEGRAL);
        dFreezeUserLog.setType(MergeUserConstants.TYPE_FREEZE_INTEGRAL);
        dFreezeUserLog.setTableName("user_money");
        dFreezeUserLog.setFieldId("freezeIntegral");
        dFreezeUserLog.setFieldName("冻结积分");
@@ -1572,7 +1571,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_INTEGRAL_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_INTEGRAL_LOG);
            dUserLog.setTableName("user_integral_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1622,7 +1621,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_INTEGRAL_USE_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_INTEGRAL_USE_LOG);
            dUserLog.setTableName("user_integral_use_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1672,7 +1671,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_INTEGRAL_DEL_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_INTEGRAL_DEL_LOG);
            dUserLog.setTableName("user_clear_integral_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1722,7 +1721,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_MONEY_TURN_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_MONEY_TURN_LOG);
            dUserLog.setBeforeValue(delUser.getId());
            dUserLog.setAfterValue(user.getId());
            dUserLog.setTableName("user_money_transfer");
@@ -1780,7 +1779,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_WAIT_MONEY);
            dUserLog.setType(MergeUserConstants.TYPE_WAIT_MONEY);
            dUserLog.setTableName("user_money_unclaimed");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1829,7 +1828,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_MONEY_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_MONEY_LOG);
            dUserLog.setTableName("user_money_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1879,7 +1878,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_PROJECT);
            dUserLog.setType(MergeUserConstants.TYPE_PROJECT);
            dUserLog.setTableName("user_project");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1922,7 +1921,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_PROJECT);
            dUserLog.setType(MergeUserConstants.TYPE_PROJECT);
            dUserLog.setTableName("user_project_item");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -1974,7 +1973,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_PROJECT_USE);
            dUserLog.setType(MergeUserConstants.TYPE_PROJECT_USE);
            dUserLog.setTableName("user_project_used");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2024,7 +2023,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_PROJECT_EMP_OP);
            dUserLog.setType(MergeUserConstants.TYPE_PROJECT_EMP_OP);
            dUserLog.setTableName("user_project_direct_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2075,7 +2074,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_APPOINT);
            dUserLog.setType(MergeUserConstants.TYPE_APPOINT);
            dUserLog.setTableName("appointment");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2119,7 +2118,7 @@
//            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
//            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
//
//            dUserLog.setType(UserMergeLogItem.TYPE_APPOINT_REMARK);
//            dUserLog.setType(MergeUserConstants.TYPE_APPOINT_REMARK);
//            dUserLog.setTableName("user_appointment_remark");
//            dUserLog.setFieldId("userId");
//            dUserLog.setFieldName("用户标识");
@@ -2170,7 +2169,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_APPOINT_SPA);
            dUserLog.setType(MergeUserConstants.TYPE_APPOINT_SPA);
            dUserLog.setTableName("pre_order");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2220,7 +2219,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ARRIVE_RECORD);
            dUserLog.setType(MergeUserConstants.TYPE_ARRIVE_RECORD);
            dUserLog.setTableName("v_visit_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2270,7 +2269,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ARRIVE_ORDER);
            dUserLog.setType(MergeUserConstants.TYPE_ARRIVE_ORDER);
            dUserLog.setTableName("v_visit_order");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2321,7 +2320,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ARRIVE_RECENTLY);
            dUserLog.setType(MergeUserConstants.TYPE_ARRIVE_RECENTLY);
            dUserLog.setTableName("v_lately_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2371,7 +2370,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setType(MergeUserConstants.TYPE_CONSULT);
            dUserLog.setTableName("consultation_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2415,7 +2414,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setType(MergeUserConstants.TYPE_CONSULT);
            dUserLog.setTableName("consultation_needed_project");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2459,7 +2458,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setType(MergeUserConstants.TYPE_CONSULT);
            dUserLog.setTableName("consultation_focus_activity");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2503,7 +2502,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setType(MergeUserConstants.TYPE_CONSULT);
            dUserLog.setTableName("consultation_potential_project");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2547,7 +2546,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setType(MergeUserConstants.TYPE_CONSULT);
            dUserLog.setTableName("consultation_recommended_project");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2593,7 +2592,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONSULT);
            dUserLog.setType(MergeUserConstants.TYPE_CONSULT);
            dUserLog.setTableName("consultation_treat_project");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2644,7 +2643,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_GUIDE);
            dUserLog.setType(MergeUserConstants.TYPE_GUIDE);
            dUserLog.setTableName("v_guide_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2694,7 +2693,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_DEDUCTION);
            dUserLog.setType(MergeUserConstants.TYPE_DEDUCTION);
            dUserLog.setTableName("deduction_single");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2737,7 +2736,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_DEDUCTION);
            dUserLog.setType(MergeUserConstants.TYPE_DEDUCTION);
            dUserLog.setTableName("deduction_give_fund_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2787,7 +2786,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_TURN);
            dUserLog.setType(MergeUserConstants.TYPE_TURN);
            dUserLog.setBeforeValue(delUser.getId());
            dUserLog.setAfterValue(user.getId());
            dUserLog.setTableName("turn_add");
@@ -2838,7 +2837,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_TURN);
            dUserLog.setType(MergeUserConstants.TYPE_TURN);
            dUserLog.setTableName("user_project_turn");

            dUserLog.setBeforeValue(delUser.getId());
@@ -2894,7 +2893,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_RETURN_VISIT);
            dUserLog.setType(MergeUserConstants.TYPE_RETURN_VISIT);
            dUserLog.setTableName("return_visit_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2943,7 +2942,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_MEDICAL);
            dUserLog.setType(MergeUserConstants.TYPE_MEDICAL);
            dUserLog.setTableName("medical_records");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -2992,7 +2991,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_PRESCRIPTION);
            dUserLog.setType(MergeUserConstants.TYPE_PRESCRIPTION);
            dUserLog.setTableName("prescription");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3041,7 +3040,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CONTRAST);
            dUserLog.setType(MergeUserConstants.TYPE_CONTRAST);
            dUserLog.setTableName("compare_photo_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3090,7 +3089,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_APPEARANCE_PLAN);
            dUserLog.setType(MergeUserConstants.TYPE_APPEARANCE_PLAN);
            dUserLog.setTableName("appearance_total");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3139,7 +3138,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_MEI_JI);
            dUserLog.setType(MergeUserConstants.TYPE_MEI_JI);
            dUserLog.setTableName("mj_skin_report");
            dUserLog.setFieldId("customerId");
            dUserLog.setFieldName("用户标识");
@@ -3190,7 +3189,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_TEL_MSG);
            dUserLog.setType(MergeUserConstants.TYPE_TEL_MSG);
            dUserLog.setTableName("aliyun_secret_call_Record");
            dUserLog.setFieldId("phoneNo");
            dUserLog.setFieldName("用户手机号");
@@ -3239,7 +3238,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_COMPLAINT);
            dUserLog.setType(MergeUserConstants.TYPE_COMPLAINT);
            dUserLog.setTableName("record_complaint");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3281,7 +3280,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_COMPLAINT);
            dUserLog.setType(MergeUserConstants.TYPE_COMPLAINT);
            dUserLog.setTableName("handler_complaint");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3331,7 +3330,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_EVALUATION);
            dUserLog.setType(MergeUserConstants.TYPE_EVALUATION);
            dUserLog.setTableName("questionnaire");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3380,7 +3379,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_CARD);
            dUserLog.setType(MergeUserConstants.TYPE_CARD);
            dUserLog.setTableName("user_card");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3429,7 +3428,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_COUPON);
            dUserLog.setType(MergeUserConstants.TYPE_COUPON);
            dUserLog.setTableName("coupon_number");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3472,7 +3471,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_COUPON);
            dUserLog.setType(MergeUserConstants.TYPE_COUPON);
            dUserLog.setTableName("coupon_release_record_item");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3521,7 +3520,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_STATISTICS);
            dUserLog.setType(MergeUserConstants.TYPE_USER_STATISTICS);
            dUserLog.setTableName("user_statistics");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3569,7 +3568,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_RELEASE);
            dUserLog.setType(MergeUserConstants.TYPE_USER_RELEASE);
            dUserLog.setTableName("user_release_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3617,7 +3616,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_ROOM);
            dUserLog.setType(MergeUserConstants.TYPE_USER_ROOM);
            dUserLog.setTableName("user_families_room");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3665,7 +3664,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_ADVISER_GROUP);
            dUserLog.setType(MergeUserConstants.TYPE_USER_ADVISER_GROUP);
            dUserLog.setTableName("user_corp_user_team");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3713,7 +3712,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_TRANSFER_RECORD);
            dUserLog.setType(MergeUserConstants.TYPE_USER_TRANSFER_RECORD);
            dUserLog.setTableName("transfer_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3761,7 +3760,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_GZH);
            dUserLog.setType(MergeUserConstants.TYPE_USER_GZH);
            dUserLog.setTableName("gzh_msg");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3809,7 +3808,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_BIRTHDAY_GIFT);
            dUserLog.setType(MergeUserConstants.TYPE_USER_BIRTHDAY_GIFT);
            dUserLog.setTableName("user_birthday_gift_log");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3857,7 +3856,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_SKIN_LOG);
            dUserLog.setType(MergeUserConstants.TYPE_USER_SKIN_LOG);
            dUserLog.setTableName("skin_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3905,7 +3904,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_REWARD);
            dUserLog.setType(MergeUserConstants.TYPE_USER_REWARD);
            dUserLog.setTableName("reward_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -3953,7 +3952,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_SEND_RECORD);
            dUserLog.setType(MergeUserConstants.TYPE_USER_SEND_RECORD);
            dUserLog.setTableName("sending_records");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4004,7 +4003,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_PERFORMANCE);
            dUserLog.setType(MergeUserConstants.TYPE_USER_PERFORMANCE);
            dUserLog.setTableName("performance_info");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4066,7 +4065,7 @@
            uLog.setIsHaveOther(0);
            uLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            uLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
            uLog.setType(UserMergeLogItem.TYPE_USER_EXTERNAL);
            uLog.setType(MergeUserConstants.TYPE_USER_EXTERNAL);
            uLog.setTableName("medical_archives_file");
            uLog.setFieldName("多个字段");
            logger.info("封装的医疗档案Map"+JSON.toJSONString(typeIdMap));
@@ -4133,7 +4132,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_USER_EXTERNAL);
            dUserLog.setType(MergeUserConstants.TYPE_USER_EXTERNAL);
            dUserLog.setTableName("medical_documents_user");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4186,7 +4185,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_MEDICAL_ARCHIVES);
            dUserLog.setType(MergeUserConstants.TYPE_MEDICAL_ARCHIVES);
            dUserLog.setTableName("consultant_cash_report");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4237,7 +4236,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER);
            dUserLog.setTableName("orders_total");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4281,7 +4280,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER);
            dUserLog.setTableName("koap_order_total");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4324,7 +4323,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER);
            dUserLog.setTableName("orders_snapshot");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4367,7 +4366,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER);
            dUserLog.setTableName("record_consume");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4416,7 +4415,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER_REFUND);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER_REFUND);
            dUserLog.setTableName("refund_note");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4459,7 +4458,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER_REFUND);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER_REFUND);
            dUserLog.setTableName("refund_record");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4502,7 +4501,7 @@
            dUserLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
            dUserLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);

            dUserLog.setType(UserMergeLogItem.TYPE_ORDER_REFUND);
            dUserLog.setType(MergeUserConstants.TYPE_ORDER_REFUND);
            dUserLog.setTableName("refund_record_coupon");
            dUserLog.setFieldId("userId");
            dUserLog.setFieldName("用户标识");
@@ -4711,7 +4710,7 @@
        uLog.setIsHaveOther(0);
        uLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_USER);
        uLog.setOpType(UserMergeLogItem.OP_TYPE_UPDATE);
        uLog.setType(UserMergeLogItem.TYPE_CONSUMPTION);
        uLog.setType(MergeUserConstants.TYPE_CONSUMPTION);
        uLog.setTableName("user");
        uLog.setFieldName("多个字段");

@@ -4752,7 +4751,7 @@

        delLog.setIsHaveOther(0);
        delLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_DEL);
        delLog.setType(UserMergeLogItem.TYPE_USER);
        delLog.setType(MergeUserConstants.TYPE_USER);
        delLog.setOpType(UserMergeLogItem.OP_TYPE_DEL);
        delLog.setTableName("user");
        delLog.setFieldId("isDel");
@@ -4789,7 +4788,7 @@

        userLog.setIsHaveOther(0);
        userLog.setOpManType(UserMergeLogItem.OP_MAN_TYPE_USER);
        userLog.setType(UserMergeLogItem.TYPE_USER);
        userLog.setType(MergeUserConstants.TYPE_USER);
        userLog.setOpType(UserMergeLogItem.OP_TYPE_NONE);
        userLog.setStatus(1);
        userLog.setOpContent(JSON.toJSONString(user));