|
|
@@ -5,16 +5,16 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.google.common.collect.Lists;
|
|
|
import com.yami.shop.bean.app.dto.ApiOrderRefundDto;
|
|
|
import com.yami.shop.bean.app.param.OrderRefundExpressParam;
|
|
|
import com.yami.shop.bean.app.param.OrderRefundParam;
|
|
|
import com.yami.shop.bean.dto.OrderRefundDto;
|
|
|
-import com.yami.shop.bean.enums.*;
|
|
|
+import com.yami.shop.bean.enums.OrderStatus;
|
|
|
+import com.yami.shop.bean.enums.RefundStatusEnum;
|
|
|
+import com.yami.shop.bean.enums.RefundType;
|
|
|
+import com.yami.shop.bean.enums.ReturnMoneyStsType;
|
|
|
import com.yami.shop.bean.model.*;
|
|
|
import com.yami.shop.bean.param.OrderDto;
|
|
|
-import com.yami.shop.bean.param.OrderRefundAmountDTO;
|
|
|
-import com.yami.shop.bean.param.OrderRefundAmountParam;
|
|
|
import com.yami.shop.common.config.Constant;
|
|
|
import com.yami.shop.common.exception.GlobalException;
|
|
|
import com.yami.shop.common.util.Arith;
|
|
|
@@ -47,7 +47,10 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import javax.validation.Valid;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
@Slf4j
|
|
|
@RestController
|
|
|
@@ -380,13 +383,6 @@ public class OrderRefundController {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- List<OrderRefundAmountParam> skuList = Lists.newArrayList();
|
|
|
- List<OrderRefundSku> requestSkuList = orderRefundParam.getOrderRefundSkuList();
|
|
|
- requestSkuList.forEach(c-> skuList.add(new OrderRefundAmountParam(c.getSkuId(),c.getProductCount())));
|
|
|
- OrderRefundAmountDTO dto = orderService.computeOrderRefundAmount(orderRefundParam.getOrderNumber(), skuList);
|
|
|
- newOrderRefund.setOffsetPoints(dto.getOffsetPoints());
|
|
|
- newOrderRefund.setRefundAmount(dto.getOrderRefundAmount().doubleValue());
|
|
|
-
|
|
|
//生成退款记录
|
|
|
//生成申请退款记录
|
|
|
OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
|