美天美牙
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
mitao
2024-04-30 ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 
 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;