Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/service/OrderPayService.java

@@ -439,9 +439,9 @@ public class OrderPayService {
         if (amount.compareTo(minAmount) < 0) {
             throw new BusinessException("充值金额不能小于" + minAmount);
         }
-        if (amount.compareTo(new BigDecimal("50000")) > 0) {
-            throw new BusinessException("充值金额不能大于50000");
-        }
+//        if (amount.compareTo(new BigDecimal("50000")) > 0) {
+//            throw new BusinessException("充值金额不能大于50000");
+//        }
         RechargeOrder order = RechargeOrder.builder()
                 .id(snowflakeIdWorker.nextId())
                 .userId(userId)

src/main/java/com/izouma/nineth/web/CollectionController.java

@@ -241,7 +241,7 @@ public class CollectionController extends BaseController {
         map.put("onlyShowNum", String.valueOf(onlyShowNum));
         map.put("consignmentNum", String.valueOf(consignmentNum));
         map.put("transactingNum", String.valueOf(transactingNum));
-        map.put("tranferingNum", String.valueOf(tranferCount + 1));
+        map.put("tranferingNum", String.valueOf(tranferCount - 1));
         return map;
     }
 }