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

jiangping

2025-02-19 c977f0e2fd86ca3e9e3ad3961f702206c41d2767

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

@@ -12,6 +12,7 @@
import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.GoodsorderBackDTO;
import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
import com.doumee.dao.business.web.response.GoodsorderDetailVO;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -127,9 +128,16 @@
     */
    Object createGoodsOrderPay(String memberId);

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

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


    /**
     * 套餐卡订单详情
     * @param id
     * @return
     */
    GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
    /**
     * 强制结算订单
     * @param id