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

@@ -6,11 +6,18 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
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;
import com.wechat.pay.java.service.refund.model.RefundNotification;
import io.swagger.models.auth.In;

import java.math.BigDecimal;
import java.util.List;
@@ -121,9 +128,16 @@
     */
    Object createGoodsOrderPay(String memberId);

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

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


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

    void closeGoodsorder(Goodsorder  order,int type );
    void  dealCloseGoodsorderBiz(Goodsorder goodsorder, int type, List<MemberRides> memberRides) ;
    void closeGoodsorderDone(RefundNotification param);
    void forceCloseGoodsorder(String orderId);

    /**
     * 退款
     * @param orderId
     */
    void backGoodsorder(String orderId, BigDecimal money);
    void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
    List<MemberRides> getMemberRidesForClose(String orderid );
    /**
     * 获取可退款信息
     * @param orderId
     */
    GoodsorderCanBanlanceDTO getGoodsorderCanBanlanceDTO(String orderId);


    /**
@@ -165,16 +192,21 @@
    /**
     * 验证是否为营业时间
     */
    void checkBusiness();
    Boolean checkBusiness();

    /**
     * 验证是否处于停止运营时间
     */
    void checkTemporaryStop();
    Boolean checkTemporaryStop();

    Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper);

    List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);

    void goodsOrderSettlement(String orderId);
    void goodsOrderSettlement(String memberId);

    void autoCloseOrder();

    void autoCancelRefunOrder();

}