yujian
2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
@@ -245,18 +245,18 @@
         String invalidMoney = "0.00";
         if (page == 1) {
            BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
                  orderNo, state, startTime, endTime, listSource);
                  orderNo, state, startTime, endTime, listSource,false);
            if (predictMoney != null)
               validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
            BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
                  orderNo, state, startTime, endTime, listSource);
                  orderNo, state, startTime, endTime, listSource,false);
            if (postSaleMoney != null)
               invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
            if (orderType != null && dateType != null && dateType == 4) {
               if (orderType == 1) {
                  dateType = 6; // 返利订单有效
                  dateType = 6; // 返利订单有效的
               } else {
                  dateType = 5; // 新版查询本月到账
               }