Merge branch 'master' of http://git.zonelife.cn:3000/fubojin/smqjh

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -1,6 +1,5 @@
 package com.yami.shop.api.controller;
 
-import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java

@@ -17,7 +17,6 @@ import com.yami.shop.bean.app.dto.ProdCommDto;
 import com.yami.shop.bean.app.param.ProdCommParam;
 import com.yami.shop.bean.enums.OrderStatus;
 import com.yami.shop.bean.model.Order;
-import com.yami.shop.bean.model.OrderItem;
 import com.yami.shop.bean.model.ProdComm;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
@@ -46,20 +45,16 @@ public class ProdCommController {
 
     private final OrderService orderService;
 
-
     @GetMapping("/prodCommPageByUser")
     @ApiOperation(value = "根据用户返回评论分页数据", notes = "传入页码")
     public ResponseEntity<IPage<ProdCommDto>> getProdCommPage(PageParam page) {
         return ResponseEntity.ok(prodCommService.getProdCommDtoPageByUserId(page, SecurityUtils.getUser().getUserId()));
     }
 
-
-
     @PostMapping
     @ApiOperation(value = "添加评论")
     public ResponseEntity<Void> saveProdCommPage(@Valid @RequestBody ProdCommParam prodCommParam) {
         Long orderItemId = prodCommParam.getOrderItemId();
-
         Order orderServiceById = orderService.getById(orderItemId);
         if (orderServiceById == null) {
             throw new GlobalException("订单项不存在");
@@ -69,23 +64,21 @@ public class ProdCommController {
         }
 
         String userId = SecurityUtils.getUser().getUserId();
-
         Order order = orderService.getOrderByOrderNumberAndUserId(orderServiceById.getOrderNumber(),userId, true);
-
         if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.SUCCESS.value())) {
             throw new GlobalException("请确认收货后再进行评论");
         }
 
         prodCommService.comm(orderServiceById, prodCommParam);
-
         return ResponseEntity.ok().build();
     }
 
     @GetMapping("/getProdComment")
     @ApiOperation(value = "根据itemId获取评论", notes = "根据itemId获取评论")
     public ResponseEntity<ProdComm> getProdComment(Long orderItemId) {
-
-        ProdComm prodComm = prodCommService.getOne(new LambdaUpdateWrapper<ProdComm>().eq(ProdComm::getOrderItemId, orderItemId).eq(ProdComm::getUserId,SecurityUtils.getUser().getUserId()));
+        ProdComm prodComm = prodCommService.getOne(new LambdaUpdateWrapper<ProdComm>()
+                .eq(ProdComm::getOrderItemId, orderItemId)
+                .eq(ProdComm::getUserId,SecurityUtils.getUser().getUserId()));
         return ResponseEntity.ok(prodComm);
     }
 }

yami-shop-api/src/main/java/com/yami/shop/api/controller/RefundDeliveryController.java

@@ -4,7 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.enums.ReturnMoneyStsType;
-import com.yami.shop.bean.model.*;
+import com.yami.shop.bean.model.OrderRefund;
+import com.yami.shop.bean.model.OrderRefundRecord;
+import com.yami.shop.bean.model.RefundAddr;
+import com.yami.shop.bean.model.RefundDelivery;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.R;
@@ -17,7 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -93,6 +95,7 @@ public class RefundDeliveryController {
             refundDelivery.setReceiverAddr(shopAddress);
             refundDelivery.setReceiverName(refundAddr.getReceiverName());
             refundDelivery.setReceiverMobile(refundAddr.getReceiverMobile());
+            refundDelivery.setCreateTime(new Date());
             refundDeliveryService.save(refundDelivery);
         }
         //添加填写物流信息轨迹

yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java

@@ -288,4 +288,16 @@ public class ShopCartController {
         return ResponseEntity.ok(shopCartAmountDto);
     }
 
+    public static void main(String[] args) {
+        System.out.println(getRateMoney(100, 3.0));
+    }
+
+    private static Integer getRateMoney(Integer money,Double rate) {
+        System.out.println(money * rate);
+        int rateMoney = (int) Math.floor(money * rate / 100);
+        if (rateMoney==0){
+            return 1;
+        }
+        return rateMoney;
+    }
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/RefundDeliveryDto.java

