admin
2019-01-09 83411485753bba8573f8d1e65e4e6df299d9fd20
修改部分Bug
2个文件已修改
6 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml
@@ -183,7 +183,7 @@
        AND
        yeh.`hb_uid` = #{uid}
        AND
        FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m-%d') =
        FROM_UNIXTIME(UNIX_TIMESTAMP(yeh.hb_create_time),'%Y-%m-%d') =
        FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m-%d');
    </select>
@@ -203,7 +203,7 @@
        AND
        yeh.`hb_uid` = #{uid}
        AND
        FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m') =
        FROM_UNIXTIME(UNIX_TIMESTAMP(yeh.hb_create_time),'%Y-%m') =
        FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m');
    </select>
fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
@@ -92,7 +92,7 @@
        hongBao.setId(hongBaoDTO.getId());
        hongBao.setOrderId(hongBaoDTO.getOrderId());
        if (hongBaoDTO.getSettlement() != null)
        if (hongBaoDTO.getSettlement() != null&&hongBaoDTO.getSettlement().compareTo(new BigDecimal(0))>0)
            hongBao.setPayMoney(hongBaoDTO.getSettlement());
        else
            hongBao.setPayMoney(hongBaoDTO.getPayMoney());