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

rk

9 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 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;

/**
@@ -169,9 +172,16 @@
    void forceCloseGoodsorder(String orderId);

    /**
     * 退款
     * 退款(登录人从 Shiro 上下文取,platform 端用)
     */
    void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);

    /**
     * 退款(登录人由调用方传入,web 端 JWT 场景用,creator=绑定的管理员ID)
     * @param goodsorderBackDTO 退款入参
     * @param creator           操作人ID(退款单 + 套餐操作日志的 creator)
     */
    void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO, String creator);
    List<MemberRides> getMemberRidesForClose(String orderid );
    /**
     * 获取可退款信息
@@ -212,4 +222,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);
}