Explorar el Código

视频平台对接

root hace 3 años
padre
commit
dc2291fe0d

+ 4 - 0
src/main/java/com/zhiqiyun/open/core/models/statistics/HyMonitorConsume.java

@@ -22,6 +22,10 @@ public class HyMonitorConsume {
 
 	private Long mechanismId;
 
+	private Long supplierId;
+
+	private Long orderProductId;
+
 	private Long userId;
 
 	private String sourceArea;

+ 10 - 0
src/main/java/com/zhiqiyun/open/router/apis/PlaceApi.java

@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
 import com.dliyun.oap.framework.response.OapResponse;
 import com.zhiqiyun.open.core.models.place.PlaceBaseInfo;
 import com.zhiqiyun.open.core.models.place.PlaceCategory;
 import com.zhiqiyun.open.core.service.PlaceBaseInfoService;
 import com.zhiqiyun.open.core.service.PlaceCategoryService;
+import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.router.request.place.CategoryPageRequest;
 import com.zhiqiyun.open.router.request.place.CategoryRequest;
 import com.zhiqiyun.open.router.request.place.PlaceInfoRequest;
@@ -19,9 +21,12 @@ import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @ServiceMethodBean
@@ -118,4 +123,9 @@ public class PlaceApi {
         }
         return OapResponse.success().setBody(placeBaseInfo);
     }
+
+    @ServiceMethod(method = "list.place.info.cencus", title = "文旅场所统计数据")
+    public OapResponse cencus(AbstractOapRequest request) throws Exception {
+        return OapResponse.success().setBody(placeBaseInfoService.cencus());
+    }
 }

+ 32 - 29
src/main/java/com/zhiqiyun/open/router/request/statistics/SaveHyMonitorConsumeRequest.java

@@ -1,52 +1,55 @@
 package com.zhiqiyun.open.router.request.statistics;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.dliyun.oap.framework.annotation.ServiceParamField;
 import com.dliyun.oap.framework.request.AbstractOapRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class SaveHyMonitorConsumeRequest extends AbstractOapRequest {
 
-	@ServiceParamField(describe = "认证ID")
-	private Long authId;
+    @ServiceParamField(describe = "认证ID")
+    private Long authId;
 
-	@ServiceParamField(describe = "消费场所")
-	private Long mechanismId;
+    @ServiceParamField(describe = "消费场所")
+    private Long mechanismId;
 
-	@ServiceParamField(describe = "消费用户")
-	private Long userId;
+    @ServiceParamField(describe = "供应商ID")
+    private Long supplierId;
 
-	@ServiceParamField(describe = "来源地区")
-	private String sourceArea;
+    @ServiceParamField(describe = "订单ID")
+    private Long orderProductId;
 
-	@ServiceParamField(describe = "消费金额")
-	private BigDecimal money;
+    @ServiceParamField(describe = "消费用户")
+    private Long userId;
 
-	@ServiceParamField(describe = "性别 1、男 2、女")
-	private Integer gender;
+    @ServiceParamField(describe = "来源地区")
+    private String sourceArea;
 
-	@ServiceParamField(describe = "年龄")
-	private Integer age;
+    @ServiceParamField(describe = "消费金额")
+    private BigDecimal money;
 
-	@ServiceParamField(describe = "1、0-17岁 2、18-22岁 3、23-26岁 4、26岁以上")
-	private Integer ageSection;
+    @ServiceParamField(describe = "性别 1、男 2、女")
+    private Integer gender;
 
-	/**
-	 * 创建者
-	 */
-	@ServiceParamField(describe = "创建者")
-	private Long creator;
+    @ServiceParamField(describe = "年龄")
+    private Integer age;
 
-	/**
-	 * 是否删除 0 否 1 是
-	 */
-	@ServiceParamField(describe = "是否删除 0 否 1 是")
-	private Integer isDeleted;
+    @ServiceParamField(describe = "1、0-17岁 2、18-22岁 3、23-26岁 4、26岁以上")
+    private Integer ageSection;
+
+    /**
+     * 创建者
+     */
+    @ServiceParamField(describe = "创建者")
+    private Long creator;
+
+    /**
+     * 是否删除 0 否 1 是
+     */
+    @ServiceParamField(describe = "是否删除 0 否 1 是")
+    private Integer isDeleted;
 }