src/main/java/com/sy/entity/ShopPayConfig.java

@@ -68,6 +68,9 @@ public class ShopPayConfig {
     @TableField(value = "lakala_rate")
     private BigDecimal lakalaRate;
 
+    @TableField(value = "shop_rate")
+    private BigDecimal shopRate;
+
     @TableField(value = "lakala_settlement_time")
     private String lakalaSettlementTime;
 }

src/main/java/com/sy/service/OrdersService.java

@@ -93,7 +93,8 @@ public class OrdersService {
             //一天一天的统计
             for (Shop Shop : shopList) {
                 OrdersStatementOfAccount ordersStatementOfAccount = new OrdersStatementOfAccount();
-                BigDecimal lakalaRate = shopPayConfigService.getShopPayConfigById(Shop.getId()).getLakalaRate();
+                //BigDecimal lakalaRate = shopPayConfigService.getShopPayConfigById(Shop.getId()).getLakalaRate();
+                BigDecimal shopRate = shopPayConfigService.getShopPayConfigById(Shop.getId()).getShopRate();
                 ArrayList<String> startAndEndTimeStamps = getStartAndEndTimeStamps(day);
                 ArrayList<OrdersDTO> ordersDTOS = new ArrayList<>();
                 List<ShopPaymentRecord> shopPaymentRecordList = shopPaymentRecordService.getShopPaymentRecordListByDay(Shop.getId(),startAndEndTimeStamps);
@@ -103,7 +104,7 @@ public class OrdersService {
                 BigDecimal online_amount = BigDecimal.ZERO;
                 //现金总收取	现金渠道
                 BigDecimal offline_amount = BigDecimal.ZERO;
-                ordersStatementOfAccount.setPlatformSeparateRate(lakalaRate);
+                ordersStatementOfAccount.setPlatformSeparateRate(shopRate);
                 //记录订单数量
                 Integer countOrderSize=0;
                 for (ShopPaymentRecord shopPaymentRecord : shopPaymentRecordList) {
@@ -150,11 +151,11 @@ public class OrdersService {
                     OrdersDTO ordersDTO=new OrdersDTO();
                     ordersDTO.setOrderId(orders.getId());
                     ordersDTO.setOrderCreateTime(orders.getCreateAt().getTime());
-                    ordersDTO.setPlatformSeparateRate(lakalaRate);
+                    ordersDTO.setPlatformSeparateRate(shopRate);
                     ordersDTO.setAmount(orders.getPayFee());
                     //门店收入等于 订单总营业额 *费率  比如费率百分之6.8  则需要转换  成0.068
-                    ordersDTO.setShopIncome(new BigDecimal(1).subtract(lakalaRate.multiply(number)).multiply(orders.getPayFee()));
-                    ordersDTO.setPlatformIncome(orders.getPayFee().multiply(lakalaRate.multiply(number)));
+                    ordersDTO.setShopIncome(new BigDecimal(1).subtract(shopRate.multiply(number)).multiply(orders.getPayFee()));
+                    ordersDTO.setPlatformIncome(orders.getPayFee().multiply(shopRate.multiply(number)));
                     ordersDTOS.add(ordersDTO);
                 }
                 ordersStatementOfAccount.setStatisticsDate(day);
@@ -164,8 +165,8 @@ public class OrdersService {
                 ordersStatementOfAccount.setOnlineAmount(online_amount);
                 ordersStatementOfAccount.setOfflineAmount(offline_amount);
                 ordersStatementOfAccount.setOrderDetailList(ordersDTOS);
-                ordersStatementOfAccount.setShopAmount(new BigDecimal(1).subtract(lakalaRate.multiply(number)).multiply(amount));
-                ordersStatementOfAccount.setPlatformAmount(lakalaRate.multiply(number).multiply(amount));
+                ordersStatementOfAccount.setShopAmount(new BigDecimal(1).subtract(shopRate.multiply(number)).multiply(amount));
+                ordersStatementOfAccount.setPlatformAmount(shopRate.multiply(number).multiply(amount));
                 ordersStatementOfAccounts.add(ordersStatementOfAccount);
             }
 

src/main/java/com/sy/service/RetreatGoodsService.java

@@ -83,7 +83,7 @@ public class RetreatGoodsService extends ServiceImpl<RetreatGoodsMapper, Retreat
                 info.setGoodsId(ordersGoodsDel.getGoodsId());
                 info.setCount(ordersGoodsDel.getGoodsAmount());
                 info.setAmount(ordersGoodsDel.getGoodsTotalPrice());
-                amountAll = amountAll.add(ordersGoodsDel.getSalePrice());
+                amountAll = amountAll.add(ordersGoodsDel.getGoodsTotalPrice());
                 countAllGoods = countAllGoods.add(ordersGoodsDel.getGoodsAmount());
                 goods_Info.add(info);