userInfo依赖的mapper修改

admin

2019-09-17 5edb1bd7f9bb27b7c55c78821290e1fda4fb89a9

userInfo依赖的mapper修改

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceActiveMapper.java

@@ -19,6 +19,8 @@
    int updateByPrimaryKey(DeviceActive record);

    DeviceActive selectByDeviceAndPlatform(@Param("device") String device, @Param("platform") int platform);
	
    DeviceActive selectFirstByDeviceAndPlatform(@Param("device") String device, @Param("platform") int platform);

    DeviceActive selectByDeviceToeknMd5AndPlatform(@Param("deviceTokenMd5") String deviceTokenMd5,
            @Param("platform") int platform);

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

@@ -16,7 +16,7 @@
        <result column="adminId" property="adminId" jdbcType="BIGINT" />



        <association property="userInfo" column="uid"

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey">

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey">

        </association>



        <association property="system" column="sid"


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

@@ -32,10 +32,10 @@
        <result column="expire" property="expire" jdbcType="INTEGER" />

        <association property="boss" column="boss_id"
            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey" />
            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" />

        <association property="worker" column="worker_id"
            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey" />
            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" />

        <association property="threeSaleExtraInfo" column="tf_id"
            resultMap="com.yeshi.fanli.dao.mybatis.ThreeSaleExtraInfoMapper.BaseResultMap" />

 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml

@@ -147,7 +147,7 @@
        <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />



        <association property="userInfo" column="co_uid"

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey" />

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" />



        <association property="commonOrderGoods" column="co_order_goods_id"

            select="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.selectByPrimaryKey" />


 fanli/src/main/java/com/yeshi/fanli/mapping/order/LostOrderMapper.xml

@@ -33,7 +33,7 @@
        <result column="judge" property="judge" jdbcType="VARCHAR" />

        <result column="result_code" property="resultCode" jdbcType="INTEGER" />

        <association property="userInfo" column="uid"

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey" />

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" />

        <association property="order" column="oid"

            select="com.yeshi.fanli.dao.mybatis.order.OrderMapper.selectByPrimaryKey" />

    </resultMap>


 fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml

@@ -32,6 +32,13 @@
        from yeshi_ec_device_active where da_device = #{device} and
        da_platform=#{platform} order by da_id desc  limit 1
    </select>
	
    <select id="selectFirstByDeviceAndPlatform" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_device_active where da_device = #{device} and
        da_platform=#{platform} limit 1
    </select>

    <select id="selectByDeviceToeknMd5AndPlatform" resultMap="BaseResultMap">
        select

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java

@@ -72,11 +72,11 @@
        DeviceActive deviceActive = null;

        if ("android".equalsIgnoreCase(platform)) {



            deviceActive = deviceActiveMapper.selectByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);

            deviceActive = deviceActiveMapper.selectFirstByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);



        } else if ("ios".equalsIgnoreCase(platform)) {



            deviceActive = deviceActiveMapper.selectByDeviceAndPlatform(device, DeviceActive.PLATFORM_IOS);

            deviceActive = deviceActiveMapper.selectFirstByDeviceAndPlatform(device, DeviceActive.PLATFORM_IOS);



        }