Merge remote-tracking branch 'origin/master'

doum

9 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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

@@ -2,13 +2,18 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.dto.MemberDTO;
import com.doumee.dao.web.dto.ResetSystemUserPwdDTO;
import com.doumee.dao.web.dto.shop.ShopDTO;
import com.doumee.dao.web.dto.shop.ShopDataStatisticsDTO;
import com.doumee.dao.web.dto.shop.ShopFaceDetailDTO;
import com.doumee.dao.web.dto.shop.ShopSimpleDTO;
import com.doumee.dao.web.dto.ShopLoginDTO;
import com.doumee.dao.web.dto.shop.*;
import com.doumee.dao.web.request.MyCustomerRequest;
import com.doumee.dao.web.request.SaleReportRequest;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.MyCustomerResponse;
import com.doumee.dao.web.response.SaleReportResponse;
import com.doumee.dao.web.response.ShopInfoResponse;

import java.util.List;

@@ -160,6 +165,51 @@
    ShopDataStatisticsDTO getShopDataStatisticsDTO(Integer shopId);

    void resetPwd(Shop dto);
    /**
     * 用户下单查询可选择的自提经销商
     * @param dto
     * @return
     */
    List<Shop> getShopList(ShopListDTO dto);

    /**
     * 经销商账号密码登录
     * @param dto
     * @return
     */
    AccountResponse shopPasswordLogin(ShopLoginDTO dto);

    /**
     * 经销商静默登录
     * @param dto
     * @return
     */
    AccountResponse shopOpenidLogin(ShopLoginDTO dto);

    /**
     * 经销商店铺详情
     * @param shopId
     * @return
     */
    ShopInfoResponse getShopInfo(Integer shopId);


    /**
     * 我的客户信息
     * @param request
     * @param shopId
     * @return
     */
    List<MyCustomerResponse> myCustomer(MyCustomerRequest request, Integer shopId);

    /**
     * 销售明细
     * @param request
     * @param shopId
     * @return
     */
    SaleReportResponse saleReport(SaleReportRequest request, String shopId);


    String setGoodsPrice(Shop shop);
}