|
|
@@ -14,6 +14,7 @@ import com.cyksj.model.views.*;
|
|
|
import com.cyksj.service.corp.CorpTagService;
|
|
|
import com.cyksj.web.util.EasyExcelUtils;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
+import com.ejlchina.searcher.SearchResult;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -120,8 +121,8 @@ public class CorpTagController {
|
|
|
* 标签管理详情
|
|
|
*/
|
|
|
@GetMapping("/get/corpTag")
|
|
|
- public Result<Page<CorpTagBackView>> getCorpTagBackView(@RequestParam(defaultValue = "0") Integer start, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false, defaultValue = "1") Integer type, String name, String[] groupIds, String sort, String order) throws Exception {
|
|
|
- Page<CorpTagBackView> corpTagBackViews = corpTagService.getCorpTagBackView(start, limit, type, name,groupIds, sort, order);
|
|
|
+ public Result<Page<CorpTagBackView>> getCorpTagBackView(@RequestParam(defaultValue = "0") Integer start, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false, defaultValue = "1") Integer type, String name, String[] groupIds, String sort, String order) throws Exception {
|
|
|
+ Page<CorpTagBackView> corpTagBackViews = corpTagService.getCorpTagBackView(start, limit, type, name, groupIds, sort, order);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(corpTagBackViews);
|
|
|
}
|
|
|
|
|
|
@@ -178,4 +179,13 @@ public class CorpTagController {
|
|
|
UserOrderDetailView userOrderDetailView = corpTagService.getTagUserData(start, limit, tagIdStr, startTime, endTime);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(userOrderDetailView);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 今日标签用户订单详情
|
|
|
+ */
|
|
|
+ @GetMapping("/get/tagUser/time/orderData")
|
|
|
+ public Result<Page<CorpTagUserOrderDataView>> getTagUserTimeOrderData(@RequestParam(defaultValue = "1") Integer start, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = true) String tagIdStr, String toDate, String startTime, String endTime) {
|
|
|
+ Page<CorpTagUserOrderDataView> page = corpTagService.getTagUserTimeOrderData(start, limit, tagIdStr, toDate, startTime, endTime);
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult(page);
|
|
|
+ }
|
|
|
}
|