@@ -74,5 +74,6 @@ public class RefundDeliveryDto {
 
     private Long deliveryTime;
 
+    private Long refundDeliveryId;
 
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java

@@ -30,10 +30,22 @@ public class ProdCommParam {
     /**
      * 评价，0-5分
      */
-    @ApiModelProperty(value = "评分，0-5分",required=true)
+    @ApiModelProperty(value = "评分，1-5分",required=true)
     @NotNull(message = "评分不能为空")
     private Integer score;
 
+    @ApiModelProperty(value = "配送打包，1-5分",required=true)
+    @NotNull(message = "配送打包不能为空")
+    private Integer deliveryPack;
+
+    @ApiModelProperty(value = "送货速度，1-5分",required=true)
+    @NotNull(message = "送货速度不能为空")
+    private Integer deliverySpeed;
+
+    @ApiModelProperty(value = "配送员服务，1-5分",required=true)
+    @NotNull(message = "配送员服务不能为空")
+    private Integer deliveryService;
+
     @ApiModelProperty(value = "评论内容",required=true)
     @NotBlank(message = "评论内容不能为空")
     private String content;

yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdComm.java

@@ -13,7 +13,6 @@ package com.yami.shop.bean.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yami.shop.bean.vo.UserVO;
 import com.yami.shop.common.serializer.json.ImgJsonSerializer;
@@ -23,7 +22,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 商品评论
@@ -84,6 +82,12 @@ public class ProdComm implements Serializable{
      * 得分，0-5分
      */
     private Integer score;
+    //配送打包 1-5分
+    private Integer deliveryPack;
+    //送货速度 1-5分
+    private Integer deliverySpeed;
+    //配送员服务 1-5分
+    private Integer deliveryService;
     /**
      * 有用的计数
      */

yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.yami.shop.service;
 
 
@@ -18,11 +8,8 @@ import com.yami.shop.bean.app.dto.ProdCommDataDto;
 import com.yami.shop.bean.app.dto.ProdCommDto;
 import com.yami.shop.bean.app.param.ProdCommParam;
 import com.yami.shop.bean.model.Order;
-import com.yami.shop.bean.model.OrderItem;
 import com.yami.shop.bean.model.ProdComm;
 
-import java.util.List;
-
 
 /**
  * 商品评论
@@ -39,10 +26,5 @@ public interface ProdCommService extends IService<ProdComm> {
 
     IPage<ProdComm> getProdCommPage(Page page,ProdComm prodComm,Long shopId);
 
-    /**
-     * 评论
-     * @param orderItem
-     * @param prodCommParam
-     */
     void comm(Order order, ProdCommParam prodCommParam);
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java

@@ -22,7 +22,6 @@ import com.yami.shop.bean.model.Order;
 import com.yami.shop.bean.model.OrderItem;
 import com.yami.shop.bean.model.ProdComm;
 import com.yami.shop.common.util.Arith;
-import com.yami.shop.common.util.HttpContextUtils;
 import com.yami.shop.common.util.IPHelper;
 import com.yami.shop.dao.OrderItemMapper;
 import com.yami.shop.dao.OrderMapper;
@@ -35,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 商品评论
@@ -101,6 +99,9 @@ public class ProdCommServiceImpl extends ServiceImpl<ProdCommMapper, ProdComm> i
             prodComm.setOrderItemId(orderItem.getOrderItemId());
             prodComm.setUserId(order.getUserId());
             prodComm.setScore(prodCommParam.getScore());
+            prodComm.setDeliveryPack(prodCommParam.getDeliveryPack());
+            prodComm.setDeliverySpeed(prodCommParam.getDeliverySpeed());
+            prodComm.setDeliveryService(prodCommParam.getDeliveryService());
             prodComm.setContent(prodCommParam.getContent());
 //        prodComm.setPics(prodCommParam.getPics());
             prodComm.setPics(StrUtil.isBlank(prodCommParam.getPics()) ?null:prodCommParam.getPics());