|
@@ -1,29 +1,24 @@
|
|
package com.chelvc.cloud.admin.controller;
|
|
package com.chelvc.cloud.admin.controller;
|
|
|
|
|
|
-import javax.validation.Valid;
|
|
|
|
-import javax.validation.constraints.Min;
|
|
|
|
-import javax.validation.constraints.NotEmpty;
|
|
|
|
-
|
|
|
|
import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
|
|
import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
|
|
-import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
|
|
|
|
import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
|
|
import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
|
|
|
|
+import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
|
|
import com.chelvc.cloud.vehicle.api.param.MerchantModifyParam;
|
|
import com.chelvc.cloud.vehicle.api.param.MerchantModifyParam;
|
|
import com.chelvc.cloud.vehicle.api.param.MerchantPagingParam;
|
|
import com.chelvc.cloud.vehicle.api.param.MerchantPagingParam;
|
|
|
|
+import com.chelvc.cloud.vehicle.api.param.MerchantRankParam;
|
|
import com.chelvc.cloud.vehicle.api.service.GoodsService;
|
|
import com.chelvc.cloud.vehicle.api.service.GoodsService;
|
|
import com.chelvc.cloud.vehicle.api.service.MerchantService;
|
|
import com.chelvc.cloud.vehicle.api.service.MerchantService;
|
|
import com.chelvc.framework.base.annotation.ResponseWrapping;
|
|
import com.chelvc.framework.base.annotation.ResponseWrapping;
|
|
-import com.chelvc.framework.base.util.ResourceUtils;
|
|
|
|
|
|
+import com.chelvc.framework.base.context.SessionContextHolder;
|
|
import com.chelvc.framework.common.model.Pagination;
|
|
import com.chelvc.framework.common.model.Pagination;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.PutMapping;
|
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
+import javax.validation.Valid;
|
|
|
|
+import javax.validation.constraints.Min;
|
|
|
|
+import javax.validation.constraints.NotEmpty;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -119,4 +114,15 @@ public class MerchantController {
|
|
String businessStatus) {
|
|
String businessStatus) {
|
|
this.merchantService.updateMerchantBusinessStatus(id,businessStatus);
|
|
this.merchantService.updateMerchantBusinessStatus(id,businessStatus);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据地区获取商家排名
|
|
|
|
+ *
|
|
|
|
+ * @param param 查询参数
|
|
|
|
+ * @return 商家信息列表
|
|
|
|
+ */
|
|
|
|
+ @GetMapping("/merchants/rank")
|
|
|
|
+ public List<MerchantRankDTO> listRankMerchants(@Valid MerchantRankParam param) {
|
|
|
|
+ return this.merchantService.listRankMerchants(param, SessionContextHolder.getId());
|
|
|
|
+ }
|
|
}
|
|
}
|