Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

doum

2025-09-08 55ba702c1df240929e68df3b42fa9cb0607378b8

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -8,6 +8,7 @@
import com.doumee.dao.business.model.DiscountMember;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.BikeIncomeReportVO;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
@@ -20,7 +21,9 @@
import com.wechat.pay.java.service.refund.model.RefundNotification;
import io.swagger.models.auth.In;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -212,4 +215,8 @@
    DiscountMember getUseDiscount(String memberId, Integer driveTime,Integer type);

    void autCancel();

    List<List<String>> getBikeIncomeReportVOList(Date startDate , Date endDate);

    void excel(Date startDate , Date endDate, HttpServletResponse response);
}