Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

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

@@ -115,10 +115,17 @@
     */
    PageData<IntegralDTO> findIntegralDTOPage(PageWrap<IntegralDTO> pageWrap,Integer memberId);
    /**
     * 更新积分信息
     * 更新消费者积分
     * @param dealIntegralRequest 实体对象
     * @return Integer
     */
    Integer dealIntegral(DealIntegralRequest dealIntegralRequest);

    /**
     * 更新经销商余额
     * @param dealIntegralRequest
     * @return
     */
    Integer dealShopIntegral(DealIntegralRequest dealIntegralRequest);

}