diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupRewardRankLog.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupRewardRankLog.java
index abd565a..b6a134d 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupRewardRankLog.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupRewardRankLog.java
@@ -60,6 +60,10 @@ public class EvalGroupRewardRankLog extends BaseAuditableTimeEntity<EvalGroupRew
      * 排名
      */
     private Integer rank;
+    /**
+     * 命中
+     */
+    private Boolean hit;
 
     /**
      * 数据日期
diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java
new file mode 100644
index 0000000..da7af71
--- /dev/null
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java
@@ -0,0 +1,71 @@
+package cn.fw.morax.domain.vo.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import cn.fw.morax.domain.enums.EvalScopeEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 指标命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorHitLog
+ * @description : 指标命中记录
+ * @date : 2022-12-13 10:27
+ */
+@Data
+public class EvalGroupRewardHitLogVO {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 员工id
+     */
+    private Long poolId;
+
+    /**
+     * 考评范围; 1:门店考评 2:人员考评
+     */
+    private EvalScopeEnum scopeType;
+    /**
+     * 奖惩项id
+     */
+    private Long evalGroupRewardId;
+    /**
+     * 命中的奖惩配置项
+     */
+    private Long evalGroupRewardLaddersId;
+    /**
+     * 奖惩值
+     */
+    private BigDecimal rewardValue;
+    /**
+     * 命中的台阶指标值
+     */
+    private BigDecimal hitLadderValue;
+    /**
+     * 命中的提成指标值
+     */
+    private BigDecimal hitCommissionValue;
+    /**
+     * 占比
+     */
+    private BigDecimal proportionValue;
+    /**
+     * 数据日期
+     */
+    private LocalDate dataDate;
+    /**
+     * 集团id
+     */
+    private Long groupId;
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+}
diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardRankLogVO.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardRankLogVO.java
index c7e6a2d..207fbb9 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardRankLogVO.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardRankLogVO.java
@@ -60,6 +60,10 @@ public class EvalGroupRewardRankLogVO {
      * 排名
      */
     private Integer rank;
+    /**
+     * 命中
+     */
+    private Boolean hit;
 
     /**
      * 数据日期
diff --git a/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java b/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
index 589d0f5..374ab5f 100644
--- a/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
+++ b/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
@@ -198,7 +198,7 @@ public class EvalPoolController {
     }
 
     /**
-     *  门店、人员考评条件指标排名
+     *  门店、人员考评条件指标排名（排名条件使用）
      *
      * @param preconditionId
      * @param dataDate
@@ -212,7 +212,7 @@ public class EvalPoolController {
     }
 
     /**
-     *  门店、人员考评提成指标排名
+     *  门店、人员考评提成指标排名（排名计算使用）
      *
      * @param evalGroupRewardId
      * @param dataDate
@@ -225,7 +225,19 @@ public class EvalPoolController {
         return success(evalGroupPoolService.queryRewardCommissionRank(evalGroupRewardId, dataDate));
     }
 
-
+    /**
+     *  门店、人员考评奖惩占比（占比计算使用）
+     *
+     * @param evalGroupRewardId
+     * @param dataDate
+     * @return
+     */
+    @GetMapping("/reward-proportion")
+    @ControllerMethod("门店、人员考评奖惩占比")
+    public Message<List<EvalGroupRewardHitLogVO>> queryRewardProportion(Long evalGroupRewardId,
+                                                                             @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
+        return success(evalGroupPoolService.queryRewardProportion(evalGroupRewardId, dataDate));
+    }
 
 
     /**
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardBaseCalculator.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardBaseCalculator.java
index 54235ba..bc2a2c0 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardBaseCalculator.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardBaseCalculator.java
@@ -174,6 +174,7 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
      *
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     protected void examineRankPreconditions(List<EvalGroupUserShop> userShops, List<EvalGroupRewardPrecondition> preconditions) {
         if (CollectionUtils.isEmpty(preconditions)) {
             return;
@@ -201,6 +202,7 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
             List<EvalGroupRewardRankLog> matchRankLogs = rankLogs.stream().filter(rankLog -> {
                 return rankLog.getRank() > _startIndex && rankLog.getRank() <= _endIndex;
             }).collect(Collectors.toList());
+            updateHitRankLog(matchRankLogs);
 
             AtomicInteger rank = new AtomicInteger(0);
             for (EvalGroupRewardRankLog rankLog : matchRankLogs) {
@@ -238,6 +240,7 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
         return params;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     protected void saveTargetHitLog(EvalGroupUserShop userShop, Long rewardReferId, IndicatorTypeEnum targetType, BigDecimal value, BigDecimal reachValue) {
         evalGroupRewardTargetHitLogService.remove(Wrappers.<EvalGroupRewardTargetHitLog>lambdaQuery()
                 .eq(EvalGroupRewardTargetHitLog::getPoolId, userShop.getPoolId())
@@ -259,6 +262,7 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
         evalGroupRewardTargetHitLogService.save(log);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     protected void savePreHitLog(EvalGroupUserShop userShop, EvalGroupRewardPrecondition precondition, Consumer<EvalGroupRewardPreconditionHitLog> consumer) {
         evalGroupRewardPreconditionHitLogService.remove(Wrappers.<EvalGroupRewardPreconditionHitLog>lambdaQuery()
                 .eq(EvalGroupRewardPreconditionHitLog::getPoolId, userShop.getPoolId())
@@ -469,6 +473,7 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
                     .targetType(RankIndicatorTypeEnum.REWARD_COMMISSION)
                     .value(commissionValue)
                     .reachValue(commissionValue)
+                    .hit(Boolean.FALSE)
                     .dataDate(userShop.getDataDate())
                     .groupId(userShop.getGroupId())
                     .build();
@@ -514,6 +519,7 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
         return rankLogs;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void saveRankLogs(Long evalGroupRewardId, List<EvalGroupRewardRankLog> rankLogs, RankIndicatorTypeEnum targetType) {
         Set<Long> poolIds = rankLogs.stream().map(EvalGroupRewardRankLog::getPoolId).collect(Collectors.toSet());
         EvalGroupRewardRankLog rankLog = rankLogs.stream().findFirst().get();
@@ -528,6 +534,17 @@ public abstract class EvalRewardBaseCalculator implements Calculator<EvalGroupUs
         evalGroupRewardRankLogService.saveBatch(rankLogs);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void updateHitRankLog(List<EvalGroupRewardRankLog> matchRankLogs) {
+        if (PublicUtil.isEmpty(matchRankLogs)) {
+            return;
+        }
+        evalGroupRewardRankLogService.update(Wrappers.<EvalGroupRewardRankLog>lambdaUpdate()
+                .eq(EvalGroupRewardRankLog::getId, matchRankLogs.stream().map(EvalGroupRewardRankLog::getId).collect(Collectors.toList()))
+                .set(EvalGroupRewardRankLog::getHit, Boolean.TRUE)
+        );
+    }
+
     /**
      * 初始化奖惩值
      *
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardProportionCalculator.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardProportionCalculator.java
index 2cc0648..39be6c9 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardProportionCalculator.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardProportionCalculator.java
@@ -69,25 +69,8 @@ public class EvalRewardProportionCalculator extends EvalRewardBaseCalculator {
             referValueMap.put(poolId, commissionValue);
         }
 
-        if (BigDecimal.ZERO.compareTo(totalCommissionValue) == 0) {
-            for (EvalGroupUserShop userShop : userShops) {
-                BigDecimal proportion = BigDecimal.ZERO;
-                BigDecimal rewardValue = BigDecimal.ZERO;
-                userShop.setEvalGroupRewardAmount(rewardValue);
-                clearProjectHitLog(evalGroupRewardId, userShop);
-                saveProjectHitLog(evalGroupRewardId, userShop, log -> {
-                    log.setRewardValue(rewardValue);
-                    log.setHitCommissionValue(proportion);
-                });
-            }
-        }
-
         for (EvalGroupUserShop userShop : userShops) {
             boolean examined = examinePrecondition(userShop, preconditions);
-            if (!examined) {
-                userShop.setEvalGroupRewardAmount(BigDecimal.ZERO);
-                continue;
-            }
 
             BigDecimal commissionValue = referValueMap.getOrDefault(userShop.getPoolId(), BigDecimal.ZERO);
 
@@ -98,6 +81,11 @@ public class EvalRewardProportionCalculator extends EvalRewardBaseCalculator {
                 rewardValue = proportion.multiply(money).divide(BigDecimal.ONE, 2, RoundingMode.DOWN);
             }
 
+            //未通过条件，奖惩为0，保存日志
+            if (!examined) {
+                rewardValue = BigDecimal.ZERO;
+            }
+
             userShop.setEvalGroupRewardAmount(rewardValue);
             clearProjectHitLog(evalGroupRewardId, userShop);
             BigDecimal finalRewardValue = rewardValue;
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java
index eb3e823..0334194 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java
@@ -5,6 +5,7 @@ import cn.fw.morax.domain.bo.eval.EvalGroupUserShop;
 import cn.fw.morax.domain.db.eval.*;
 import cn.fw.morax.domain.enums.*;
 import cn.fw.morax.service.biz.CommonService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sun.org.apache.regexp.internal.RE;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -71,6 +72,7 @@ public class EvalRewardRankCalculator extends EvalRewardBaseCalculator {
             final BigDecimal money = ladder.getMoney();
 
             List<EvalGroupRewardRankLog> matchRankLogs = matchRank(rankType, personCount, ladder, rankLogs);
+            updateHitRankLog(matchRankLogs);
 
             for (EvalGroupRewardRankLog rankLog : matchRankLogs) {
                 EvalGroupUserShop userShop = poolUserShopMap.get(rankLog.getPoolId());
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
index d3e3e06..09e7499 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
@@ -1246,10 +1246,6 @@ public class EvalGroupPoolService {
     }
 
     public List<EvalGroupRewardRankLogVO> queryRewardCommissionRank(Long evalGroupRewardId, LocalDate dataDate) {
-//        EvalGroupRewardPrecondition precondition = evalGroupRewardPreconditionService.getById(preconditionId);
-//        BV.notNull(precondition, "奖惩条件不存在");
-//        final DataTypeEnum dataType = precondition.getDataType();
-//        final TargetTypeEnum targetType = precondition.getTargetType();
         List<EvalGroupRewardRankLog> rankLogs = evalGroupRewardRankLogService.list(Wrappers.<EvalGroupRewardRankLog>lambdaQuery()
                 .eq(EvalGroupRewardRankLog::getDataDate, dataDate)
                 .eq(EvalGroupRewardRankLog::getReferId, evalGroupRewardId)
@@ -1259,7 +1255,15 @@ public class EvalGroupPoolService {
         Collections.sort(rankLogs);
 
         List<EvalGroupRewardRankLogVO> rankLogVOs = PublicUtil.copyList(rankLogs, EvalGroupRewardRankLogVO.class);
-//        rankLogVOs.stream().forEach(rankLog -> rankLog.convertValueToPercent(dataType, targetType));
         return rankLogVOs;
     }
+
+    public List<EvalGroupRewardHitLogVO> queryRewardProportion(Long evalGroupRewardId, LocalDate dataDate) {
+        List<EvalGroupRewardHitLog> rewardHitLogs = evalGroupRewardHitLogService.list(Wrappers.<EvalGroupRewardHitLog>lambdaQuery()
+                .eq(EvalGroupRewardHitLog::getEvalGroupRewardId, evalGroupRewardId)
+                .eq(EvalGroupRewardHitLog::getDataDate, dataDate)
+        );
+        List<EvalGroupRewardHitLogVO> hitLogVOS = PublicUtil.copyList(rewardHitLogs, EvalGroupRewardHitLogVO.class);
+        return hitLogVOS;
+    }
 }