等级显示问题

yujian

2020-04-26 ee1d39f11b9483b64a88029f1755a6e7166fea15

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -178,7 +178,6 @@
      updateExtract.setId(id);

      updateExtract.setState(Extract.STATE_PROCESSING);

      extractMapper.updateByPrimaryKeySelective(updateExtract);

      // TODO 新版部署后删除

      // 改变资金记录状态

      UserMoneyDetail detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

            UserMoneyDetailTypeEnum.extract, find.getUserInfo().getId(), find.getId());

@@ -302,7 +301,7 @@
      auditRecord.setExtract(extract);



      Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);

		


      extractAuditRecordMapper.insertSelective(auditRecord);



      ThreadUtil.run(new Runnable() {

@@ -311,14 +310,15 @@
         public void run() {

            // 统计数据

            int less10Count = commonOrderCountService.countOderByUidAndLess10(user.getId());

            ExtractAuditRecord update=new ExtractAuditRecord();

            ExtractAuditRecord update = new ExtractAuditRecord();

            update.setId(auditRecord.getId());

            int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);

            int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(),

                  minTime);

            BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),

                  minTime);

            int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);

            update.setExtraInfoStr(new Gson().toJson(

                  new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0, less10Count)));

            update.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCount50More,

                  weiQuanOrderCount, weiQuanOrderFanAmount, 0, less10Count)));

            extractAuditRecordMapper.updateByPrimaryKeySelective(update);

         }

      });

@@ -326,7 +326,7 @@
      // 新版资金详情

      UserMoneyDetail userMoneyDetail = null;

      try {

         userMoneyDetail = UserMoneyDetailFactory.createExtract(extract);

         userMoneyDetail = UserMoneyDetailFactory.createExtract(extract, null);

      } catch (UserMoneyDetailException e2) {

         try {

            LogHelper.errorDetailInfo(e2);

@@ -546,8 +546,31 @@
      } catch (Exception e) {

         e.printStackTrace();

      }

      List<PayInfo> payInfoList = payInfoMapper.getListbyExtractId(extract.getId());

      String alipayNo = "";

      if (payInfoList != null && payInfoList.size() > 0)

         alipayNo = payInfoList.get(0).getOrderId();



      UserMoneyDetail detailNew = null;

      try {

         detailNew = UserMoneyDetailFactory.createExtract(updateExtract, alipayNo);

      } catch (UserMoneyDetailException e) {

         e.printStackTrace();

      }



      // 外显账户明细

      UserMoneyDetail userMoneyDetail = userMoneyDetailMapper.selectByTypeAndUidAndIdentifyCode(

            UserMoneyDetailTypeEnum.extract, extract.getUserInfo().getId(), extract.getId());

      if (userMoneyDetail != null) {

         UserMoneyDetail detail = new UserMoneyDetail(userMoneyDetail.getId());

         detail.setShow(true);

         detail.setUpdateTime(new Date());

         if (detailNew != null)

            detail.setDescInfo(detailNew.getDescInfo());

         userMoneyDetailMapper.updateByPrimaryKeySelective(detail);

      }

      // 新版通知

      userMoneyMsgNotificationService.extractSuccess(extract);

      userMoneyMsgNotificationService.extractSuccess(extract, alipayNo);

   }



   /**

@@ -710,16 +733,6 @@


         // 更新提现记录审核表

         extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);

      }



      // 外显账户明细

      UserMoneyDetail userMoneyDetail = userMoneyDetailMapper.selectByTypeAndUidAndIdentifyCode(

            UserMoneyDetailTypeEnum.extract, extract.getUserInfo().getId(), extract.getId());

      if (userMoneyDetail != null) {

         UserMoneyDetail detail = new UserMoneyDetail(userMoneyDetail.getId());

         detail.setShow(true);

         detail.setUpdateTime(new Date());

         userMoneyDetailMapper.updateByPrimaryKeySelective(detail);

      }



   }

@@ -900,10 +913,6 @@
         LogHelper.errorDetailInfo(e);

      }



      // 4、发送消息通知

      String desc = "为保障你的账户余额安全，自动提现金额将不会高于5元";

      String beizu = "账户中剩余余额请在本App内完成提现";

      userMoneyMsgNotificationService.extractAuto(extractRecord, "未领取-提现中", desc, beizu);

   }



   private boolean parseSendResult(String result) {

@@ -1242,11 +1251,6 @@
         // 资金计算

         userMoneyService.subUserMoney(userInfo.getId(), money, detail);



         // 4、发送消息通知

         String desc = "为保障你的账户余额安全，自动提现金额将不会高于5元";

         String beizu = "账户中剩余余额请在本App内完成提现";

         userMoneyMsgNotificationService.extractAuto(extractRecord, "未领取-提现中", desc, beizu);



         // 满足条件返回信息

         return userInfo;

      }

@@ -1332,8 +1336,6 @@
      extractWeiXinRecordService.updateByPrimaryKeySelective(updeteRecord);



      if (ExtractWeiXinRecord.RECEIVED.equals(status)) {

         // 发送消息通知

         userMoneyMsgNotificationService.extractAuto(record, "已领取-已提现", null, null);

      } else if (ExtractWeiXinRecord.REFUND.equals(status)) {

         // 资金明细

         UserMoneyDetail detail = new UserMoneyDetail();

@@ -1345,12 +1347,8 @@
         detail.setType(UserMoneyDetailTypeEnum.extractAutoWXRefund);

         detail.setUpdateTime(new Date());

         detail.setUserInfo(new UserInfo(record.getUid()));



         // 资金计算

         userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);



         // 发送消息通知

         userMoneyMsgNotificationService.extractAuto(record, "已退回-余额中", null, null);

      }

   }