优化

MrShi

4 天以前 4fabfe4dbd2eb28d07a4350597d314958cc1c281

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

@@ -5,8 +5,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
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;
@@ -19,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;

/**
@@ -128,9 +132,16 @@
     */
    Object createGoodsOrderPay(String memberId);

    /**
     * 套餐购买
     * @param discountId
     * @param memberId
     * @return
     */
    Object createDiscountOrderPay(String discountId,String memberId);

    /**
     * 押金支付回调业务
     * 支付回调业务
     * @param preOrderId
     * @return
     */
@@ -144,6 +155,7 @@
     */
    GoodsorderDetailDTO getGoodsorderDetailDTO(String id);

    Integer getVoltageStatus(Bikes bikes);
    /**
     * 套餐卡订单详情
     * @param id
@@ -152,7 +164,6 @@
    GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
    /**
     * 强制结算订单
     * @param id
     * @return
     */
    void closeGoodsorder(Goodsorder  order,int type );
@@ -162,7 +173,6 @@

    /**
     * 退款
     * @param orderId
     */
    void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
    List<MemberRides> getMemberRidesForClose(String orderid );
@@ -202,4 +212,11 @@

    void autoCancelRefunOrder();

    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);
}