删除MoneyRecord

admin

2019-03-13 3767f7a43df02084b92c630f2a5c774cb3fc9247

删除MoneyRecord

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -24,7 +24,6 @@
import com.yeshi.fanli.entity.bus.user.BindingAccount;

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

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

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

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

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

@@ -41,7 +40,6 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;

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

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

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

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

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

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

@@ -65,8 +63,6 @@
    @Resource

    private UserInfoService userInfoService;



    @Resource

    private MoneyRecordService moneyRecordService;



    @Resource

    private OrderService orderService;

@@ -223,24 +219,6 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping(value = "getMoneyRecordList", method = RequestMethod.POST)

    public void getMoneyRecordList(int pageIndex, long uid, PrintWriter out) {

        List<MoneyRecord> moneyRecordList = moneyRecordService.getMoneyRecord(uid, pageIndex - 1);

        if (moneyRecordList != null)

            for (MoneyRecord mr : moneyRecordList) {

                mr.setExtract(null);

                mr.setUserInfo(null);

                mr.setHongBao(null);

            }



        int count = moneyRecordService.getCount(uid);

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("moneyRecordList", GsonUtil.toJsonExpose(moneyRecordList));

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

    }



    /**

     * 


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

@@ -43,9 +43,7 @@
import com.yeshi.fanli.entity.bus.user.BindingAccount;

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

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

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

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

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

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

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

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

@@ -88,7 +86,6 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;

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

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

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

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

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

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

@@ -132,9 +129,6 @@


    @Resource

    private OrderService orderService;



    @Resource

    private MoneyRecordService moneyRecordService;



    @Resource

    private BindingAccountService bindingAccountService;

@@ -713,42 +707,6 @@
        }

        userInfoService.unBindUserInfo(find, type);

        out.print(JsonUtil.loadTrueResult("解绑成功"));

    }



    /**

     * 获取提现记录

     * 
     * @param acceptData

     * @param uid

     *            用户id

     * @param page

     *            页数（从0开始）

     * @param out

     */

    @RequestMapping(value = "getmoneyrecord", method = RequestMethod.POST)

    public void getMoneyRecord(AcceptData acceptData, long uid, int page, PrintWriter out) {

        UserInfo user = userInfoService.getUserById(uid);

        if (user == null) {

            out.print(JsonUtil.loadFalseResult("用户不存在"));

            return;

        }

        if (page < 0) {

            page = 0;

        }



        List<MoneyRecord> moneyRecordList = moneyRecordService.getMoneyRecord(uid, page);

        int count = moneyRecordService.getCount(uid);

        JSONObject data = new JSONObject();

        if (moneyRecordList == null || moneyRecordList.size() == 0) {

            data.put("count", 0);

            data.put("moneyRecordList", new ArrayList());

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

            return;

        }

        data.put("count", count);

        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

        data.put("moneyRecordList", gson.toJson(moneyRecordList));

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

    }



    /**


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/MoneyRecordMapper.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/user/MoneyRecordDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/MoneyRecord.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/mapping/MoneyRecordMapper.xml

File was deleted

 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2CountMapper.xml

@@ -3,7 +3,7 @@

<mapper namespace="com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper">

    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.HongBaoV2">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.vo.order.HongBaoV2VO">
        <id column="hb_id" property="id" jdbcType="BIGINT" />
        <result column="hb_urank" property="urank" jdbcType="INTEGER" />
        <result column="hb_money" property="money" jdbcType="DECIMAL" />
@@ -17,6 +17,8 @@
        <result column="hb_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="hb_update_time" property="updateTime" jdbcType="TIMESTAMP" />

        <result column="totalMoney" property="totalMoney" jdbcType="DECIMAL" />

        <association property="userInfo" column="hb_uid"
            javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
            <id column="hb_uid" property="id" jdbcType="BIGINT" />
@@ -26,9 +28,6 @@
            javaType="com.yeshi.fanli.entity.bus.user.HongBaoV2">
            <id column="hb_pid" property="id" jdbcType="BIGINT" />
        </association>
		
        <result column="totalMoney" property="totalMoney" jdbcType="DECIMAL" />
		
    </resultMap>


@@ -78,7 +77,7 @@
            AND t.hb_state =4
        </if>
    </sql>
	

    <sql id="Count_Select_Type">
        <if test="type != null and type == 1"> <!-- 自购订单 -->
            AND (t.hb_type =1 or t.hb_type =2)
@@ -87,132 +86,152 @@
            AND t.`hb_type` = 20
        </if>
        <if test="type != null and type == 3"> <!-- 邀请订单 -->
            AND (t.`hb_type` = 5 OR t.`hb_type` = 6 OR t.`hb_type` = 7 OR t.`hb_type` = 21 OR t.`hb_type` = 22)
            AND (t.`hb_type` = 5 OR t.`hb_type` = 6 OR t.`hb_type` = 7 OR
            t.`hb_type` = 21 OR t.`hb_type` = 22)
        </if>
    </sql>
	

    <select id="countHongBaoMoney" resultType="java.util.HashMap">
        SELECT CAST(SUM(t.`hb_money`)AS DECIMAL(19,2)) AS showValue,<include refid="Column_DateType"/>
        SELECT CAST(SUM(t.`hb_money`)AS DECIMAL(19,2)) AS showValue,
        <include refid="Column_DateType" />
        FROM yeshi_ec_hongbao_v2 t
        <if test="channel != null and  channel != 'all' ">
            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON t.`hb_uid`=a.uid 
            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM
            `yeshi_ec_log_user_active` a WHERE a.`lua_channel`='${channel}' GROUP
            BY a.`lua_uid`) a ON t.`hb_uid`=a.uid
        </if>
        WHERE t.`hb_uid` IS NOT NULL AND (t.`hb_type`=1 OR t.`hb_type`=20) 
            <include refid="Count_Select_DateType"/> 
            <include refid="Count_Select_State"/>
            <if test="channel != null and  channel != 'all' ">
                AND a.uid is not null
            </if>
			
        <include refid="Count_Group_DateType"/>
        ORDER BY t.`hb_create_time`
    </select>
	
    <select id="countHongBaoNum" resultType="java.util.HashMap">
        SELECT COUNT(t.`hb_id`)AS showValue,<include refid="Column_DateType"/>
        FROM yeshi_ec_hongbao_v2 t 
        WHERE t.`hb_uid` IS NOT NULL AND (t.`hb_type`=1 OR t.`hb_type`=20)
        <include refid="Count_Select_DateType" />
        <include refid="Count_Select_State" />
        <if test="channel != null and  channel != 'all' ">
            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a ON t.`hb_uid`=a.uid 
            AND a.uid is not null
        </if>
        WHERE t.`hb_uid` IS NOT NULL AND (t.`hb_type`=1 OR t.`hb_type`=20) 
		
            <include refid="Count_Select_DateType"/> 
            <include refid="Count_Select_State"/>
            <if test="channel != null and  channel != 'all' ">
                AND a.uid is not null
            </if>
			
        <include refid="Count_Group_DateType"/>

        <include refid="Count_Group_DateType" />
        ORDER BY t.`hb_create_time`
    </select>
	

    <select id="countHongBaoNum" resultType="java.util.HashMap">
        SELECT COUNT(t.`hb_id`)AS showValue,
        <include refid="Column_DateType" />
        FROM yeshi_ec_hongbao_v2 t
        <if test="channel != null and  channel != 'all' ">
            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM
            `yeshi_ec_log_user_active` a WHERE a.`lua_channel`='${channel}' GROUP
            BY a.`lua_uid`) a ON t.`hb_uid`=a.uid
        </if>
        WHERE t.`hb_uid` IS NOT NULL AND (t.`hb_type`=1 OR t.`hb_type`=20)

        <include refid="Count_Select_DateType" />
        <include refid="Count_Select_State" />
        <if test="channel != null and  channel != 'all' ">
            AND a.uid is not null
        </if>

        <include refid="Count_Group_DateType" />
        ORDER BY t.`hb_create_time`
    </select>

    <select id="countNumberByUid" resultType="java.lang.Long">
      select count(hb_id) from yeshi_ec_hongbao_v2 where hb_uid=#{0}
        select count(hb_id) from yeshi_ec_hongbao_v2 where hb_uid=#{0}
    </select>
	
	
	
	




    <select id="countHongBaoType" resultType="java.util.HashMap">
        SELECT COUNT(t.`hb_id`)AS showValue,<include refid="Column_DateType"/>
        FROM yeshi_ec_hongbao_v2 t 
        WHERE t.`hb_uid` IS NOT NULL 
            <include refid="Count_Select_DateType"/> 
            <include refid="Count_Select_Type"/> 
        <include refid="Count_Group_DateType"/>
        SELECT COUNT(t.`hb_id`)AS showValue,
        <include refid="Column_DateType" />
        FROM yeshi_ec_hongbao_v2 t
        WHERE t.`hb_uid` IS NOT NULL
        <include refid="Count_Select_DateType" />
        <include refid="Count_Select_Type" />
        <include refid="Count_Group_DateType" />
        ORDER BY t.`hb_create_time`
    </select>
	

    <select id="countHongBaoTotalNum" resultType="java.util.HashMap">
        SELECT COUNT(t.`hb_id`)AS showValue,<include refid="Column_DateType"/>
        FROM yeshi_ec_hongbao_v2 t  
        WHERE t.`hb_uid` IS NOT NULL AND t.`hb_type` not in(1,3,4) <include refid="Count_Select_DateType"/> 
        <include refid="Count_Group_DateType"/>
        SELECT COUNT(t.`hb_id`)AS showValue,
        <include refid="Column_DateType" />
        FROM yeshi_ec_hongbao_v2 t
        WHERE t.`hb_uid` IS NOT NULL AND t.`hb_type` not in(1,3,4)
        <include refid="Count_Select_DateType" />
        <include refid="Count_Group_DateType" />
        ORDER BY t.`hb_create_time`
    </select>
	
	


    <select id="countMoneyByUidAndState" resultType="java.math.BigDecimal">
        SELECT CAST(SUM(hb.`hb_money`)AS DECIMAL(19,2)) 
        SELECT CAST(SUM(hb.`hb_money`)AS DECIMAL(19,2))
        FROM `yeshi_ec_hongbao_v2` hb
        WHERE hb.`hb_uid` = #{uid}  
            <if test="state != null">
                 AND hb.`hb_state` = #{state}
            </if>	
        WHERE hb.`hb_uid` = #{uid}
        <if test="state != null">
            AND hb.`hb_state` = #{state}
        </if>
    </select>
	

    <select id="countNumberByUidAndState" resultType="java.lang.Integer">
        SELECT COALESCE(count(hb_id),0) FROM yeshi_ec_hongbao_v2
        WHERE hb_uid = #{uid}
            <if test="state != null">
                 AND hb_state = #{state}
            </if>	
        WHERE hb_uid =
        #{uid}
        <if test="state != null">
            AND hb_state = #{state}
        </if>
    </select>
	
	
    <select id="getTotalTiChengCount" resultType="java.lang.Integer" parameterType="java.lang.Long">


    <select id="getTotalTiChengCount" resultType="java.lang.Integer"
        parameterType="java.lang.Long">
        SELECT count(*) FROM `yeshi_ec_hongbao_v2` h
        WHERE h.`hb_uid`=#{0} 
            AND (h.`hb_type`=20 OR h.`hb_type`=21 OR h.`hb_type`=22 OR h.`hb_type`=6 OR h.`hb_type`=7)
        WHERE
        h.`hb_uid`=#{0}
        AND (h.`hb_type`=20 OR h.`hb_type`=21 OR h.`hb_type`=22 OR h.`hb_type`=6
        OR h.`hb_type`=7)
    </select>
	

    <select id="countValidNumberByUid" resultType="java.lang.Long">
        <!--统计有效订单数量 -->
        SELECT COALESCE(count(hb.hb_id),0) FROM `yeshi_ec_hongbao_v2` hb
        WHERE hb.hb_uid =#{uid} 
            AND hb.hb_type not in (3,4)
            AND <![CDATA[hb.hb_state <> 4]]>
		
        WHERE
        hb.hb_uid =#{uid}
        AND hb.hb_type not in (3,4)
        AND <![CDATA[hb.hb_state <> 4]]>

        <if test="dateType != null and dateType == 1">
            AND TO_DAYS(FROM_UNIXTIME(hb.`hb_create_time`/1000)) = TO_DAYS(NOW())
            AND TO_DAYS(FROM_UNIXTIME(hb.`hb_create_time`/1000)) =
            TO_DAYS(NOW())
        </if>
        <if test="dateType != null and dateType == 2">
            AND DATE_FORMAT( FROM_UNIXTIME(hb.`hb_create_time`/1000),'%Y%m' ) =
                DATE_FORMAT( CURDATE( ) , '%Y%m' )
            AND DATE_FORMAT(
            FROM_UNIXTIME(hb.`hb_create_time`/1000),'%Y%m' ) =
            DATE_FORMAT( CURDATE( ) , '%Y%m' )
        </if>
    </select>
	

    <select id="countWillGetMoneyByUid" resultType="java.math.BigDecimal">
            SELECT CAST(SUM(hb.`hb_money`)AS DECIMAL(19,2)) 
        SELECT CAST(SUM(hb.`hb_money`)AS DECIMAL(19,2))
        FROM `yeshi_ec_hongbao_v2` hb
        WHERE hb.`hb_uid` = #{uid}  AND hb.`hb_state` in (1,2)
        WHERE hb.`hb_uid` = #{uid} AND hb.`hb_state`
        in (1,2)
    </select>
	

    <select id="getLastHongBaoTime" resultType="java.util.Date">
        <!-- 最近一次下单时间 -->
        SELECT h.`hb_create_time` FROM yeshi_ec_hongbao_v2 h WHERE h.`hb_type` IN(1,2) <![CDATA[AND h.hb_state <>4]]>
        SELECT h.`hb_create_time` FROM yeshi_ec_hongbao_v2 h WHERE h.`hb_type`
        IN(1,2) <![CDATA[AND h.hb_state <>4]]>
        AND h.`hb_uid` = #{uid}
        ORDER BY h.`hb_create_time` DESC 
        ORDER BY h.`hb_create_time` DESC
        LIMIT 1;
    </select>
	
	


    <select id="count24HOderByChannel" resultType="java.util.HashMap">
        SELECT <!-- COALESCE(SUM(b.money*2),0) AS 'commision', -->
        COALESCE(COUNT(b.hb_id),0) AS 'showValue',
        <!-- COALESCE(SUM(b.payMoney),0) AS 'payMoney', -->
        <if test="type == 1">
            FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate'
            FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS
            'showDate'
        </if>
        <if test="type == 2">
            FROM_UNIXTIME(u.`createtime`/1000,'%m') AS 'showDate'
@@ -221,12 +240,13 @@
            FROM_UNIXTIME(u.`createtime`/1000,'%Y') AS 'showDate'
        </if>
        FROM
            (
            SELECT h.* FROM yeshi_ec_hongbao_v2 h
            LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a
            WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a
            ON a.uid=h.`hb_uid` WHERE a.uid IS NOT NULL AND (h.`hb_type`=1 OR h.`hb_type`=20)
            ) b
        (
        SELECT h.* FROM yeshi_ec_hongbao_v2 h
        LEFT JOIN (SELECT a.`lua_uid` AS uid FROM `yeshi_ec_log_user_active` a
        WHERE a.`lua_channel`='${channel}' GROUP BY a.`lua_uid`) a
        ON a.uid=h.`hb_uid` WHERE a.uid IS NOT NULL AND (h.`hb_type`=1 OR
        h.`hb_type`=20)
        ) b
        LEFT JOIN yeshi_ec_user u ON u.`id`=b.hb_uid
        WHERE <![CDATA[ b.hb_create_time<FROM_UNIXTIME((u.`createtime`+1000*60*60*24)/1000,'%Y-%m-%d %h:%m:%s')]]>
        <if test="startTime != null and startTime != '' ">
@@ -251,16 +271,20 @@
        ORDER BY u.`createtime`

    </select>
	

    <select id="listShareAndInviteMoney" resultMap="BaseResultMap">
        SELECT IFNULL(SUM(h.`hb_money`),0) as totalMoney,h.*
        FROM `yeshi_ec_hongbao_v2` h
        WHERE  h.hb_state <![CDATA[<>]]>4
        FROM
        `yeshi_ec_hongbao_v2` h
        WHERE h.hb_state <![CDATA[<>]]>4
        AND DATE_FORMAT(h.hb_create_time, '%Y-%m-%d' )= #{date}
        AND ( h.`hb_type` =5 OR h.`hb_type` =6 OR h.`hb_type` =7 OR h.`hb_type` =20 OR h.`hb_type` =21 OR h.`hb_type` =22 )
        AND (
        h.`hb_type` =5 OR h.`hb_type` =6 OR h.`hb_type` =7 OR h.`hb_type` =20
        OR h.`hb_type` =21 OR h.`hb_type` =22 )
        GROUP BY h.`hb_uid`
        ORDER BY totalMoney DESC
        ORDER BY
        totalMoney DESC
        LIMIT ${start},${count}
    </select>
	

</mapper>

 fanli/src/main/java/com/yeshi/fanli/mapping/money/AccountDetailHongBaoMapMapper.xml

@@ -10,7 +10,7 @@
        <result column="ahm_updatetime" property="updateTime" jdbcType="TIMESTAMP" />

        <association property="hongBao" column="ahm_hongbao_id"
            javaType="com.yeshi.fanli.entity.bus.user.HongBao">
            javaType="com.yeshi.fanli.dto.HongBao">
            <id column="ahm_hongbao_id" property="id" jdbcType="BIGINT" />
        </association>


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -20,7 +20,6 @@
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;

import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

@@ -91,8 +90,7 @@
    @Resource

    private AccountMessageMapper accountMessageMapper;



    @Resource

    private MoneyRecordMapper moneyRecordMapper;





    @Resource

    private ThreeSaleGiftMapper threeSaleGiftMapper;


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

@@ -24,7 +24,6 @@
import com.yeshi.fanli.dao.mybatis.ExtractMapper;

import com.yeshi.fanli.dao.mybatis.ExtractRecordMapper;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;

import com.yeshi.fanli.dao.mybatis.PayInfoMapper;

import com.yeshi.fanli.dao.mybatis.SystemMapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

@@ -32,13 +31,11 @@
import com.yeshi.fanli.dao.user.AccountMessageDao;

import com.yeshi.fanli.dao.user.ExtractDao;

import com.yeshi.fanli.dao.user.ExtractRecordDao;

import com.yeshi.fanli.dao.user.MoneyRecordDao;

import com.yeshi.fanli.dto.HongBao;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.CMQManager;

@@ -76,8 +72,6 @@
    @Resource

    private UserInfoService userInfoService;



    @Resource

    private MoneyRecordService moneyRecordService;



    @Resource

    private ConfigService configService;

@@ -105,16 +99,10 @@
    private ExtractRecordDao extractRecordDao;



    @Resource

    private MoneyRecordDao moneyRecordDao;



    @Resource

    private AccountMessageDao accountMessageDao;



    @Resource

    private PayInfoMapper payInfoMapper;



    @Resource

    private MoneyRecordMapper moneyRecordMapper;



    @Resource

    private AccountMessageMapper accountMessageMapper;

@@ -199,9 +187,6 @@
        UserInfo user = find.getUserInfo();



        userInfoMapper.addHongBaoByUid(user.getId(), find.getMoney());



        // 删除提现记录

        moneyRecordMapper.deleteMoneyRecordByExtractId(id);



        // 更新原来的状态

        Extract updateExtract = new Extract();

@@ -292,11 +277,6 @@


        // 减去账户资金

        userInfoMapper.subHongBaoByUid(extract.getUserInfo().getId(), extract.getMoney());



        MoneyRecord moneyRecord = new MoneyRecord(user, null, extract.getMoney(), "提现", "", extract.getExtractTime(),

                2);

        moneyRecord.setExtract(extract);

        moneyRecordMapper.insertSelective(moneyRecord);



        // 新版资金详情

        try {


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

File was deleted

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

@@ -22,7 +22,6 @@
import com.qcloud.cos.model.ObjectListing;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.BindingAccountMapper;

import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;

import com.yeshi.fanli.dao.mybatis.UserConnectHistoryMapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

@@ -75,11 +74,8 @@
    @Resource

    private ThreeSaleSerivce threeSaleSerivce;





    @Resource

    private AccountMessageMapper accountMessageMapper;

    @Resource

    private MoneyRecordMapper moneyRecordMapper;



    @Resource

    private SpreadUserImgService spreadUserImgService;

@@ -844,7 +840,6 @@
        // 备份邀请关系

        List<ThreeSale> threeSaleList = new ArrayList<>();





        FileWriter fw = null;

        try {

            // 设置为:True,表示写入的时候追加数据

@@ -861,7 +856,6 @@


            fw.write("#ThreeSale" + "\r\n");

            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(threeSaleList) + "\r\n");





            fw.close();




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

File was deleted