diff --git a/food-common/src/main/java/com/zbkj/common/request/GameRequest.java b/food-common/src/main/java/com/zbkj/common/request/GameRequest.java deleted file mode 100644 index 5dabedd..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/GameRequest.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.zbkj.common.request; - -import com.alibaba.fastjson.JSON; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.zbkj.common.model.game.GameTreeItem; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="GameRequest对象", description="游戏表") -public class GameRequest implements Serializable { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "分类id", required = true) - @NotBlank(message = "请选择分类") - private String cid; - - @ApiModelProperty(value = "标题", required = true) - @NotBlank(message = "请填写标题") - @Length(max = 200, message = "标题最多200个字符") - private String name; - - @ApiModelProperty(value = "封面图片", required = true) - @NotBlank(message = "请上传封面图片") - @Length(max = 255, message = "图片最多255个字符") - private String image; - - @ApiModelProperty(value = "简介") - @Length(max = 200, message = "简介最多200个字符") - private String description; - - @ApiModelProperty(value = "开始时间", required = true) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginTime; - - @ApiModelProperty(value = "结束时间", required = true) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - /** - * 如果是 抽奖游戏，参照 eb_game_prize_draw_rule 字段提交生成json对象数据 - * 如果是 种树游戏，参照 eb_game_tree_rule 字段提交生成json对象数据 - */ - @ApiModelProperty(value = "规则表单", required = true) - @NotBlank(message = "请填写规则表单内容") - private String rule; - - /** - * 如果是 抽奖游戏，参照 eb_game_prize_draw_item 字段提交生成json对象数组数据 - * 如果是 种树游戏，参照 eb_game_user_item 字段提交生成json对象数组数据 - */ - @ApiModelProperty(value = "游戏商品表单") - @NotBlank(message = "请填写游戏商品表单内容") - private String items; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/GameSearchRequest.java b/food-common/src/main/java/com/zbkj/common/request/GameSearchRequest.java deleted file mode 100644 index 78f7df4..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/GameSearchRequest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="GameSearchRequest对象", description="游戏表") -public class GameSearchRequest implements Serializable { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "分类id") - private String cid; - - @ApiModelProperty(value = "搜索关键字") - private String keywords; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/GameTreeProductListRequest.java b/food-common/src/main/java/com/zbkj/common/request/GameTreeProductListRequest.java deleted file mode 100644 index 15b9fa3..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/GameTreeProductListRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="GameTreeProductListRequest", description="GameTreeProductListRequest") -public class GameTreeProductListRequest { - - @ApiModelProperty(value = "商品标题") - private String productTitle; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/GameTreeProductRequest.java b/food-common/src/main/java/com/zbkj/common/request/GameTreeProductRequest.java deleted file mode 100644 index a900042..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/GameTreeProductRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="GameTreeProductRequest对象", description="GameTreeProductRequest对象") -public class GameTreeProductRequest implements Serializable { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "商品标题") - private String productTitle; - /** - * 兑换商品编号 - */ - @ApiModelProperty(value = "商品编号") - private Integer productId; - /** - * 兑换商品图 - */ - @ApiModelProperty(value = "商品图片") - private String productImage; - /** - * 所需要茶果价 - */ - @ApiModelProperty(value = "茶果价") - private Integer fruitPrice; - /** - * 排序 - */ - @ApiModelProperty(value = "排序") - private Integer sort; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserBurySeedRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserBurySeedRequest.java deleted file mode 100644 index 9937bc1..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserBurySeedRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="UserBurySeedRequest对象", description="埋种子") -public class UserBurySeedRequest implements Serializable { - - private static final long serialVersionUID = 3481659942630712958L; - - @ApiModelProperty(value = "编号") - @NotBlank(message = "编号不能为空") - private String userItemId; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserBuyItemRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserBuyItemRequest.java deleted file mode 100644 index c29aea8..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserBuyItemRequest.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -@ApiModel(value="UserBuyItemRequest对象", description="领取茶树") -public class UserBuyItemRequest implements Serializable { - - private static final long serialVersionUID = 3481659942630712958L; - - @ApiModelProperty(value = "游戏编号") - @NotBlank(message = "游戏编号不能为空") - private String gameId; - - @ApiModelProperty(value = "游戏项") - @NotBlank(message = "游戏项编号不能为空") - private String itemId; - - @ApiModelProperty(value = "购买数量") - @NotBlank(message = "购买数量不能为空") - private String num; - - private String ip; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserBuyTeaPlantRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserBuyTeaPlantRequest.java deleted file mode 100644 index cd10f4c..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserBuyTeaPlantRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -@ApiModel(value="UserBuyTeaPlantRequest对象", description="领取茶树") -public class UserBuyTeaPlantRequest implements Serializable { - - private static final long serialVersionUID = 3481659942630712958L; - - @ApiModelProperty(value = "茶树编号") - @NotBlank(message = "茶树编号不能为空") - private String teaPlantId; - - @ApiModelProperty(value = "购买数量") - @NotBlank(message = "购买数量不能为空") - private String num; - - private String ip; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserBuyTreeRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserBuyTreeRequest.java deleted file mode 100644 index 0f8174c..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserBuyTreeRequest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.zbkj.common.request; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.DecimalMin; -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -@ApiModel(value="UserBuyTreeRequest对象", description="买茶树") -public class UserBuyTreeRequest implements Serializable { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "充值金额") - private BigDecimal price; - - @ApiModelProperty(value = "购买数量") - private Integer buyNum; - - @ApiModelProperty(value = "支付方式| weixin = 微信，alipay = 支付宝") - private String payType = "weixin"; - - @ApiModelProperty(value = "客户端ip") - @JsonIgnore - private String clientIp; - - @ApiModelProperty(value = "用户id") - @JsonIgnore - private Integer userId; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserGameItemRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserGameItemRequest.java deleted file mode 100644 index a02d8db..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserGameItemRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -@ApiModel(value="UserGameItemRequest对象", description="用户的游戏物品") -public class UserGameItemRequest implements Serializable { - - private static final long serialVersionUID = 3481659942630712958L; - - @ApiModelProperty(value = "游戏编号") - @NotBlank(message = "游戏编号不能为空") - private String gameId; - - @ApiModelProperty(value = "状态：抽奖(2已领取)，茶树(1未种植 2已种植 3已成熟)") - @NotBlank(message = "状态不能为空") - private String status; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserGameTreeRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserGameTreeRequest.java deleted file mode 100644 index 8a08403..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserGameTreeRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import java.io.Serializable; - -@Data -@ApiModel(value="UserGameTreeRequest对象", description="我的游戏-茶株") -public class UserGameTreeRequest implements Serializable { - - private static final long serialVersionUID=1L; - - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserTreeFarmRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserTreeFarmRequest.java deleted file mode 100644 index a862059..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserTreeFarmRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -@Data -@ApiModel(value="UserTreeFarmRequest对象", description="UserTreeFarmRequest对象") -public class UserTreeFarmRequest { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "游戏编号") - @NotBlank(message = "游戏编号不能为空") - private String gameId; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserTreeReapRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserTreeReapRequest.java deleted file mode 100644 index 7e03d03..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserTreeReapRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -@ApiModel(value="UserTreeReapRequest对象", description="收获茶树") -public class UserTreeReapRequest implements Serializable { - - private static final long serialVersionUID = 3481659942630712958L; - - @ApiModelProperty(value = "编号") - @NotBlank(message = "编号不能为空") - private String userItemId; - -} diff --git a/food-common/src/main/java/com/zbkj/common/request/UserTreeTaskOkRequest.java b/food-common/src/main/java/com/zbkj/common/request/UserTreeTaskOkRequest.java deleted file mode 100644 index a5876d3..0000000 --- a/food-common/src/main/java/com/zbkj/common/request/UserTreeTaskOkRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zbkj.common.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -@Data -@ApiModel(value="UserTreeTaskOkRequest对象", description="UserTreeTaskOkRequest对象") -public class UserTreeTaskOkRequest implements Serializable { - - private static final long serialVersionUID = 3481659942630712958L; - - @ApiModelProperty(value = "任务编号") - @NotBlank(message = "任务编号不能为空") - private String taskId; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameFrontResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameFrontResponse.java deleted file mode 100644 index 126095b..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameFrontResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="GameConfigFrontResponse对象", description="游戏配置响应对象") -public class GameFrontResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "游戏规则") - private Object rule; - - @ApiModelProperty(value = "游戏商品") - private Object items; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GamePrizeDrawItemFrontResponse.java b/food-common/src/main/java/com/zbkj/common/response/GamePrizeDrawItemFrontResponse.java deleted file mode 100644 index 76f7ccd..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GamePrizeDrawItemFrontResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="GamePrizeDrawItemFrontResponse对象", description="GamePrizeDrawItemFrontResponse对象") -public class GamePrizeDrawItemFrontResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "商品项编号") - private Integer itemId; - @ApiModelProperty(value = "提示语") - private String message; - @ApiModelProperty(value = "图片") - private String productImage; - @ApiModelProperty(value = "商品名称") - private String productName; - @ApiModelProperty(value = "商品价值") - private String productPrice; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GamePrizeDrawRuleFrontResponse.java b/food-common/src/main/java/com/zbkj/common/response/GamePrizeDrawRuleFrontResponse.java deleted file mode 100644 index 08f76e8..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GamePrizeDrawRuleFrontResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="GamePrizeDrawRuleFrontResponse对象", description="GamePrizeDrawRuleFrontResponse对象") -public class GamePrizeDrawRuleFrontResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - private Integer dayNum; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameResponse.java deleted file mode 100644 index 86e05e9..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="GameResponse对象", description="游戏响应对象") -public class GameResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "游戏ID") - private Integer id; - - @ApiModelProperty(value = "游戏标题") - private String name; - - @ApiModelProperty(value = "游戏图片") - private String image; - - @ApiModelProperty(value = "游戏简介") - private String description; - - @ApiModelProperty(value = "游戏规则") - private Object rule; - - @ApiModelProperty(value = "游戏商品") - private Object items; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameTreeItemFrontResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameTreeItemFrontResponse.java deleted file mode 100644 index cdf882c..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameTreeItemFrontResponse.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="GameTreeItemFrontResponse对象", description="GameTreeItemFrontResponse对象") -public class GameTreeItemFrontResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "商品项编号") - private Integer itemId; - - @ApiModelProperty(value = "副标题") - private String title; - - @ApiModelProperty(value = "商品") - private Integer productId; - - @ApiModelProperty(value = "商品图片") - private String productImage; - - @ApiModelProperty(value = "商品名称") - private String productName; - - @ApiModelProperty(value = "商品价值") - private String productPrice; - - @ApiModelProperty(value = "总茶株") - private Integer allNum; - - @ApiModelProperty(value = "被领茶株") - private Integer outNum; - - @ApiModelProperty(value = "种植地点") - private String treePlace; - - @ApiModelProperty(value = "养护人") - private String gardener; - - @ApiModelProperty(value = "土壤") - private String soil; - - @ApiModelProperty(value = "湿度") - private String humidity; - - @ApiModelProperty(value = "hot图标") - private String hotImage; - - @ApiModelProperty(value = "是否显示hot图标，0非，1是") - private Integer isHot; - - @ApiModelProperty(value = "小苗阶段图") - private String smallImage; - - @ApiModelProperty(value = "成长阶段图") - private String growImage; - - @ApiModelProperty(value = "成熟阶段图") - private String bigImage; - - @ApiModelProperty(value = "内容") - private String content; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameTreeItemsFrontResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameTreeItemsFrontResponse.java deleted file mode 100644 index c15ca89..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameTreeItemsFrontResponse.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@ApiModel(value="GameTreeItemsFrontResponse对象", description="GameTreeItemsFrontResponse对象") -public class GameTreeItemsFrontResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "商品项编号") - private Integer itemId; - - @ApiModelProperty(value = "副标题") - private String title; - - @ApiModelProperty(value = "商品") - private Integer productId; - - @ApiModelProperty(value = "商品图片") - private String productImage; - - @ApiModelProperty(value = "商品名称") - private String productName; - - @ApiModelProperty(value = "商品价值") - private String productPrice; - - @ApiModelProperty(value = "总茶株") - private Integer allNum; - - @ApiModelProperty(value = "被领茶株") - private Integer outNum; - - @ApiModelProperty(value = "种植地点") - private String treePlace; - - @ApiModelProperty(value = "土壤") - private String soil; - - @ApiModelProperty(value = "湿度") - private String humidity; - - @ApiModelProperty(value = "hot图标") - private String hotImage; - - @ApiModelProperty(value = "是否显示hot图标，0非，1是") - private Integer isHot; - - @ApiModelProperty(value = "参与的用户头像") - public List userAvatar; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameTreeProductResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameTreeProductResponse.java deleted file mode 100644 index fd63105..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameTreeProductResponse.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="GameTreeProductResponse对象", description="GameTreeProductResponse对象") -public class GameTreeProductResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "ID") - private Integer treeProductId; - /** - * 兑换商品图 - */ - @ApiModelProperty(value = "兑换商品图") - private String productImage; - /** - * 兑换商品标题 - */ - @ApiModelProperty(value = "兑换商品标题") - private String productTitle; - /** - * 所需要茶果价 - */ - @ApiModelProperty(value = "所需茶叶价") - private Integer fruitPrice; - /** - * 库存 - */ - @ApiModelProperty(value = "库存") - private Integer stock; - - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameTreeRuleFrontResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameTreeRuleFrontResponse.java deleted file mode 100644 index 60798c0..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameTreeRuleFrontResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="GameTreeRuleFrontResponse对象", description="GameTreeRuleFrontResponse对象") -public class GameTreeRuleFrontResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "小苗阶段") - private String smallStage; - - @ApiModelProperty(value = "成长阶段") - private Object growStage; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/GameTreeTaskResponse.java b/food-common/src/main/java/com/zbkj/common/response/GameTreeTaskResponse.java deleted file mode 100644 index ffe8a71..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/GameTreeTaskResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Description: 类描述 - * @date: 2024/11/15 17:06 - * @author: tangz - * @since JDK 1.8 - **/ -@Data -@ApiModel(value="GameTreeTaskResponse对象", description="GameTreeTaskResponse对象") -public class GameTreeTaskResponse { - - @ApiModelProperty(value = "任务编号") - private String taskId; - @ApiModelProperty(value = "任务：1签到，2浏览，3点赞") - private String taskType; - @ApiModelProperty(value = "图片") - private String image; - @ApiModelProperty(value = "任务名称") - private String name; - @ApiModelProperty(value = "条件：taskType=2(返回浏览秒数), taskType=3(返回点赞文章数量)") - private String stipulate; - @ApiModelProperty(value = "水滴") - private String water; - @ApiModelProperty(value = "肥料") - private String manure; - @ApiModelProperty(value = "阳光值") - private String sunlight; - @ApiModelProperty(value = "是否可以任务：0否 1是") - private Integer isTask = 1; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/UserGameItemResponse.java b/food-common/src/main/java/com/zbkj/common/response/UserGameItemResponse.java deleted file mode 100644 index 1337e6a..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/UserGameItemResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -@ApiModel(value="UserGameItemResponse对象", description="用户的游戏item对象") -public class UserGameItemResponse implements Serializable { - - private static final long serialVersionUID = -4585094537501770138L; - - @ApiModelProperty(value = "标识") - private Integer userItemId; - - @ApiModelProperty(value = "商品") - private Integer productId; - - @ApiModelProperty(value = "商品图片") - private String productImage; - - @ApiModelProperty(value = "商品名称") - private String productName; - - @ApiModelProperty(value = "商品价值") - private String productPrice; - - @ApiModelProperty(value = "数量") - private String productNum; - - @ApiModelProperty(value = "状态：抽奖(2已领取)，茶株(1未种植 2已种植 3已成熟)") - private String productStatus; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/UserGameTreeResponse.java b/food-common/src/main/java/com/zbkj/common/response/UserGameTreeResponse.java deleted file mode 100644 index ed1bb65..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/UserGameTreeResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -@ApiModel(value="UserGameTreeResponse对象", description="我的游戏-茶树响应对象") -public class UserGameTreeResponse implements Serializable { - - private static final long serialVersionUID=1L; - -} diff --git a/food-common/src/main/java/com/zbkj/common/response/UserTreeFarmResponse.java b/food-common/src/main/java/com/zbkj/common/response/UserTreeFarmResponse.java deleted file mode 100644 index c0998e8..0000000 --- a/food-common/src/main/java/com/zbkj/common/response/UserTreeFarmResponse.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zbkj.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value="UserTreeFarmResponse对象", description="UserTreeFarmResponse对象") -public class UserTreeFarmResponse { - - private static final long serialVersionUID=1L; - - // 当前种植的树 - @ApiModelProperty(value = "种植树编号") - private String userItemId; - // 种植背景图 - @ApiModelProperty(value = "种植背景图") - private String gameImage; - // 目前成长阶段图 - @ApiModelProperty(value = "目前成长阶段图") - private String growImage; - // 树名称 - @ApiModelProperty(value = "树名称") - private String treeName; - // 成长值 - @ApiModelProperty(value = "目前成长值") - private String growValue = "0"; - // 阶段 - @ApiModelProperty(value = "阶段：0未种，1幼苗，2成长，3成熟") - private String phase = "0"; - // 水滴 - @ApiModelProperty(value = "拥有水滴") - private String water; - // 肥料 - @ApiModelProperty(value = "拥有肥料") - private String manure; - // 阳光值 - @ApiModelProperty(value = "拥有阳光值") - private String sunlight; - -} diff --git a/food-common/src/main/java/com/zbkj/common/vo/GameTreeOrderVo.java b/food-common/src/main/java/com/zbkj/common/vo/GameTreeOrderVo.java deleted file mode 100644 index 7552613..0000000 --- a/food-common/src/main/java/com/zbkj/common/vo/GameTreeOrderVo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.zbkj.common.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @Description: 类描述 - * @date: 2024/11/20 21:33 - * @author: tangz - * @since JDK 1.8 - **/ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "GameTreeOrderVo对象", description = "GameTreeOrderVo对象") -public class GameTreeOrderVo implements Serializable { - - @ApiModelProperty(value = "购买人手机") - private String account; - @ApiModelProperty(value = "购买人头像") - private String avatar; - @ApiModelProperty(value = "购买商品") - private String productName; - @ApiModelProperty(value = "商品图片") - private String productImage; - @ApiModelProperty(value = "订单号") - private String orderId; - @ApiModelProperty(value = "购买件数") - private Integer buyNum; - @ApiModelProperty(value = "支付金额") - private String payPrice; - @ApiModelProperty(value = "支付状态：0待支付，1已支付") - private Integer payStatus; - @ApiModelProperty(value = "支付时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private String payTime; - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private String createTime; - -} diff --git a/food-common/src/main/java/com/zbkj/common/vo/GameUserItemVo.java b/food-common/src/main/java/com/zbkj/common/vo/GameUserItemVo.java deleted file mode 100644 index af3806d..0000000 --- a/food-common/src/main/java/com/zbkj/common/vo/GameUserItemVo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zbkj.common.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 类描述 - * @date: 2024/11/20 21:33 - * @author: tangz - * @since JDK 1.8 - **/ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "GameUserItemVo对象", description = "GameUserItemVo对象") -public class GameUserItemVo implements Serializable { - - @ApiModelProperty(value = "获奖人手机") - private String account; - @ApiModelProperty(value = "获奖人头像") - private String avatar; - @ApiModelProperty(value = "奖品图") - private String productImage; - @ApiModelProperty(value = "奖品名") - private String productName; - @ApiModelProperty(value = "奖品价值") - private String productPrice; - @ApiModelProperty(value = "奖品份数") - private String productNum; - @ApiModelProperty(value = "抽奖时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8") - private Date createTime; - -} diff --git a/food-common/src/main/java/com/zbkj/common/vo/GameVo.java b/food-common/src/main/java/com/zbkj/common/vo/GameVo.java deleted file mode 100644 index 0bfee17..0000000 --- a/food-common/src/main/java/com/zbkj/common/vo/GameVo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.zbkj.common.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="GameVo", description="游戏表") -public class GameVo implements Serializable { - - private static final long serialVersionUID=1L; - - @ApiModelProperty(value = "游戏ID") - private Long id; - - @ApiModelProperty(value = "分类id：754茶株游戏，747抽奖游戏") - private String cid; - - @ApiModelProperty(value = "图片") - private String image; - - @ApiModelProperty(value = "名称") - private String gameName; - - @ApiModelProperty(value = "描述") - private String description; - - @ApiModelProperty(value = "状态（0：关闭，1：开启）") - private Integer status; - - @ApiModelProperty(value = "是否隐藏（0：否，1：是）") - private Integer hide; - - @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginTime; - - @ApiModelProperty(value = "结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8") - private Date createTime; - -} diff --git a/food-service/src/main/java/com/zbkj/service/service/WeChatPayService.java b/food-service/src/main/java/com/zbkj/service/service/WeChatPayService.java index b71e96f..dd236f6 100644 --- a/food-service/src/main/java/com/zbkj/service/service/WeChatPayService.java +++ b/food-service/src/main/java/com/zbkj/service/service/WeChatPayService.java @@ -1,8 +1,6 @@ package com.zbkj.service.service; import com.zbkj.common.model.finance.UserRecharge; -import com.zbkj.common.model.game.GameTreeOrder; -import com.zbkj.common.model.teaplant.TeaPlantOrder; import java.util.Map; diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java index 7f1cf74..4a4db10 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java @@ -267,52 +267,6 @@ public class WeChatPayServiceImpl implements WeChatPayService { return rechargePayAfter; } -// /** -// * 微信充值预下单接口 -// * @param userBuyTree 买茶树订单 -// * @param clientIp ip -// * @return -// */ -// @Override -// public Map unifiedBuyTree(GameTreeOrder userBuyTree, String clientIp) { -// if (ObjectUtil.isNull(userBuyTree)) { -// throw new CrmebException("订单不存在"); -// } -// // 获取用户openId -// // 根据订单支付类型来判断获取公众号openId还是小程序openId -// UserToken userToken = new UserToken(); -// userToken = userTokenService.getTokenByUserId(userBuyTree.getUid(), 2); -// if (ObjectUtil.isNull(userToken)) { -// throw new CrmebException("该用户没有openId"); -// } -// -// // 获取appid、mch_id -// // 微信签名key -// String appId = ""; -// String mchId = ""; -// String signKey = ""; -// appId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_APP_ID); -// mchId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_MCH_ID); -// signKey = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_APP_KEY); -// -// // 获取微信预下单对象 -// CreateOrderRequestVo unifiedOrderVo = getUnifiedOrderVo(userBuyTree, userToken.getToken(), clientIp, appId, mchId, signKey); -// // 预下单 -// CreateOrderResponseVo responseVo = unifiedOrder(unifiedOrderVo); -// -// // 组装前端预下单参数 -// Map map = new HashMap<>(); -// map.put("appId", unifiedOrderVo.getAppid()); -// map.put("nonceStr", unifiedOrderVo.getNonce_str()); -// map.put("package", "prepay_id=".concat(responseVo.getPrepayId())); -// map.put("signType", unifiedOrderVo.getSign_type()); -// Long currentTimestamp = WxPayUtil.getCurrentTimestamp(); -// map.put("timeStamp", Long.toString(currentTimestamp)); -// String paySign = WxPayUtil.getSign(map, signKey); -// map.put("paySign", paySign); -// return map; -// } - /** * 微信充值预下单接口 * @param userRecharge 充值订单 diff --git a/prepare_food.sql b/prepare_food.sql index 465fd7f..32e3a31 100644 --- a/prepare_food.sql +++ b/prepare_food.sql @@ -7206,8 +7206,6 @@ INSERT INTO `eb_system_menu` VALUES ('407', '405', '视频详情', null, 'admin: INSERT INTO `eb_system_menu` VALUES ('408', '405', '视频修改', null, 'admin:video:update', null, 'A', '99999', '1', '0', '2024-11-10 03:43:35', '2024-11-10 17:43:19'); INSERT INTO `eb_system_menu` VALUES ('409', '405', '视频添加', null, 'admin:video:save', '', 'A', '99999', '1', '0', '2024-11-10 03:43:35', '2024-11-10 17:43:19'); INSERT INTO `eb_system_menu` VALUES ('410', '405', '视频删除', null, 'admin:video:delete', '', 'A', '99999', '1', '0', '2024-11-10 03:43:35', '2024-11-10 17:43:19'); -INSERT INTO `eb_system_menu` VALUES ('411', '7', '茶株管理', '', '', '/marketing/lottery', 'M', '0', '0', '1', '2024-11-12 05:05:09', '2025-03-06 15:25:01'); -INSERT INTO `eb_system_menu` VALUES ('412', '411', '茶株认领', '', 'admin:game:list', '/marketing/lottery/lotteryconfig', 'C', '0', '1', '1', '2024-11-12 05:06:20', '2024-11-20 18:27:22'); INSERT INTO `eb_system_menu` VALUES ('413', '419', '活动管理', null, 'admin:activity:list', '/marketing/activity/activityList', 'C', '99999', '1', '1', '2024-11-14 23:40:36', '2024-11-15 01:11:48'); INSERT INTO `eb_system_menu` VALUES ('414', '413', 'DATA_LIST', null, 'autogencode:ebactivity:list', 'autogencode/ebactivity/list', 'A', '99999', '1', '1', '2024-11-14 23:40:36', '2024-11-14 23:40:36'); INSERT INTO `eb_system_menu` VALUES ('415', '413', 'DATA_INFO', null, 'autogencode:ebactivity:info', 'autogencode:ebactivity/info', 'A', '99999', '1', '1', '2024-11-14 23:40:36', '2024-11-14 23:40:36'); @@ -7221,12 +7219,6 @@ INSERT INTO `eb_system_menu` VALUES ('422', '413', '删除按钮', '', 'admin:ac INSERT INTO `eb_system_menu` VALUES ('423', '419', '场地预约', '', 'admin:place:list', '/marketing/activity/venueReservation', 'C', '0', '1', '1', '2024-11-16 18:54:05', '2024-11-16 19:11:59'); INSERT INTO `eb_system_menu` VALUES ('424', '423', '修改按钮', '', 'admin:place:update', '', 'A', '0', '0', '1', '2024-11-16 19:12:17', '2025-03-11 16:43:48'); INSERT INTO `eb_system_menu` VALUES ('425', '423', '详情按钮', '', 'admin:place:info', '', 'A', '0', '0', '1', '2024-11-16 19:12:37', '2025-03-11 16:43:54'); -INSERT INTO `eb_system_menu` VALUES ('426', '412', '修改按钮', '', 'admin:game:update', '', 'A', '0', '0', '1', '2024-11-17 18:18:51', '2025-03-11 16:44:01'); -INSERT INTO `eb_system_menu` VALUES ('427', '7', '抽奖管理', '', '', '/marketing/raffle', 'M', '0', '0', '1', '2024-11-17 21:44:36', '2025-03-06 15:25:11'); -INSERT INTO `eb_system_menu` VALUES ('428', '427', '抽奖配置', '', '', '/marketing/raffle/config', 'C', '0', '1', '1', '2024-11-17 21:45:03', '2024-11-17 23:22:51'); -INSERT INTO `eb_system_menu` VALUES ('429', '427', '抽奖记录', '', 'admin:game:list', '/marketing/activity/activityLog', 'C', '0', '1', '1', '2024-11-20 17:47:39', '2024-11-20 18:06:46'); -INSERT INTO `eb_system_menu` VALUES ('430', '427', '抽奖记录', '', '', '/marketing/raffle/rafflelog', 'C', '0', '1', '1', '2024-11-20 17:54:35', '2024-11-20 18:03:51'); -INSERT INTO `eb_system_menu` VALUES ('431', '411', '领养记录', '', '', '/marketing/activity/lotteryLog', 'C', '0', '1', '1', '2024-11-20 18:18:25', '2024-11-20 18:38:35'); INSERT INTO `eb_system_menu` VALUES ('432', '39', '获取tree结构的列表', '', 'admin:system:city:list:tree', '', 'A', '0', '1', '0', '2024-11-21 07:50:10', '2024-11-21 07:50:10'); INSERT INTO `eb_system_menu` VALUES ('433', '91', '查询配置表信息', '', 'admin:system:config:info', '', 'A', '0', '1', '0', '2024-11-21 07:51:41', '2024-11-21 07:55:44');