admin
2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -226,7 +226,7 @@
   @Override
   public void fanli() {
      // 获取主红包
      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 100);
      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 1000);
      //
      // /**
      // * 需要实时更新待返利的订单
@@ -457,7 +457,7 @@
   public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {
      if (orderList != null)
         for (TaoBaoWeiQuanOrder order : orderList) {
            if (order.getState().equalsIgnoreCase("维权成功")) {
            if (order.getState().contains("维权成功")) {
               CMQManager.getInstance().addWeiQuanOrderMsg(order);
            }
         }
@@ -753,12 +753,9 @@
            Date minDate = new Date(TimeUtil
                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
            long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
                  CommonOrder.STATE_JS, minDate, maxDate);
            long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
                  CommonOrder.STATE_WQ, minDate, maxDate);
            long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
                  CommonOrder.STATE_SX, minDate, maxDate);
            long validCount =  hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS, minDate, maxDate);
            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate);
            long invalidCount =hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, minDate, maxDate);
            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,
                  (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());