Merge branch 'dev' into test

share-system/src/main/java/share/system/domain/vo/OrderVo.java

@@ -130,6 +130,10 @@ public class OrderVo {
 
     private BigDecimal balance;
 
+    private BigDecimal rechargeAmount;
+
+    private BigDecimal giftAmount;
+
     private BigDecimal discountRatio;
 
 

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -3456,8 +3456,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         statisticsResponse.setStoreFee(statisticsResponse.getGroupFee().add(statisticsResponse.getPlatformFee()).add(statisticsResponse.getRechargeBalance()));
         //团购退款+平台退款+充值金额退款
         statisticsResponse.setStoreRefundFee(statisticsResponse.getGroupRefundFee().add(statisticsResponse.getPlatformRefundFee()).add(statisticsResponse.getRechargeBalanceRefundFee()));
-        //团购金额+平台支付
-        statisticsResponse.setTotalFee(statisticsResponse.getGroupFee().add(statisticsResponse.getPlatformFee()));
+        //团购金额+平台支付+充值金额
+        statisticsResponse.setTotalFee(statisticsResponse.getGroupFee().add(statisticsResponse.getPlatformFee()).add(statisticsResponse.getRechargeBalance()));
         //门店交易-门店交易退款
         statisticsResponse.setActualFee(statisticsResponse.getStoreFee().subtract(statisticsResponse.getStoreRefundFee()));
         //计算开始时间和结束时间相差多少天