admin
2018-12-24 46de50dee30e6f7b7b61d64b7704f4abc131a505
动态商品更新
6个文件已修改
44 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/activity/RecommendActivityTaoBaoGoodsMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java
@@ -28,6 +28,8 @@
    List<TaoBaoGoodsBrief> getTaoBaoGoodsBriefByActivityId(Long activityId);
    List<RecommendActivityTaoBaoGoods> selectByActivityId(Long activityId);
    List<RecommendActivityTaoBaoGoods> selectByAuctionId(Long auctionId);
    List<RecommendActivityTaoBaoGoods> selectList(@Param("start") Long start, @Param("count") int count);
fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
@@ -19,7 +19,7 @@
public class UserMoneyDetail {
    public enum UserMoneyDetailTypeEnum {
        share("分享奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), invite("邀请奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("奖金收入", "", ""), fanli("返利到账", "",
        share("分享奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), invite("邀请奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("奖金收入", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), fanli("返利到账", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png",
                ""), fanliWeiQuan("返利扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", ""), inviteWeiQuan("邀请奖金扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), shareWeiQuan("分享奖金扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png",
                        ""), weiQuan("售后订单扣款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", ""), systemEqualize("系统补齐", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_system.png", ""), scoreConvert("积分兑换", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png",
                                ""), hongbao("官方红包", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png", "http://www.baidu.com"), hongbaoDeduct("红包退款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png",
fanli/src/main/java/com/yeshi/fanli/mapping/activity/RecommendActivityTaoBaoGoodsMapper.xml
@@ -49,6 +49,13 @@
        JOIN yeshi_ec_taobao_goods g ON t.`agt_goods_id`=g.`id` WHERE
        t.`agt_activity_id`=#{0}
    </select>
    <select id="selectByAuctionId" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        SELECT * FROM yeshi_ec_activity_goods_taobao where agt_auctionid=#{0}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_activity_goods_taobao where agt_id = #{id,jdbcType=BIGINT}
    </delete>
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -704,5 +704,27 @@
    @Override
    public ActivityUser selectActivityUserByPrimaryKey(Long id) {
        return activityUserMapper.selectByPrimaryKey(id);
    }
    @Override
    public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods) {
        List<RecommendActivityTaoBaoGoods> list = recommendActivityTaoBaoGoodsMapper
                .selectByAuctionId(goods.getAuctionId());
        BigDecimal d = TaoBaoUtil.getAfterUseCouplePrice(goods);
        RecommendActivityTaoBaoGoods updateGoods = new RecommendActivityTaoBaoGoods();
        if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"无".equalsIgnoreCase(goods.getCouponInfo())) {
            updateGoods.setDesc("券后价:¥" + d);
            updateGoods.setState(RecommendActivityTaoBaoGoods.STATE_NORMAL);
        } else {
            updateGoods.setState(RecommendActivityTaoBaoGoods.STATE_UNSHELVE);
        }
        if (list != null)
            for (RecommendActivityTaoBaoGoods tbGoods : list) {
                updateGoods.setId(tbGoods.getId());
                recommendActivityTaoBaoGoodsMapper.updateByPrimaryKeySelective(updateGoods);
            }
    }
}
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
@@ -124,6 +124,9 @@
                taoBaoGoodsBriefMapper.updateByPrimaryKeySelective(updateGoods);
            }
        // 更新动态商品
        activityService.updateRecommendActivityGoods(goods);
    }
    @Override
fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
@@ -8,6 +8,7 @@
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -248,4 +249,11 @@
     * @throws ActivityException
     */
    public JSONObject shareGoodsV2(Long uid, Long activityId) throws ActivityException, UserShareGoodsRecordException;
    /**
     * 更新动态商品详情
     * @param goods
     */
    public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods);
}