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

admin

2019-08-28 08d5529087390663115d326190635e4a4997acf2

 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java

@@ -63,8 +63,7 @@
    * @return

    * @throws UserMoneyDetailException

    */

   public static UserMoneyDetail createShare(Long uid, int orderType, int validCount, int weiQuanCount,

         int invalidCount, BigDecimal money, Date time) throws UserMoneyDetailException {

   public static UserMoneyDetail createShare(Long uid, int orderType, int validCount, int weiQuanCount, BigDecimal money, Date time) throws UserMoneyDetailException {

      if (money == null)

         throw new UserMoneyDetailException(1, "返利金额为空");



@@ -86,7 +85,7 @@
      detail.setMoney(money);

      detail.setTitle(timeF + UserMoneyDetailTypeEnum.share.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.share);

      detail.setDescInfo(String.format("有效订单:%s笔  维权订单:%s笔  失效订单:%s笔", validCount, weiQuanCount, invalidCount));

      detail.setDescInfo(String.format("有效订单:%s笔  维权订单:%s笔", validCount, weiQuanCount));

      detail.setUpdateTime(new Date());

      detail.setUserInfo(new UserInfo(uid));

      detail.setOrderType(orderType);

@@ -105,8 +104,7 @@
    * @return

    * @throws UserMoneyDetailException

    */

   public static UserMoneyDetail createInvite(Long uid, int orderType, int validCount, int weiQuanCount,

         int invalidCount, BigDecimal money, Date time) throws UserMoneyDetailException {

   public static UserMoneyDetail createInvite(Long uid, int orderType, int validCount, int weiQuanCount, BigDecimal money, Date time) throws UserMoneyDetailException {

      if (money == null)

         throw new UserMoneyDetailException(1, "返利金额为空");



@@ -128,8 +126,8 @@
      detail.setMoney(money);

      detail.setTitle(timeF + UserMoneyDetailTypeEnum.invite.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.invite);

      if (validCount != 0 || weiQuanCount != 0 || invalidCount != 0)

         detail.setDescInfo(String.format("有效订单:%s笔   维权订单:%s笔   失效订单:%s笔", validCount, weiQuanCount, invalidCount));

      if (validCount != 0 || weiQuanCount != 0)

         detail.setDescInfo(String.format("有效订单:%s笔   维权订单:%s笔", validCount, weiQuanCount));

      detail.setUpdateTime(new Date());

      detail.setUserInfo(new UserInfo(uid));

      detail.setOrderType(orderType);