评分+

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShopCarousel.java

@@ -29,10 +29,10 @@ public class CampsiteShopCarousel implements Serializable {
     private Integer id;
 
     /**
-     * 商家id
+     * 营地id
      */
     @Column(name = "shop_id")
-    @ApiModelProperty(value = "商家id")
+    @ApiModelProperty(value = "营地id")
     private Integer shopId;
 
     /**

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShopTag.java

@@ -9,7 +9,7 @@ import lombok.Data;
 
 
 /**
- * 店铺类型表
+ * 店铺与类型
  *
  * @author libin
  * @email 18178966185@163.com

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/VehicleScoreType.java

+package com.xxfc.platform.vehicle.constant;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 车型评分类型
+ * @data 2019/6/18 15:39
+ */
+public enum VehicleScoreType {
+    /**
+     * 服务态度
+     */
+    SERVICE,
+    /**
+     * 司机
+     */
+    DRIVER,
+    /**
+     * 检验感受
+     */
+    EXPERIENCE;
+
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleUserScore.java

+package com.xxfc.platform.vehicle.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户评分表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-06-18 15:03:58
+ */
+@Data
+@Table(name = "vehicle_user_score")
+public class VehicleUserScore implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  用户id
+     */
+    @Column(name = "user_id")
+	@ApiModelProperty(value = "用户id")
+    private Integer userId;
+	
+	    /**
+     *  订单id
+     */
+    @Column(name = "order_id")
+	@ApiModelProperty(value = "订单id")
+    private Integer orderId;
+	
+	    /**
+     *  车型id
+     */
+    @Column(name = "model_id")
+	@ApiModelProperty(value = "车型id")
+    private Integer modelId;
+	
+	    /**
+     *  评分类型
+     */
+    @Column(name = "type")
+	@ApiModelProperty(value = "评分类型")
+    private Integer type;
+	
+	    /**
+     *  评价分
+     */
+    @Column(name = "ave_score")
+	@ApiModelProperty(value = "评价分")
+    private Integer aveScore;
+	
+	    /**
+     *  评分明细
+     */
+    @Column(name = "scores")
+	@ApiModelProperty(value = "评分明细")
+    private String scores;
+	
+	    /**
+     *  是否匿名；0-否；1-是
+     */
+    @Column(name = "is_anony")
+	@ApiModelProperty(value = "是否匿名；0-否；1-是")
+    private Integer isAnony;
+	
+	    /**
+     *  评价
+     */
+    @Column(name = "comment")
+	@ApiModelProperty(value = "评价")
+    private String comment;
+	
+	    /**
+     *  图片
+     */
+    @Column(name = "imgs")
+	@ApiModelProperty(value = "图片")
+    private String imgs;
+	
+	    /**
+     *  状态:0-未审核；1-已审核;2-审核不通过
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态:0-未审核；1-已审核;2-审核不通过")
+    private Integer status;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  是否删除；0-正常；1-删除
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/ScoreTypeDTO.java

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import com.xxfc.platform.vehicle.constant.VehicleScoreType;
+import lombok.Data;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description TODO
+ * @data 2019/6/18 15:45
+ */
+@Data
+public class ScoreTypeDTO {
+
+    /**
+     * 评分类型
+     */
+    @Enumerated(EnumType.STRING)
+    private VehicleScoreType vehicleScoreType;
+
+    /**
+     * 评分
+     */
+    private  int score;
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehicleUserScoreDTO.java

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 车型评分
+ * @data 2019/6/18 15:15
+ */
+@Data
+public class VehicleUserScoreDTO {
+
+
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    /**
+     *  用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+
+    /**
+     *  订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Integer orderId;
+
+    /**
+     *  车型id
+     */
+    @ApiModelProperty(value = "车型id")
+    private Integer modelId;
+
+    /**
+     *  评分类型
+     */
+    @ApiModelProperty(value = "评分类型")
+    private Integer type;
+
+    /**
+     *  评价分
+     */
+    @ApiModelProperty(value = "评价分")
+    private Integer aveScore;
+
+    /**
+     *  评分明细
+     */
+    @ApiModelProperty(value = "评分明细")
+    private String scores;
+
+    /**
+     *  是否匿名；0-否；1-是
+     */
+    @ApiModelProperty(value = "是否匿名；0-否；1-是")
+    private Integer isAnony;
+
+    /**
+     *  评价
+     */
+    @ApiModelProperty(value = "评价")
+    private String comment;
+
+    /**
+     *  图片
+     */
+    @ApiModelProperty(value = "图片")
+    private String imgs;
+
+    /**
+     *  状态:0-未审核；1-已审核;2-审核不通过
+     */
+    @ApiModelProperty(value = "状态:0-未审核；1-已审核;2-审核不通过")
+    private Integer status;
+
+    /**
+     *  创建时间
+     */
+    @ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+
+    /**
+     *  更新时间
+     */
+    @ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+
+    /**
+     *  是否删除；0-正常；1-删除
+     */
+    @ApiModelProperty(value = "是否删除；0-正常；1-删除")
+    private Integer isDel;
+
+    /**
+     * 服务类型评分
+     */
+    @ApiModelProperty(value = "服务类型评分")
+    private List<ScoreTypeDTO> scoretype;
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleUserScoreVo.java

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description TODO
+ * @data 2019/6/18 15:26
+ */
+@Data
+public class VehicleUserScoreVo {
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleUserScoreBiz.java

+package com.xxfc.platform.vehicle.biz;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.entity.VehicleUserScore;
+import com.xxfc.platform.vehicle.mapper.VehicleUserScoreMapper;
+import com.xxfc.platform.vehicle.pojo.dto.ScoreTypeDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleUserScoreDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleUserScoreVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import java.time.Instant;
+import java.util.List;
+
+
+/**
+ * 用户评分表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-06-18 15:03:58
+ */
+@Service
+public class VehicleUserScoreBiz extends BaseBiz<VehicleUserScoreMapper, VehicleUserScore> {
+
+
+    /**
+     * 根据车型id查询
+     * @param modelId
+     * @return
+     */
+    public PageDataVO<VehicleUserScoreVo> findVehicleUserScorePageByModelId(Integer modelId) {
+        return null;
+    }
+
+    /**
+     * 保存评分
+     * @param vehicleUserScoreDTO
+     * @return
+     */
+    public int saveVehicleUserScore(VehicleUserScoreDTO vehicleUserScoreDTO) {
+        vehicleUserScoreDTO.setCrtTime(Instant.now().toEpochMilli());
+        List<ScoreTypeDTO> scoretype = vehicleUserScoreDTO.getScoretype();
+        vehicleUserScoreDTO.setComment(JSONObject.toJSONString(scoretype));
+        double avgScore = scoretype.stream().mapToInt(ScoreTypeDTO::getScore).average().getAsDouble();
+        VehicleUserScore vehicleUserScore = new VehicleUserScore();
+        BeanUtils.copyProperties(vehicleUserScoreDTO,vehicleUserScore);
+        //vehicleUserScore.setAveScore();
+        return mapper.insertSelective(vehicleUserScore);
+    }
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleUserScoreMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleUserScore;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户评分表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-06-18 15:03:58
+ */
+public interface VehicleUserScoreMapper extends Mapper<VehicleUserScore> {
+	
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleUserScoreController.java

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.biz.VehicleUserScoreBiz;
+import com.xxfc.platform.vehicle.entity.VehicleUserScore;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleUserScoreDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleUserScoreVo;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 评分
+ * @data 2019/6/18 15:32
+ */
+@RestController
+@RequestMapping("vehicleUserScore")
+public class VehicleUserScoreController extends BaseController<VehicleUserScoreBiz, VehicleUserScore> {
+
+    /**
+     * 保存评分
+     * @param vehicleUserScoreDTO
+     * @return
+     */
+    @PostMapping("/score")
+     public ObjectRestResponse<Void> saveVehicleUserScore(VehicleUserScoreDTO vehicleUserScoreDTO){
+         int effectRows = getBaseBiz().saveVehicleUserScore(vehicleUserScoreDTO);
+         if (effectRows>0){
+            return ObjectRestResponse.succ();
+         }
+         return ObjectRestResponse.createDefaultFail();
+     }
+    /**
+     * 根据车型查询评分列表
+     *
+     * @param modelId
+     * @return
+     */
+    @GetMapping("/scores")
+    public ObjectRestResponse<PageDataVO<VehicleUserScoreVo>> findVehicleUserScorePageByModelId(@RequestParam("modelId") Integer modelId) {
+        PageDataVO<VehicleUserScoreVo> pageDataVO = getBaseBiz().findVehicleUserScorePageByModelId(modelId);
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+}
\ No newline at end of file