Merge remote-tracking branch 'origin/master'

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeInvoiceVo.java

@@ -39,7 +39,7 @@ public class WalletRechargeInvoiceVo extends WalletRechargeInvoiceEntity {
     /**
      * 解析后的人民币(元)
      */
-    private Long paseTotalPrice;
+    private Double paseTotalPrice;
 
     /**
      * 导出相关

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java

@@ -519,10 +519,10 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
                     // 合计人民币
                     if (ObjectUtil.isNotEmpty(v.getTotalPrice())) {
                         balanceSum = balanceSum.add(BigDecimal.valueOf(v.getTotalPrice()));
-                        v.setPaseTotalPrice(BigDecimal.valueOf(v.getTotalPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue());
+                        v.setPaseTotalPrice(BigDecimal.valueOf(v.getTotalPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).doubleValue());
                     }
                 }
-                map.put("computeTotalPrice", balanceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue());
+                map.put("computeTotalPrice", balanceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).doubleValue());
             }
             excelWriter.fill(map, writeSheet);
             excelWriter.fill(list, fillConfig, writeSheet);