From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 30 四月 2024 19:11:37 +0800 Subject: [PATCH] 2024.04新增内容 --- meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallOrderController.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallOrderController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallOrderController.java index 17f1624..521f66e 100644 --- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallOrderController.java +++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallOrderController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sinata.common.enums.EnumCityRole; import com.sinata.common.enums.EnumIsDelete; import com.sinata.common.enums.mall.EnumMallOrderState; import com.sinata.common.util.QRCodeUtils; @@ -19,7 +20,13 @@ import com.sinata.rest.modular.mall.model.MallOrder; import com.sinata.rest.modular.mall.model.MallOrderDetail; import com.sinata.rest.modular.mall.model.MallOrderMain; -import com.sinata.rest.modular.mall.service.*; +import com.sinata.rest.modular.mall.service.IMallGoodsService; +import com.sinata.rest.modular.mall.service.IMallGoodsSkuService; +import com.sinata.rest.modular.mall.service.IMallGroupSpecService; +import com.sinata.rest.modular.mall.service.IMallOrderDetailGroupSpecService; +import com.sinata.rest.modular.mall.service.IMallOrderDetailService; +import com.sinata.rest.modular.mall.service.IMallOrderMainService; +import com.sinata.rest.modular.mall.service.IMallOrderService; import com.sinata.rest.modular.member.model.MemUser; import com.sinata.rest.modular.member.model.MyCoupon; import com.sinata.rest.modular.member.service.IMyCouponService; @@ -28,10 +35,25 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; -- Gitblit v1.7.1