Merge remote-tracking branch 'origin/master'

doum

23 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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

@@ -5,14 +5,17 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.request.OrderPayRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.request.*;
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
import com.doumee.dao.web.request.goods.OrderPayConfirmRequest;
import com.doumee.dao.web.response.HomeInfoResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
import com.doumee.dao.web.response.goods.OrderPayConfirmResponse;
import com.doumee.dao.web.response.goods.PayResponse;
import com.doumee.service.business.impl.MemberCouponServiceImpl;

import java.math.BigDecimal;
import java.util.List;
@@ -63,7 +66,7 @@
    void orderSendOutGoods(Goodsorder goodsorder);

    void orderRemark(Goodsorder goodsorder);
    IPage<Shop> getShopPage(PageWrap<Shop> pageWrap);
//    IPage<Shop> getShopPage(PageWrap<Shop> pageWrap);
    void coffeePlanCancelOrder(Goodsorder goodsorder);
    void orderPlanCancelOrder(Goodsorder goodsorder);

@@ -123,7 +126,7 @@
     * @param orderPayRequest
     * @return
     */
    PayResponse orderPay(OrderPayRequest orderPayRequest);
    PayResponse orderPay(ShopOrderPayRequest orderPayRequest, MemberCouponServiceImpl memberCouponService);

    /**
     * 重新支付
@@ -147,13 +150,20 @@
    void updAddress(DealOrderRequest updAddressRequest);

    /**
     * 取消订单
     * 取消订单 - 历史版本
     * @param orderId
     * @param optUserId
     * @param cancelInfo
     */
    void cancelOrder(Integer orderId,Integer optUserId,String cancelInfo);

    /**
     * 订单取消 - 新
     * @param orderId
     * @param optUserId
     * @param cancelInfo
     */
    void cancelOrderNew(Integer orderId,Integer optUserId,String cancelInfo);

    /**
     * 催发货
@@ -170,6 +180,14 @@
     */
    void affirmOrder(Integer orderId,Integer memberId);

    void orderWriteOff(String exchangeCode,Integer memberId);

    /**
     * 订单删除
     * @param orderId
     * @param memberId
     */
    void delOrder(Integer orderId,Integer memberId);

    /**
     * 订单详情
@@ -202,4 +220,19 @@
    void resetOrderCodes();

    void refreshOrderCodes();

    HomeInfoResponse getHomeInfo(int memberId);

    OrderPayConfirmResponse orderPayConfirm(OrderPayConfirmRequest request,
                                            MemberCouponServiceImpl memberCouponService);

    /**
     * 经销商订单列表
     * @param pageWrap
     * @return
     */
    PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap);



}