Ver código fonte

【fix】【结算异常】
1.周末结算异常修复

ChenYL 1 ano atrás
pai
commit
4a55705ad9

+ 1 - 1
src/main/java/com/punchsettle/server/service/manager/impl/SettleManagerImpl.java

@@ -284,7 +284,7 @@ public class SettleManagerImpl implements ISettleManager {
             }
 
             // 周末双倍奖励,否则计算普通奖励
-            settleRewardNum += settleInfo.getWeekendFlag() ? punchIn.getRewardNum() * 2 : punchIn.getRewardNum();
+            settleRewardNum += settleInfo.getWeekendFlag() && punchIn.getWeekendDoubleFlag() ? punchIn.getRewardNum() * 2 : punchIn.getRewardNum();
             // 计算全勤双倍奖励
             if (judgeFullAttendance(settleInfo, punchIn, weeklyPunchInRecordMap)) {
                 settleRewardNum += punchIn.getRewardNum() * 2;