Merge remote-tracking branch 'origin/div' into div

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java

@@ -75,6 +75,9 @@
         // 修改状态

         InviteOrderSubsidy update = new InviteOrderSubsidy(old.getId());

         update.setMoney(orderSubsidy.getMoney());

         if (old.getState() == InviteOrderSubsidy.STATE_UNKNOWN) {// 状态未确定之前才可以更改原始补贴资金

            update.setOriginalMoney(orderSubsidy.getOriginalMoney());

         }

         update.setState(orderSubsidy.getState());

         update.setUpdateTime(new Date());

         inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);

@@ -147,10 +150,11 @@
                        rate = firstRate;

                     else

                        rate = secondRate;

                     BigDecimal money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(totalMoney, rate),

                     BigDecimal money = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(totalMoney, rate),

                           new BigDecimal(100));

                     InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy();

                     orderSubsidy.setMoney(money);

                     orderSubsidy.setOriginalMoney(money);

                     orderSubsidy.setUid(uid);

                     orderSubsidy.setOrderNo(orderId);

                     orderSubsidy.setSourceType(sourceType);