订单奖励修改

admin

2019-10-22 32f925357776c46bd9e35cf9aad4fdd0f6535d1d

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

@@ -52,6 +52,41 @@
   }



   /**

    * 饿了么返利

    * 
    * @param uid

    * @param orderId

    * @param hbId

    * @param money

    * @return

    * @throws UserMoneyDetailException

    */

   public static UserMoneyDetail createElmeFanLi(Long uid, String orderId, Long hbId, BigDecimal money)

         throws UserMoneyDetailException {



      if (StringUtil.isNullOrEmpty(orderId))

         throw new UserMoneyDetailException(1, "订单号为空");



      if (money == null)

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



      if (uid == null)

         throw new UserMoneyDetailException(1, "UID为空");



      UserMoneyDetail detail = new UserMoneyDetail();

      detail.setCreateTime(new Date());

      detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.elmeFanli.name() + "-" + hbId));

      detail.setMoney(money);

      detail.setTitle(UserMoneyDetailTypeEnum.elmeFanli.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.elmeFanli);

      detail.setDescInfo("订单号：" + orderId);

      detail.setUpdateTime(new Date());

      detail.setUserInfo(new UserInfo(uid));

      detail.setOrderType(Constant.SOURCE_TYPE_ELME);

      return detail;

   }



   /**

    * 分享奖金到账

    * 

    * @param uid

@@ -64,7 +99,7 @@
    * @throws UserMoneyDetailException

    */

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

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

         BigDecimal money, Date time) throws UserMoneyDetailException {

      if (money == null)

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



@@ -86,7 +121,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);

@@ -106,7 +141,7 @@
    * @throws UserMoneyDetailException

    */

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

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

         BigDecimal money, Date time) throws UserMoneyDetailException {

      if (money == null)

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



@@ -128,8 +163,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);

@@ -441,7 +476,7 @@
      detail.setUpdateTime(new Date());

      detail.setUserInfo(user);

      detail.setOrderType(orderType);

      // detail.setDescInfo("订单号:" + orderId);

      detail.setDescInfo("订单号:" + orderId);

      return detail;

   }