Ver código fonte

绩效奖计算取值修改

kevin_zhangl 3 anos atrás
pai
commit
36070da4ef

+ 1 - 1
common/helpers/bonus/BonusCalc.php

@@ -1244,7 +1244,7 @@ class BonusCalc extends BaseObject {
                 CalcCache::bonus($userId, $periodNum, 'BONUS_QY', $teamBonus, $deductData);
 
                 // TODO:取小腿值
-                $payLeg = max([$perfArr['SURPLUS_1L'], $perfArr['SURPLUS_2L']]);
+                $payLeg = min([$perfArr['SURPLUS_1L'], $perfArr['SURPLUS_2L']]);
                 // 计算荣衔星级
                 $starCrown = StarCrownLevel::getStarCrown($payLeg);
                 // 星级放入缓存

+ 0 - 1
frontendEle/src/views/shop/order.vue

@@ -489,7 +489,6 @@
 
                     this.visible = false
                     this.payStackLoading = false
-                    this.$router.go(-1)
                     this.$router.push({path: `/shop/order-list`})
                 }).catch((err) => {
                     this.$message({