fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/SpreadUserImgMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/dao/user/SpreadUserImgDao.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/dao/user/ThreeSaleRankDao.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/job/ThreeSaleJob.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/mapping/share/SpreadUserImgMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleRankServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleRankService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -61,7 +61,6 @@ import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.user.ShamUserService; @@ -98,7 +97,7 @@ @Resource private ConfigService configService; @Resource private HongBaoManageService hongBaoManageService; @@ -126,9 +125,6 @@ private UserInfoService userInfoService; @Resource private ThreeSaleRankService threeSaleRankService; @Resource private BusinessSystemService businessSystemService; @Resource @@ -153,7 +149,6 @@ + Constant.systemCommonConfig.getAndroidPackageName(); private static final String DOWNURL2 = "http://121.42.200.138/apk/fanliquan20180124.apk"; @RequestMapping("coupon") public String conpon(Model model) { @@ -214,7 +209,6 @@ data.put("proportion", proportion); out.print(JsonUtil.loadTrueResult(data)); } @RequestMapping("share") public String getShare(Model model, String uid) { fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/SpreadUserImgMapper.java
@@ -2,7 +2,10 @@ import java.util.List; public interface SpreadUserImgMapper { import com.yeshi.fanli.dao.BaseMapper; import com.yeshi.fanli.entity.bus.invite.SpreadUserImg; public interface SpreadUserImgMapper extends BaseMapper<SpreadUserImg> { List<String> getImgUrlList(Long uid); @@ -10,4 +13,12 @@ void deleteImgUrl(Long uid); /** * 获取用户的推广图 * * @param uid * @return */ List<SpreadUserImg> listByUid(Long uid); } fanli/src/main/java/com/yeshi/fanli/dao/user/SpreadUserImgDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/dao/user/ThreeSaleRankDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/job/ThreeSaleJob.java
@@ -5,9 +5,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.util.Constant; @Component public class ThreeSaleJob { @@ -15,19 +13,10 @@ @Resource private ThreeSaleSerivce threeSaleSerivce; @Resource private ThreeSaleRankService threeSaleRankService; @Scheduled(cron = "0 0 */1 * * ? ") public void twentyFour() { // if (Constant.IS_TASK) // threeSaleSerivce.validateTwentyFour(); } @Scheduled(cron = "0 0 0 ? * MON ") public void updateRank() { if (Constant.IS_TASK) threeSaleRankService.update(); } } fanli/src/main/java/com/yeshi/fanli/mapping/share/SpreadUserImgMapper.xml
@@ -1,18 +1,91 @@ <?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.share.SpreadUserImgMapper"> <select id="getImgUrlList" resultType="String"> SELECT `si_url` FROM `yeshi_ec_spread_user_img` WHERE `si_uid` = #{uid}; <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.invite.SpreadUserImg"> <id column="si_id" property="id" jdbcType="BIGINT" /> <result column="si_uid" property="uid" jdbcType="BIGINT" /> <result column="si_type" property="type" jdbcType="INTEGER" /> <result column="si_url" property="url" jdbcType="VARCHAR" /> <result column="si_createtime" property="createtime" jdbcType="TIMESTAMP" /> </resultMap> <sql id="Base_Column_List">si_id,si_uid,si_type,si_url,si_createtime</sql> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long"> select <include refid="Base_Column_List" /> from yeshi_ec_spread_user_img where si_id = #{id,jdbcType=BIGINT} </select> <select id="listByUid" resultMap="BaseResultMap" parameterType="java.lang.Long"> select <include refid="Base_Column_List" /> from yeshi_ec_spread_user_img where si_uid = #{0} </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_spread_user_img where si_id = #{id,jdbcType=BIGINT}</delete> <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.invite.SpreadUserImg" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_spread_user_img (si_id,si_uid,si_type,si_url,si_createtime) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{type,jdbcType=INTEGER},#{url,jdbcType=VARCHAR},#{createtime,jdbcType=TIMESTAMP}) </insert> <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.invite.SpreadUserImg" useGeneratedKeys="true" keyProperty="id"> insert into yeshi_ec_spread_user_img <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null">si_id,</if> <if test="uid != null">si_uid,</if> <if test="type != null">si_type,</if> <if test="url != null">si_url,</if> <if test="createtime != null">si_createtime,</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=INTEGER},</if> <if test="url != null">#{url,jdbcType=VARCHAR},</if> <if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if> </trim> </insert> <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.invite.SpreadUserImg">update yeshi_ec_spread_user_img set si_uid = #{uid,jdbcType=BIGINT},si_type = #{type,jdbcType=INTEGER},si_url = #{url,jdbcType=VARCHAR},si_createtime = #{createtime,jdbcType=TIMESTAMP} where si_id = #{id,jdbcType=BIGINT} </update> <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.invite.SpreadUserImg"> update yeshi_ec_spread_user_img <set> <if test="uid != null">si_uid=#{uid,jdbcType=BIGINT},</if> <if test="type != null">si_type=#{type,jdbcType=INTEGER},</if> <if test="url != null">si_url=#{url,jdbcType=VARCHAR},</if> <if test="createtime != null">si_createtime=#{createtime,jdbcType=TIMESTAMP},</if> </set> where si_id = #{id,jdbcType=BIGINT} </update> <select id="getImgUrlList" resultType="String"> SELECT `si_url` FROM `yeshi_ec_spread_user_img` WHERE `si_uid` = #{uid}; </select> <select id="imgUrlCount" resultType="Integer"> SELECT COUNT(1) FROM `yeshi_ec_spread_user_img` WHERE `si_uid` = #{uid}; SELECT COUNT(1) FROM `yeshi_ec_spread_user_img` WHERE `si_uid` = #{uid}; </select> <delete id="deleteImgUrl"> DELETE FROM `yeshi_ec_spread_user_img` WHERE `si_uid` = #{uid}; DELETE FROM `yeshi_ec_spread_user_img` WHERE `si_uid` = #{uid}; </delete> </mapper> fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleRankServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
@@ -15,7 +15,6 @@ import com.yeshi.fanli.dao.mybatis.share.SpreadUserImgMapper; import com.yeshi.fanli.dao.mybatis.user.SpreadImgMapper; import com.yeshi.fanli.dao.user.SpreadUserImgDao; import com.yeshi.fanli.dao.user.UserInfoDao; import com.yeshi.fanli.entity.bus.invite.SpreadImg; import com.yeshi.fanli.entity.bus.invite.SpreadUserImg; @@ -27,9 +26,6 @@ @Service public class SpreadUserImgServiceImpl implements SpreadUserImgService { @Resource private SpreadUserImgDao spreadUserImgDao; @Resource private SpreadUserImgMapper spreadUserImgMapper; @@ -50,7 +46,7 @@ spreadUserImg.setUrl(imgUrl); // 服务器上的url地址 spreadUserImg.setType(0); spreadUserImg.setCreatetime(new Date()); spreadUserImgDao.save(spreadUserImg); spreadUserImgMapper.insertSelective(spreadUserImg); } @Override @@ -93,7 +89,7 @@ List<String> imgList = new ArrayList<>(); // 查询当前用户的推广图 List<SpreadUserImg> spreadUserImgList = spreadUserImgDao.list("from SpreadUserImg su where su.uid=" + uid); List<SpreadUserImg> spreadUserImgList = spreadUserImgMapper.listByUid(uid); // 查询系统的推广图 List<SpreadImg> spreadImgList = spreadImgMapper.listAll(); @@ -160,7 +156,7 @@ for (String md5 : extraList) { for (SpreadUserImg img : spreadUserImgList) if (img.getMd5().equalsIgnoreCase(md5)) { spreadUserImgDao.delete(img); spreadUserImgMapper.deleteByPrimaryKey(img.getId()); break; } } @@ -192,7 +188,7 @@ } // 重新查询 spreadUserImgList = spreadUserImgDao.list("from SpreadUserImg su where su.uid=" + uid); spreadUserImgList = spreadUserImgMapper.listByUid(uid); imgList.clear(); if (spreadUserImgList != null) for (SpreadUserImg img : spreadUserImgList) @@ -239,7 +235,7 @@ @Override public int countUserSpreadImg(Long uid) { return (int) (spreadUserImgDao.getCount("select count(*) from SpreadUserImg u where u.uid=" + uid)); return (int) (spreadUserImgMapper.imgUrlCount(uid)); } } fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleRankService.java
File was deleted