wangming 4 nedēļas atpakaļ
vecāks
revīzija
cd3d24d48c

+ 5 - 2
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);
         }
         //添加填写物流信息轨迹

+ 12 - 0
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;
+    }
 }

+ 1 - 0
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;
 
 }