Merge remote-tracking branch 'origin/master'

doum

15 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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

@@ -5,10 +5,7 @@
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.OrderCancelRequest;
import com.doumee.dao.web.request.OrderPayRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.request.ShopOrderPayRequest;
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;
@@ -69,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);

@@ -228,4 +225,14 @@

    OrderPayConfirmResponse orderPayConfirm(OrderPayConfirmRequest request,
                                            MemberCouponServiceImpl memberCouponService);

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



}