Merge branch 'dev-zrj' into 'staging'

admin增加花费统计

See merge request !125

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -94,8 +94,15 @@ public class AdministratorController {
     //用户通过银行转账，手动插入余额记录
     @PreAuthorize(Securitys.ROOT_EL)
     @RequestMapping(path = "/0xadministrator/banktransfer", method = RequestMethod.POST)
-    public UserBalance bankTransferInsert(@RequestBody UserBalance userBalance) {
-        return paymentService.bankTransferInsertion(userBalance.getUsername(), (int) userBalance.getBalanced());
+    public HashMap bankTransferInsert(@RequestBody UserBalance userBalance) {
+        HashMap<String, Object> map = new HashMap<>();
+        try {
+            map.put("userbalance", paymentService.bankTransferInsertion(userBalance.getUsername(), (int) userBalance.getBalanced()));
+            map.put("status", "failed");
+        } catch (Exception e) {
+            map.put("status", "success");
+        }
+        return map;
     }
 
     //--------------------------------用户--------------------------------------//

src/main/java/com/edgec/browserbackend/account/repository/UserBalanceRepositoryCustomImpl.java

@@ -35,6 +35,7 @@ public class UserBalanceRepositoryCustomImpl implements UserBalanceRepositoryCus
     public Page<UserBalance> findAllOrderByUsedDesc(Pageable pageable) {
         Document doc = new Document();
         BasicQuery basicQuery = new BasicQuery(doc);
+        basicQuery.with(pageable);
         basicQuery.with(Sort.by(Sort.Direction.DESC, "used"));
         List<UserBalance> userBalances = mongoTemplate.find(basicQuery, UserBalance.class);
         Page<UserBalance> userBalancePage = new PageImpl<>(userBalances, pageable, userBalances.size());

src/main/java/com/edgec/browserbackend/common/utils/Trans.java

@@ -23,7 +23,7 @@ import java.io.InputStreamReader;
 public class Trans {
     private final Logger logger = LoggerFactory.getLogger(Trans.class);
     static int timeout = 10 * 1000;// 以秒为单位
-    private static String specialHost = "39.108.183.128";//117.177.243.7
+    private static String specialHost = "39.108.183.128";
     private static int specialPort = 20008;
     private String host;
     private int port;