src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
@@ -5,20 +5,24 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.time.LocalDateTime; @Data public class QueryOrderDTO { @ApiModelProperty(value = "开始时间") @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") @DateTimeFormat private LocalDate startDate; @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @NotNull(message = "开始时间不能为空") private LocalDateTime startDate; @ApiModelProperty(value = "结束时间") @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") @DateTimeFormat private LocalDate endDate; @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @NotNull(message = "结束时间不能为空") private LocalDateTime endDate; @ApiModelProperty(value = "合伙人id") private Long partnerId; src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
@@ -13,7 +13,7 @@ @ApiModelProperty("下单日期") @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") @DateTimeFormat @DateTimeFormat(pattern="yyyy-MM-dd") private LocalDateTime orderDate; @ApiModelProperty("销售额") src/main/java/com/mzl/flower/mapper/calendar/CalendarMapperCustom.java
@@ -21,4 +21,5 @@ List<OrderReportCalendarBO> getOrderDatePage(Page page,@Param("dto") QueryOrderDTO dto); List<OrderReportCalendarBO> getOrderDateList(@Param("dto") QueryOrderDTO dto); } src/main/java/com/mzl/flower/service/calendar/CalendarService.java
@@ -5,6 +5,7 @@ import com.mzl.flower.dto.response.report.OrderReportCalendarBO; import com.mzl.flower.entity.CalendarDO; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,5 +21,8 @@ void generateCalendar(int i); List<OrderReportCalendarBO> getOrderDatePage(Page page, QueryOrderDTO dto); List<OrderReportCalendarBO> getOrderDatePage(Page page,@Param("dto") QueryOrderDTO dto); List<OrderReportCalendarBO> getOrderDateList(@Param("dto") QueryOrderDTO dto); } src/main/java/com/mzl/flower/service/impl/CalendarServiceImpl.java
@@ -66,4 +66,9 @@ public List<OrderReportCalendarBO> getOrderDatePage(Page page, QueryOrderDTO dto) { return calendarMapperCustom.getOrderDatePage(page,dto); } @Override public List<OrderReportCalendarBO> getOrderDateList(QueryOrderDTO dto) { return calendarMapperCustom.getOrderDateList(dto); } } src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -5,14 +5,18 @@ import com.mzl.flower.dto.response.report.OrderReportCalendarBO; import com.mzl.flower.dto.response.report.OrderReportResultVO; import com.mzl.flower.mapper.report.OrderReportMapper; import com.mzl.flower.service.BaseService; import com.mzl.flower.service.calendar.CalendarService; import com.mzl.flower.service.report.OrderReportService; import com.mzl.flower.utils.ExcelExportUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -21,8 +25,9 @@ import java.util.List; import java.util.stream.Collectors; @Slf4j @Service public class OrderReportServiceImpl implements OrderReportService { public class OrderReportServiceImpl extends BaseService implements OrderReportService { @Autowired private CalendarService calendarService; @@ -38,8 +43,9 @@ List<OrderReportCalendarBO> calendarBOList= calendarService.getOrderDatePage(page,dto); final List<OrderReportResultVO> list = calendarBOList.stream().map(calendarBO -> { BeanUtils.copyProperties(dto,calendarBO); if(null!=dto.getPartnerId()) calendarBO.setPartnerId(dto.getPartnerId()); OrderReportResultVO vo2=orderReportMapper.getOrderDateReport(calendarBO); if(null==vo2) vo2=new OrderReportResultVO(); vo2.setOrderDate(calendarBO.getCalDate()); return vo2; @@ -54,7 +60,7 @@ // 计算开始时间和结束时间 OrderReportCalendarBO bo=new OrderReportCalendarBO(); BeanUtils.copyProperties(dto,bo); if(null!=dto.getPartnerId()) bo.setPartnerId(dto.getPartnerId()); bo.setStartDate(calculateStartTime(dto.getStartDate())); bo.setEndDate(calculateEndTime(dto.getEndDate())); OrderReportResultVO vo2=orderReportMapper.getOrderDateReport(bo); @@ -65,19 +71,71 @@ @Override public void exportSalesList(HttpServletResponse response, QueryOrderDTO dto) { List<OrderReportCalendarBO> calendarBOList= calendarService.getOrderDateList(dto); final List<OrderReportResultVO> list = calendarBOList.stream().map(calendarBO -> { if(null!=dto.getPartnerId()) calendarBO.setPartnerId(dto.getPartnerId()); OrderReportResultVO vo2=orderReportMapper.getOrderDateReport(calendarBO); if(null==vo2) vo2=new OrderReportResultVO(); vo2.setOrderDate(calendarBO.getCalDate()); return vo2; }).collect(Collectors.toList()); String[] rowsName = new String[]{"序号","下单日期", "销售额", "花农底价", "平台区间加价", "平台加价", "平台区域加价" , "合伙人加价", "合伙人区间加价", "会员折扣","优惠券","降级扣款","缺货扣款","补货扣款","售后扣合伙人款","售后扣花农款", "售后扣平台款","总包干费","实际销售扎数","利润","结算状态",}; List<Object[]> dataList = new ArrayList<>(); int sn = 1; for (OrderReportResultVO o : list) { Object[] objs = new Object[rowsName.length]; int a = 0; objs[a++] = sn; // 序号 objs[a++] = format(o.getOrderDate(), "yyyy-MM-dd"); // 下单日期 objs[a++] = o.getOrderTotal(); // 销售额 objs[a++] = o.getOrderSupplierPriceAmount(); // 花农底价 objs[a++] = o.getOrderMarkupOneAmount(); // 平台区间加价 objs[a++] = o.getOrderMarkupTwoAmount(); // 平台加价 objs[a++] = o.getPlatformAreaFeeAmount(); //平台区域加价 objs[a++] = o.getOrderMarkupPartnerAmount(); //合伙人加价 objs[a++] = o.getPartnerSectionFeeAmount(); //合伙人区间加价 objs[a++] = o.getOrderPriceDiscountAmount();//会员折扣 objs[a++] = o.getOrderCouponAmountTotal(); // 优惠券 objs[a++] = o.getOrderCheckFee();//降级扣款 objs[a++] = o.getOrderLackFeeSupplier(); //缺货扣款 objs[a++] = o.getOrderReplaceFee(); //补货扣款 objs[a++] = o.getOrderFeePartner(); //售后扣合伙人款 objs[a++] = o.getOrderFeeSupplier(); // 售后扣花农款 objs[a++] = o.getOrderFeePlatform(); //售后扣平台款 objs[a++] = o.getPartnerTotalFeeAmount(); // 总包干费 objs[a++] = o.getRealSaleNum(); // 实际销售扎数 objs[a++] = o.getProfitFeeAmount(); //利润 objs[a++] = o.getSettleStatus(); // 结算状态 dataList.add(objs); sn++; } ExcelExportUtil excelExportUtil = new ExcelExportUtil("财务报表", rowsName, dataList, response); try { response.addHeader("filename", URLEncoder.encode("财务报表.xls", "UTF-8")); response.addHeader("Access-Control-Expose-Headers", "filename"); excelExportUtil.export(); } catch (Exception e) { log.error(e.getMessage(), e); } } // 计算 startDate 的前一天 17:00:00 public static LocalDateTime calculateStartTime(LocalDate startDate) { LocalDate previousDay = startDate.minusDays(1); LocalTime fivePM = LocalTime.of(17, 0, 0); // 下午 17:00:00 return LocalDateTime.of(previousDay, fivePM); public static LocalDateTime calculateStartTime(LocalDateTime startDateTime) { // 获取 LocalDate 部分 LocalDateTime previousDay = startDateTime.minusDays(1).with(LocalTime.of(17, 0, 0)); return previousDay; } // 计算 endDate 当天的 17:00:00 public static LocalDateTime calculateEndTime(LocalDate endDate) { LocalTime fivePM = LocalTime.of(17, 0, 0); // 下午 17:00:00 return LocalDateTime.of(endDate, fivePM); public static LocalDateTime calculateEndTime(LocalDateTime endDateTime) { // 将时间部分固定为 17:00:00 LocalDateTime endOfDay = endDateTime.with(LocalTime.of(17, 0, 0)); return endOfDay; } }
@@ -4,13 +4,35 @@ <select id="getOrderDatePage" resultType="com.mzl.flower.dto.response.report.OrderReportCalendarBO"> <include refid="baseSql"></include> </select> <select id="getOrderDateList" resultType="com.mzl.flower.dto.response.report.OrderReportCalendarBO"> <include refid="baseSql"></include> </select> <sql id="baseSql"> select cal_date, DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date , DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date , DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date from t_calendar t where 1=1 <if test="dto.startDate != null"> and t.cal_date > #{dto.startDate} </if> <if test="dto.endDate != null"> and t.cal_date <= #{dto.endDate} </if> order by cal_date desc </sql> <sql id="baseSql2"> select cal_date, DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date , DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date from t_calendar where cal_date >= ( SELECT DATE_FORMAT(MIN(create_time), '%Y-%m-%d 00:00:00') AS min_create_time FROM t_order SELECT DATE_FORMAT(MIN(create_time), '%Y-%m-%d 00:00:00') AS min_create_time FROM t_order ) and cal_date <=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') order by cal_date desc </select> </sql> </mapper> src/main/resources/mapper/report/OrderReportMapper.xml
@@ -4,29 +4,29 @@ <select id="getOrderDateReport" resultType="com.mzl.flower.dto.response.report.OrderReportResultVO"> select sum(order_total) as order_total, -- 销售额 sum(order_supplier_price_amount) as order_supplier_price_amount, -- 花农底价 sum(order_markup_one_amount) as order_markup_one_amount, -- 平台区间加价 sum(order_markup_two_amount) as order_markup_two_amount, -- 平台加价 sum(order_markup_partner_amount) as order_markup_partner_amount, -- 合伙人加价 sum(order_price_discount_amount) as order_price_discount_amount, -- 会员折扣 sum(order_coupon_amount_total) as order_coupon_amount_total, -- 优惠券总金额 sum(order_check_fee) as order_check_fee, -- 降级扣款 sum(order_lack_fee_supplier) as order_lack_fee_supplier, -- 缺货扣款 sum(order_replace_fee) as order_replace_fee, -- 补货扣款 sum(order_fee_supplier) as order_fee_supplier, -- 供应商扣款 sum(order_fee_partner) as order_fee_partner, -- 合伙人扣款 sum(order_fee_platform) as order_fee_platform, -- 平台扣款 sum(order_fee_platform_pack) as order_fee_platform_pack, -- 平台打包扣款 sum(order_fee_platform_check) as order_fee_platform_check, -- 平台质检扣款 sum(order_fee_platform_transport) as order_fee_platform_transport, -- 物流扣款 sum(order_total_fee) as order_total_fee, -- 退款总额 sum(order_fee_packing_transport) as order_fee_packing_transport, -- 打包运费 sum(order_num) as order_num,-- 数量 sum(order_replace_num) as order_replace_num,-- 补货数量 sum(order_reduce_num) as order_reduce_num,-- 降级数量 sum(order_lack_num) as order_lack_num, -- 缺货数量 sum(order_num)-sum(order_lack_num) as real_sale_num -- 销售扎数 sum(order_total) as order_total, sum(order_supplier_price_amount) as order_supplier_price_amount, sum(order_markup_one_amount) as order_markup_one_amount, sum(order_markup_two_amount) as order_markup_two_amount, sum(order_markup_partner_amount) as order_markup_partner_amount, sum(order_price_discount_amount) as order_price_discount_amount, sum(order_coupon_amount_total) as order_coupon_amount_total, sum(order_check_fee) as order_check_fee, sum(order_lack_fee_supplier) as order_lack_fee_supplier, sum(order_replace_fee) as order_replace_fee, sum(order_fee_supplier) as order_fee_supplier, sum(order_fee_partner) as order_fee_partner, sum(order_fee_platform) as order_fee_platform, sum(order_fee_platform_pack) as order_fee_platform_pack, sum(order_fee_platform_check) as order_fee_platform_check, sum(order_fee_platform_transport) as order_fee_platform_transport, sum(order_total_fee) as order_total_fee, sum(order_fee_packing_transport) as order_fee_packing_transport, sum(order_num) as order_num, sum(order_replace_num) as order_replace_num, sum(order_reduce_num) as order_reduce_num, sum(order_lack_num) as order_lack_num, sum(order_num)-sum(order_lack_num) as real_sale_num from ( select o.order_no,o.payment_time,o.status_backend,vor.* @@ -42,7 +42,7 @@ and o.payment_time <= #{dto.endDate} </if> <if test="dto.partnerId != null"> o.create_by in ( and o.create_by in ( select user_id from t_customer_info where partner_id=#{dto.partnerId} ) </if>
