Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -301,6 +301,10 @@
            hongBao.setState(HongBaoV2.STATE_KELINGQU);

            hongBao.setMoney(

                  MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));

            if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_PDD)// 拼多多15天半到账

               hongBao.setPreGetTime(new Date(

                     commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L + 1000 * 60 * 60 * 12L));

            else

            hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));

            if (mianDan)

               hongBao.setMoney(commonOrder.getSettlement().compareTo(commonOrder.getPayment()) <= 0

@@ -308,7 +312,6 @@
         } else if (commonOrder.getState() == CommonOrder.STATE_SX) {

            hongBao.setState(HongBaoV2.STATE_SHIXIAO);

            hongBao.setMoney(new BigDecimal(0));



         }



         // 新老红包状态一致不处理

@@ -673,6 +676,10 @@
            hongBao.setState(HongBaoV2.STATE_KELINGQU);

            hongBao.setMoney(

                  MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));

            if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_PDD)// 拼多多15天半到账

               hongBao.setPreGetTime(new Date(

                     commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L + 1000 * 60 * 60 * 12L));

            else

            hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));

         } else if (commonOrder.getState() == CommonOrder.STATE_SX) {

            hongBao.setState(HongBaoV2.STATE_SHIXIAO);