admin
2019-08-21 774a788ee1c5f6b94e3eed68145601c02c977ea8
签到修改
3个文件已修改
8 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -55,6 +55,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.vo.integral.DailySignVO;
import com.yeshi.fanli.vo.integral.ExchangeTipVO;
import com.yeshi.fanli.vo.integral.IntegralDetailVO;
@@ -111,6 +112,7 @@
     * @param page
     * @param out
     */
//    @RequestSerializableByKey(key="#acceptData.device")
    @RequestMapping(value = "getTaskList", method = RequestMethod.POST)
    public void getTaskList(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
        if (uid == null || uid <= 0) {
fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml
@@ -140,6 +140,10 @@
    <select id="listDaySignRecord" resultMap="BaseResultMap">
        SELECT * FROM yeshi_ec_integral_task_record d
        WHERE d.`ir_uid` = #{uid}
        <if test="cid!=null">
            and d.ir_cid=#{cid}
        </if>
        AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]>
        DATE(d.ir_create_time)
        ORDER BY d.ir_create_time desc
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
@@ -159,7 +159,7 @@
        }
        
        for (int i = 1; i <= 7- listDays.size(); i ++) {
            String after = format.format(DateUtil.reduceDay(i, date));
            String after = format.format(DateUtil.plusDayDate(i, date));
            if (after.startsWith("0")) 
                after = after.substring(1, after.length());