Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -57,6 +57,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -643,6 +644,18 @@ public class WalletService {
         return "请勿重复提交!";
     }
 
+    /**
+     * 分转元
+     *
+     * @param big
+     * @return
+     */
+    private BigDecimal smallMoney(BigDecimal big) {
+        if (Objects.isNull(big)) {
+            return new BigDecimal("0.00");
+        }
+        return big.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+    }
 
     /**
      * 提现记录
@@ -669,8 +682,15 @@ public class WalletService {
             return new MorePageRes<>(cashPageReq.getPage(), cashPageReq.getPageSize(), 0, 0, new ArrayList<>(), "0.00");
         }
         CashPage data = cashPageR.getData();
+        List<CashItem> rows = data.getRows();
+        if (!CollectionUtils.isEmpty(rows)) {
+            for (CashItem row : rows) {
+                row.setBalance(smallMoney(row.getBalance()));
+                row.setMoney(smallMoney(row.getMoney()));
+            }
+        }
         //组装数据
-        return new MorePageRes<>(cashPageReq.getPage(), cashPageReq.getPageSize(), data.getTotal(), (int) (data.getTotal() / cashPageReq.getPageSize() + 1), data.getRows(), String.valueOf(Long.parseLong(data.getTotalWithdrawMoney()) / 100.0D));
+        return new MorePageRes<>(cashPageReq.getPage(), cashPageReq.getPageSize(), data.getTotal(), (int) (data.getTotal() / cashPageReq.getPageSize() + 1), rows, String.valueOf(Long.parseLong(data.getTotalWithdrawMoney()) / 100.0D));
     }
 
     /**