Merge branch 'fix-hotbugs' into 'master'

修改类名为 PaybackController

See merge request !188

src/main/java/com/edgec/browserbackend/browser/task/PromotionTask.java

@@ -72,9 +72,9 @@ public class PromotionTask {
             promotion.setTotalCommission((int) (promotion.getTotalCommission() + totalCommission));
             promotion.setCommissionLastMonth((int) totalCommission);
             promotion.setGift(totalCommission * 0.08);
-            if (account.getPromotion().isSale()) {
+            /*if (account.getPromotion().isSale()) {
                 promotion.setGift(totalCommission * 0.1 + secondCommission * 0.02);
-            }
+            }*/
 
             if (account.getPromotion().isDistributor()) {
                 promotion.setGift(totalCommission * globalFieldRepository.findAll().get(0).getDistributorRate().doubleValue());
@@ -125,9 +125,9 @@ public class PromotionTask {
 
             // 4. 不同角色的人给不同的提成
             promotion.setGift(totalCommission * 0.08);
-            if (account.getPromotion().isSale()) {
+            /*if (account.getPromotion().isSale()) {
                 promotion.setGift(totalCommission * 0.1 + secondCommission * 0.02);
-            }
+            }*/
             if (account.getPromotion().isDistributor()) {
                 promotion.setGift(totalCommission * globalFieldRepository.findAll().get(0).getDistributorRate().doubleValue());
             }