签到进度百分比

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInServiceImpl.java

@@ -4,6 +4,7 @@ import com.wwdz.ch.core.api.wxpay.WxPayServiceApi;
 import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.consts.SigninEnum;
+import com.wwdz.ch.core.consts.qiandao.SignInTaskEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.IdUtils;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
@@ -210,6 +211,16 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
             //查询累计签到天数
             long totalDays = qdUserSignInDao.countTotalRecord(dto.getUserId(), taskId);
             map.put("totalDays", totalDays);
+            //进度条
+            if (taskId != null && taskId != CommConsts.DEFAULT_TASK_ID.longValue()) {
+                SignInTask signInTask = signInTaskDao.findById(taskId);
+                int goalDays = signInTask.getGoalDays();
+                if (signInTask.getType() == SignInTaskEnum.TypeEnum.CONTINUOUS.getCode()) {
+                    map.put("rate", (int)Math.ceil((Double.valueOf(map.get("consecutiveDays").toString()) / goalDays) * 100));
+                } else {
+                    map.put("rate", (int)Math.ceil((Double.valueOf(map.get("totalDays").toString()) / goalDays) * 100));
+                }
+            }
             return Result.success(map);
         } catch (Exception e) {
             logger.error("查询签到信息失败 error:{}", e);