diff --git a/hiver-core/src/main/java/cc/hiver/core/config/properties/HiverTokenProperties.java b/hiver-core/src/main/java/cc/hiver/core/config/properties/HiverTokenProperties.java
index 490732f4..59ed1d92 100644
--- a/hiver-core/src/main/java/cc/hiver/core/config/properties/HiverTokenProperties.java
+++ b/hiver-core/src/main/java/cc/hiver/core/config/properties/HiverTokenProperties.java
@@ -36,7 +36,7 @@ public class HiverTokenProperties {
/**
* 鐢ㄦ埛閫夋嫨淇濆瓨鐧诲綍鐘舵佸搴攖oken杩囨湡鏃堕棿锛堝ぉ锛
*/
- private Integer saveLoginTime = 365;
+ private Integer saveLoginTime = 1000;
/**
* 闄愬埗鐢ㄦ埛鐧婚檰閿欒娆℃暟锛堟锛
diff --git a/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java b/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java
index b3a201b7..ee1f3f9c 100644
--- a/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java
+++ b/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java
@@ -202,11 +202,40 @@ public class Worker implements Serializable {
@Column(name = "is_on_line")
private Integer isOnLine;
- @ApiModelProperty(value = "杩斾剑閲戦")
+ @ApiModelProperty(value = "浜ゆ槗淇濋殰閲")
@Column(name = "rebate_amount")
private BigDecimal rebateAmount;
@Transient
@ApiModelProperty(value = "鎵嬩笂鐨勮鍗曟暟")
private Integer orderCount;
+
+ @ApiModelProperty(value = "鐢ㄦ埛id")
+ @Column(name = "user_id")
+ private String userId;
+
+ @ApiModelProperty(value = "褰撳墠瀹氫綅")
+ @Column(name = "geolocation")
+ private String geolocation;
+
+ @ApiModelProperty(value = "澶村儚")
+ @Column(name = "icon")
+ private String icon;
+
+ @ApiModelProperty(value = "瀛︾敓/韬唤璇")
+ @Column(name = "card_picture")
+ private String cardPicture;
+
+ @ApiModelProperty(value = "0涓嶆帴鎸囨淳 1鎺ユ敹")
+ @Column(name = "get_push_order")
+ private Integer getPushOrder;
+
+ @ApiModelProperty(value = "璇勫垎")
+ @Column(name = "score")
+ private BigDecimal score;
+
+ @ApiModelProperty(value = "骞冲潎鏃堕暱")
+ @Column(name = "avg_time")
+ private BigDecimal avgTime;
+
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java
new file mode 100644
index 00000000..80c55b64
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommentController.java
@@ -0,0 +1,117 @@
+/*
+Copyright [2022] [https://hiver.cc]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+package cc.hiver.mall.controller;
+
+import cc.hiver.core.common.constant.ShopConstant;
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.utils.StringUtils;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.entity.Comment;
+import cc.hiver.mall.entity.ShopTakeaway;
+import cc.hiver.mall.pojo.query.CommentQuery;
+import cc.hiver.mall.pojo.query.ShopTakeawayQuery;
+import cc.hiver.mall.pojo.vo.ProductPageVO;
+import cc.hiver.mall.service.CommentService;
+import cc.hiver.mall.service.ShopTakeawayService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 搴楅摵澶栧崠涓氬姟閰嶇疆鎺у埗鍣
+ *
+ * @author cc
+ */
+@Slf4j
+@RestController
+@Api(tags = "璇勮鎺ュ彛")
+@RequestMapping("/hiver/app/comment")
+public class CommentController {
+
+ @Autowired
+ private CommentService commentService;
+
+ @RequestMapping(value = "/save", method = RequestMethod.POST)
+ @ApiOperation("淇濆瓨")
+ @ResponseBody
+ public Result
save(Comment comment) {
+ // 1. 鑾峰彇褰撳墠鏃堕棿
+ final LocalDateTime now = LocalDateTime.now();
+
+ // 2. 瀹氫箟鏍煎紡鍖栧櫒 (渚嬪锛歽yyy-MM-dd HH:mm:ss)
+ final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ // 3. 杞崲涓哄瓧绗︿覆
+ final String timeStr = now.format(formatter);
+ comment.setCreateByName(timeStr);
+ if(StringUtils.isEmpty(comment.getParentId())){
+ comment.setLevel(ShopConstant.SHOP_STATUS_LOCK);
+ }else{
+ comment.setLevel(ShopConstant.SHOP_STATUS_NORMAL);
+ }
+ final Integer result = commentService.insert(comment);
+ return new ResultUtil().setData(comment);
+ }
+
+ @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+ @ApiOperation("鍒犻櫎")
+ public Result