admin
2019-03-22 31c87f9868f01facd0c360ab49e3970beca9988d
Bug修改
4个文件已修改
25 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SuperRecommendBannerMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -35,6 +35,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import net.sf.json.JSONArray;
@@ -94,7 +95,7 @@
        data.put("everyDayTaskList", new JSONArray());
        data.put("inviteGetMoneyList",
                JSONArray.fromObject(JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList)));
        if (uid.equals("0") || uid == null) {
        if (StringUtil.isNullOrEmpty(uid) || uid.equalsIgnoreCase("0")) {
            data.put("myTeam", "---");
            data.put("moneyToday", "---");
            data.put("moneyMonth", "---");
fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java
@@ -17,7 +17,7 @@
    /**
     * 
     */
    private static final long serialVersionUID = 1L;
    private static final Long serialVersionUID = 1L;
    @Column(name = "id")
    private Long id;
@@ -31,16 +31,16 @@
    public JumpDetail() {
    }
    public JumpDetail(long id) {
    public JumpDetail(Long id) {
        super();
        this.id = id;
    }
    public long getId() {
    public Long getId() {
        return id;
    }
    public void setId(long id) {
    public void setId(Long id) {
        this.id = id;
    }
fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SuperRecommendBannerMapper.xml
@@ -28,8 +28,8 @@
    <select id="listBySystem" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_super_recommendbanner left join
        r.*
        from yeshi_ec_super_recommendbanner r left join
        yeshi_ec_recommend_banner b on recommendbanner_id=b.id where system_id
        = #{0} order by b.orderby
    </select>
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyServiceImpl.java
@@ -17,17 +17,21 @@
    @Override
    public BigDecimal getMoneyToday(Long uid) {
        return shareMapper.getMoneyToday(uid + "");
        BigDecimal money = shareMapper.getMoneyToday(uid + "");
        return money == null ? new BigDecimal(0) : money;
    }
    @Override
    public BigDecimal getMoneyMonth(Long uid) {
        return shareMapper.getMoneyMonth(uid + "");
        BigDecimal money = shareMapper.getMoneyMonth(uid + "");
        return money == null ? new BigDecimal(0) : money;
    }
    @Override
    public BigDecimal getMoneyLastMonth(Long uid) {
        return shareMapper.getMoneyLastMonth(uid + "");
        BigDecimal money = shareMapper.getMoneyLastMonth(uid + "");
        return money == null ? new BigDecimal(0) : money;
    }
}