|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
|
|
|
public interface AccountReportMapper {
|
|
@@ -106,16 +107,15 @@ public interface AccountReportMapper {
|
|
|
* @param accountIds
|
|
|
* @return
|
|
|
*/
|
|
|
- List<JSONObject> selectAccountReportByDate(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("accountIds") JSONArray accountIds);
|
|
|
+ List<JSONObject> selectAccountReportByDate(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("accountIds") JSONArray accountIds, @Param("discount") BigDecimal discount);
|
|
|
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
* @param accountIds
|
|
|
* @return
|
|
|
*/
|
|
|
|
|
|
- List<JSONObject> selectAccountReport(@Param("accountIds") JSONArray accountIds);
|
|
|
+ List<JSONObject> selectAccountReport(@Param("accountIds") JSONArray accountIds, @Param("discount") BigDecimal discount);
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -126,10 +126,9 @@ public interface AccountReportMapper {
|
|
|
* @param statHour
|
|
|
* @return
|
|
|
*/
|
|
|
- JSONObject selectSummaryByAccountId(@Param("date") String date, @Param("accountIds") JSONArray accountIds, @Param("statHour") Integer statHour);
|
|
|
+ JSONObject selectSummaryByAccountId(@Param("date") String date, @Param("accountIds") JSONArray accountIds, @Param("statHour") Integer statHour, @Param("discount") BigDecimal discount);
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
* @param startDate
|
|
|
* @param endDate
|
|
|
* @param accountIds
|