Merge remote-tracking branch 'origin/master'

rk

7 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java

@@ -11,10 +11,15 @@
import com.doumee.dao.dto.ShopInfoMaintainDTO;
import com.doumee.dao.dto.ShopNearbyDTO;
import com.doumee.dao.vo.ShopDetailVO;
import com.doumee.dao.vo.ShopCenterVO;
import com.doumee.dao.vo.ShopNearbyVO;
import com.doumee.dao.vo.ShopWebDetailVO;
import com.doumee.dao.vo.PayResponse;
import com.doumee.service.business.OrdersService;
import com.doumee.service.business.ShopInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -32,6 +37,9 @@

    @Autowired
    private ShopInfoService shopInfoService;

    @Autowired
    private OrdersService ordersService;

    @LoginRequired
    @ApiOperation("门店入驻申请/修改")
@@ -62,6 +70,16 @@
    }

    @LoginShopRequired
    @ApiOperation("获取门店登录后信息")
    @GetMapping("/getShopInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true)
    })
    public ApiResponse<ShopCenterVO> getShopInfo() {
        return ApiResponse.success("查询成功", shopInfoService.getShopCenterInfo(getShopId()));
    }

    @LoginShopRequired
    @ApiOperation("维护门店信息（支付押金后）")
    @PostMapping("/maintain")
    public ApiResponse maintain(@RequestBody ShopInfoMaintainDTO dto) {
@@ -76,4 +94,14 @@
        return ApiResponse.success(shopInfoService.getShopMaintainInfo(this.getMemberId()));
    }

    @LoginShopRequired
    @ApiOperation("门店支付押金")
    @PostMapping("/payDeposit")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true)
    })
    public ApiResponse<PayResponse> payDeposit() {
        return ApiResponse.success("操作成功", ordersService.payShopDeposit(getShopId()));
    }

}