From d352cd8dd25fbd142e919e856b61b732234e860f Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Fri, 29 Mar 2024 09:57:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bunny <1319900154@qq.com> --- .../com/atguigu/constant/MessageConstant.java | 2 + .../atguigu/feign/cart/CartFeignClient.java | 5 +- .../feign/product/ProductFeignClient.java | 2 +- .../atguigu/feign/user/UserFeignClient.java | 13 ++ .../cart/controller/CartController.java | 15 ++- .../com/atguigu/cart/service/CartService.java | 5 + .../cart/service/impl/CartServiceImpl.java | 15 +++ spzx-service/service-order/pom.xml | 10 ++ .../com/atguigu/order/OrderApplication.java | 2 +- .../order/controller/OrderInfoController.java | 13 +- .../atguigu/order/mapper/OrderInfoMapper.java | 7 ++ .../atguigu/order/mapper/OrderItemMapper.java | 14 +++ .../atguigu/order/mapper/OrderLogMapper.java | 14 +++ .../order/service/OrderInfoService.java | 9 ++ .../service/impl/OrderInfoServiceImpl.java | 111 ++++++++++++++++++ .../main/resources/mapper/OrderInfoMapper.xml | 55 +++++++++ .../main/resources/mapper/OrderItemMapper.xml | 26 ++++ .../main/resources/mapper/OrderLogMapper.xml | 22 ++++ .../controller/UserAddressController.java | 4 +- 19 files changed, 332 insertions(+), 12 deletions(-) create mode 100644 spzx-service-client/service-user-client/src/main/java/com/atguigu/feign/user/UserFeignClient.java create mode 100644 spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderItemMapper.java create mode 100644 spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderLogMapper.java create mode 100644 spzx-service/service-order/src/main/resources/mapper/OrderItemMapper.xml create mode 100644 spzx-service/service-order/src/main/resources/mapper/OrderLogMapper.xml diff --git a/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java b/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java index d8b3e5f..858daf8 100644 --- a/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java +++ b/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java @@ -31,4 +31,6 @@ public class MessageConstant { public static final String VERIFICATION_CODE_IS_EMPTY = "请先发送验证码"; public static final String LOGIN_DTO_IS_EMPTY = "登录参数不能为空"; public static final String TOKEN_IS_EMPTY = "token为空"; + public static final String DATA_IS_EMPTY = "数据为空"; + public static final String STOCK_LESS = "库存不足"; } diff --git a/spzx-service-client/service-cart-client/src/main/java/com/atguigu/feign/cart/CartFeignClient.java b/spzx-service-client/service-cart-client/src/main/java/com/atguigu/feign/cart/CartFeignClient.java index 1053ce2..ea8c0e3 100644 --- a/spzx-service-client/service-cart-client/src/main/java/com/atguigu/feign/cart/CartFeignClient.java +++ b/spzx-service-client/service-cart-client/src/main/java/com/atguigu/feign/cart/CartFeignClient.java @@ -9,6 +9,9 @@ import java.util.List; @FeignClient(value = "service-cart", path = "/api/order/cart") public interface CartFeignClient { - @GetMapping(value = "/auth/getAllCkecked") + @GetMapping("/auth/getAllCkecked") Result> getAllChecked(); + + @GetMapping("/auth/deleteChecked") + Result deleteChecked(); } diff --git a/spzx-service-client/service-product-client/src/main/java/com/atguigu/feign/product/ProductFeignClient.java b/spzx-service-client/service-product-client/src/main/java/com/atguigu/feign/product/ProductFeignClient.java index 67da4d2..2bee61c 100644 --- a/spzx-service-client/service-product-client/src/main/java/com/atguigu/feign/product/ProductFeignClient.java +++ b/spzx-service-client/service-product-client/src/main/java/com/atguigu/feign/product/ProductFeignClient.java @@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -@FeignClient(name = "service-product", path = "/api/product/") +@FeignClient(value = "service-product", path = "/api/product/") public interface ProductFeignClient { @GetMapping("getBySkuId/{skuId}") Result getBySkuId(@PathVariable Long skuId); diff --git a/spzx-service-client/service-user-client/src/main/java/com/atguigu/feign/user/UserFeignClient.java b/spzx-service-client/service-user-client/src/main/java/com/atguigu/feign/user/UserFeignClient.java new file mode 100644 index 0000000..6830d2b --- /dev/null +++ b/spzx-service-client/service-user-client/src/main/java/com/atguigu/feign/user/UserFeignClient.java @@ -0,0 +1,13 @@ +package com.atguigu.feign.user; + +import com.atguigu.spzx.model.entity.user.UserAddress; +import com.atguigu.spzx.model.vo.result.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +@FeignClient(value = "service-user", path = "/api/user/userAddress") +public interface UserFeignClient { + @GetMapping("getUserAddress/{id}") + Result getUserAddress(@PathVariable Long id); +} \ No newline at end of file diff --git a/spzx-service/service-cart/src/main/java/com/atguigu/cart/controller/CartController.java b/spzx-service/service-cart/src/main/java/com/atguigu/cart/controller/CartController.java index d08e0ad..ee84a5d 100644 --- a/spzx-service/service-cart/src/main/java/com/atguigu/cart/controller/CartController.java +++ b/spzx-service/service-cart/src/main/java/com/atguigu/cart/controller/CartController.java @@ -43,15 +43,15 @@ public class CartController { @Operation(summary = "更新购物车商品选中状态") @GetMapping("/auth/checkCart/{skuId}/{isChecked}") - public Result checkCart(@Parameter(name = "skuId", description = "商品skuId", required = true) @PathVariable(value = "skuId") Long skuId, - @Parameter(name = "isChecked", description = "是否选中 1:选中 0:取消选中", required = true) @PathVariable(value = "isChecked") Integer isChecked) { + public Result checkCart(@Parameter(name = "skuId", description = "商品skuId", required = true) @PathVariable("skuId") Long skuId, + @Parameter(name = "isChecked", description = "是否选中 1:选中 0:取消选中", required = true) @PathVariable("isChecked") Integer isChecked) { cartService.checkCart(skuId, isChecked); return Result.success(); } @Operation(summary = "更新购物车商品全部选中状态") @GetMapping("/auth/allCheckCart/{isChecked}") - public Result allCheckCart(@Parameter(name = "isChecked", description = "是否选中 1:选中 0:取消选中", required = true) @PathVariable(value = "isChecked") Integer isChecked) { + public Result allCheckCart(@Parameter(name = "isChecked", description = "是否选中 1:选中 0:取消选中", required = true) @PathVariable("isChecked") Integer isChecked) { cartService.allCheckCart(isChecked); return Result.success(); } @@ -64,9 +64,16 @@ public class CartController { } @Operation(summary = "选中的购物车") - @GetMapping(value = "/auth/getAllCkecked") + @GetMapping("/auth/getAllCkecked") public Result> getAllChecked() { List cartInfoList = cartService.getAllChecked(); return Result.success(cartInfoList); } + + @Operation(summary = "清空提交过的购物车") + @GetMapping("/auth/deleteChecked") + public Result deleteChecked() { + cartService.deleteChecked(); + return Result.success(); + } } \ No newline at end of file diff --git a/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/CartService.java b/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/CartService.java index f0e2d4c..9899868 100644 --- a/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/CartService.java +++ b/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/CartService.java @@ -53,4 +53,9 @@ public interface CartService { * @return CartInfo列表 */ List getAllChecked(); + + /** + * 清空提交过的购物车 + */ + void deleteChecked(); } diff --git a/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/impl/CartServiceImpl.java b/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/impl/CartServiceImpl.java index a1bd0b4..c1c69ef 100644 --- a/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/impl/CartServiceImpl.java +++ b/spzx-service/service-cart/src/main/java/com/atguigu/cart/service/impl/CartServiceImpl.java @@ -180,4 +180,19 @@ public class CartServiceImpl implements CartService { } return new ArrayList<>(); } + + /** + * 清空提交过的购物车 + */ + @Override + public void deleteChecked() { + Long userId = BaseContext.getUserInfo().getId(); + String cartKey = RedisUtils.getCartKey(userId); + List objectList = redisTemplate.opsForHash().values(cartKey); // 删除选中的购物项数据 + if (!CollectionUtils.isEmpty(objectList)) { + objectList.stream().map(cartInfoJSON -> JSON.parseObject(cartInfoJSON.toString(), CartInfo.class)) + .filter(cartInfo -> cartInfo.getIsChecked() == 1) + .forEach(cartInfo -> redisTemplate.opsForHash().delete(cartKey, String.valueOf(cartInfo.getSkuId()))); + } + } } diff --git a/spzx-service/service-order/pom.xml b/spzx-service/service-order/pom.xml index 7bede01..5b08b5b 100644 --- a/spzx-service/service-order/pom.xml +++ b/spzx-service/service-order/pom.xml @@ -23,5 +23,15 @@ service-cart-client 1.0-SNAPSHOT + + com.atguigu + service-user-client + 1.0-SNAPSHOT + + + com.atguigu + service-product-client + 1.0-SNAPSHOT + diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/OrderApplication.java b/spzx-service/service-order/src/main/java/com/atguigu/order/OrderApplication.java index 128258f..a5e4776 100644 --- a/spzx-service/service-order/src/main/java/com/atguigu/order/OrderApplication.java +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/OrderApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication -@EnableFeignClients(basePackages = {"com.atguigu.feign.cart"}) +@EnableFeignClients(basePackages = {"com.atguigu.feign.cart", "com.atguigu.feign.user"}) @EnableUserTokenFeignInterceptor @Slf4j public class OrderApplication { diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/controller/OrderInfoController.java b/spzx-service/service-order/src/main/java/com/atguigu/order/controller/OrderInfoController.java index 7aecc68..ff3dfbd 100644 --- a/spzx-service/service-order/src/main/java/com/atguigu/order/controller/OrderInfoController.java +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/controller/OrderInfoController.java @@ -1,14 +1,14 @@ package com.atguigu.order.controller; import com.atguigu.order.service.OrderInfoService; +import com.atguigu.spzx.model.dto.h5.OrderInfoDto; import com.atguigu.spzx.model.vo.h5.TradeVo; import com.atguigu.spzx.model.vo.result.Result; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Tag(name = "订单管理") @RestController @@ -23,4 +23,11 @@ public class OrderInfoController { TradeVo tradeVo = orderInfoService.getTrade(); return Result.success(tradeVo); } + + @Operation(summary = "提交订单") + @PostMapping("auth/submitOrder") + public Result submitOrder(@Parameter(name = "orderInfoDto", description = "请求参数实体类", required = true) @RequestBody OrderInfoDto orderInfoDto) { + Long orderId = orderInfoService.submitOrder(orderInfoDto); + return Result.success(orderId); + } } \ No newline at end of file diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderInfoMapper.java b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderInfoMapper.java index a6c84e2..029b968 100644 --- a/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderInfoMapper.java +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderInfoMapper.java @@ -1,7 +1,14 @@ package com.atguigu.order.mapper; +import com.atguigu.spzx.model.entity.order.OrderInfo; import org.apache.ibatis.annotations.Mapper; @Mapper public interface OrderInfoMapper { + /** + * 添加数据到order_info中 + * + * @param orderInfo orderInfo + */ + void save(OrderInfo orderInfo); } diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderItemMapper.java b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderItemMapper.java new file mode 100644 index 0000000..7d50687 --- /dev/null +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderItemMapper.java @@ -0,0 +1,14 @@ +package com.atguigu.order.mapper; + +import com.atguigu.spzx.model.entity.order.OrderItem; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrderItemMapper { + /** + * 保存订单明细 + * + * @param orderItem orderItem + */ + void save(OrderItem orderItem); +} \ No newline at end of file diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderLogMapper.java b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderLogMapper.java new file mode 100644 index 0000000..bcbf751 --- /dev/null +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderLogMapper.java @@ -0,0 +1,14 @@ +package com.atguigu.order.mapper; + +import com.atguigu.spzx.model.entity.order.OrderLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrderLogMapper { + /** + * 记录日志 + * + * @param orderLog orderLog + */ + void save(OrderLog orderLog); +} \ No newline at end of file diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/service/OrderInfoService.java b/spzx-service/service-order/src/main/java/com/atguigu/order/service/OrderInfoService.java index de2eb3c..5b35018 100644 --- a/spzx-service/service-order/src/main/java/com/atguigu/order/service/OrderInfoService.java +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/service/OrderInfoService.java @@ -1,5 +1,6 @@ package com.atguigu.order.service; +import com.atguigu.spzx.model.dto.h5.OrderInfoDto; import com.atguigu.spzx.model.vo.h5.TradeVo; public interface OrderInfoService { @@ -9,4 +10,12 @@ public interface OrderInfoService { * @return 结算实体类 */ TradeVo getTrade(); + + /** + * 提交订单 + * + * @param orderInfoDto OrderInfoDto + * @return Long + */ + Long submitOrder(OrderInfoDto orderInfoDto); } diff --git a/spzx-service/service-order/src/main/java/com/atguigu/order/service/impl/OrderInfoServiceImpl.java b/spzx-service/service-order/src/main/java/com/atguigu/order/service/impl/OrderInfoServiceImpl.java index 8efb423..fbbf199 100644 --- a/spzx-service/service-order/src/main/java/com/atguigu/order/service/impl/OrderInfoServiceImpl.java +++ b/spzx-service/service-order/src/main/java/com/atguigu/order/service/impl/OrderInfoServiceImpl.java @@ -1,21 +1,55 @@ package com.atguigu.order.service.impl; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; +import com.atguigu.constant.MessageConstant; +import com.atguigu.context.BaseContext; +import com.atguigu.exception.BunnyException; +import com.atguigu.feign.cart.CartFeignClient; +import com.atguigu.feign.product.ProductFeignClient; +import com.atguigu.feign.user.UserFeignClient; +import com.atguigu.order.mapper.OrderInfoMapper; +import com.atguigu.order.mapper.OrderItemMapper; +import com.atguigu.order.mapper.OrderLogMapper; import com.atguigu.order.service.OrderInfoService; import com.atguigu.order.service.module.OrderInfoServiceModule; +import com.atguigu.spzx.model.dto.h5.OrderInfoDto; +import com.atguigu.spzx.model.entity.order.OrderInfo; import com.atguigu.spzx.model.entity.order.OrderItem; +import com.atguigu.spzx.model.entity.order.OrderLog; +import com.atguigu.spzx.model.entity.product.ProductSku; +import com.atguigu.spzx.model.entity.user.UserAddress; +import com.atguigu.spzx.model.entity.user.UserInfo; import com.atguigu.spzx.model.vo.h5.TradeVo; +import com.atguigu.spzx.model.vo.result.ResultCodeEnum; +import com.atguigu.utils.EmptyUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.List; @Service @Slf4j public class OrderInfoServiceImpl implements OrderInfoService { @Autowired private OrderInfoServiceModule orderInfoServiceModule; + @Autowired + private CartFeignClient cartFeignClient; + @Autowired + private ProductFeignClient productFeignClient; + @Autowired + private UserFeignClient userFeignClient; + @Autowired + private OrderInfoMapper orderInfoMapper; + @Autowired + private OrderItemMapper orderItemMapper; + @Autowired + private OrderLogMapper orderLogMapper; + @Autowired + private EmptyUtil emptyUtil; + /** * 确认下单 @@ -38,4 +72,81 @@ public class OrderInfoServiceImpl implements OrderInfoService { return tradeVo; } + + /** + * 提交订单 + * + * @param orderInfoDto OrderInfoDto + * @return Long + */ + @Override + public Long submitOrder(OrderInfoDto orderInfoDto) { + // 数据校验 + List orderItemList = orderInfoDto.getOrderItemList(); + if (CollectionUtils.isEmpty(orderItemList)) { + throw new BunnyException(ResultCodeEnum.DATA_ERROR); + } + // 检验商品库存是否充足，遍历list集合 + orderItemList.forEach(orderItem -> { + ProductSku productSku = productFeignClient.getBySkuId(orderItem.getSkuId()).getData(); + if (productSku == null) { + throw new BunnyException(MessageConstant.DATA_IS_EMPTY); + } + // 检验每个库存是否充足 + if (productSku.getStockNum() < orderItem.getSkuNum()) { + throw new BunnyException(MessageConstant.STOCK_LESS); + } + }); + + // 添加数据到order_info表 + // 构建订单数据，保存订单 + UserInfo userInfo = BaseContext.getUserInfo(); + OrderInfo orderInfo = new OrderInfo(); + // 订单编号 + orderInfo.setOrderNo(String.valueOf(System.currentTimeMillis())); + // 用户id + orderInfo.setUserId(userInfo.getId()); + // 用户昵称 + orderInfo.setNickName(userInfo.getNickName()); + // 用户收货地址信息 + UserAddress userAddress = userFeignClient.getUserAddress(orderInfoDto.getUserAddressId()).getData(); + orderInfo.setReceiverName(userAddress.getName()); + orderInfo.setReceiverPhone(userAddress.getPhone()); + orderInfo.setReceiverTagName(userAddress.getTagName()); + orderInfo.setReceiverProvince(userAddress.getProvinceCode()); + orderInfo.setReceiverCity(userAddress.getCityCode()); + orderInfo.setReceiverDistrict(userAddress.getDistrictCode()); + orderInfo.setReceiverAddress(userAddress.getFullAddress()); + // 订单金额 + BigDecimal totalAmount = new BigDecimal(0); + for (OrderItem orderItem : orderItemList) { + totalAmount = totalAmount.add(orderItem.getSkuPrice().multiply(new BigDecimal(orderItem.getSkuNum()))); + } + orderInfo.setTotalAmount(totalAmount); + orderInfo.setCouponAmount(new BigDecimal(0)); + orderInfo.setOriginalTotalAmount(totalAmount); + orderInfo.setFeightFee(orderInfoDto.getFeightFee()); + orderInfo.setPayType(2); + orderInfo.setOrderStatus(0); + // 添加数据到order_info中 + orderInfoMapper.save(orderInfo); + + // 保存订单明细 + for (OrderItem orderItem : orderItemList) { + orderItem.setOrderId(orderInfo.getId()); + orderItemMapper.save(orderItem); + } + + // 记录日志 + OrderLog orderLog = new OrderLog(); + orderLog.setOrderId(orderInfo.getId()); + orderLog.setProcessStatus(0); + orderLog.setNote("提交订单"); + orderLogMapper.save(orderLog); + + // 5、清空购物车数据 + cartFeignClient.deleteChecked(); + // 6、返回订单id + return orderInfo.getId(); + } } diff --git a/spzx-service/service-order/src/main/resources/mapper/OrderInfoMapper.xml b/spzx-service/service-order/src/main/resources/mapper/OrderInfoMapper.xml index 09c19f0..46f0625 100644 --- a/spzx-service/service-order/src/main/resources/mapper/OrderInfoMapper.xml +++ b/spzx-service/service-order/src/main/resources/mapper/OrderInfoMapper.xml @@ -1,5 +1,60 @@ + + + id,user_id,nick_name,order_no,coupon_id,total_amount,coupon_amount,original_total_amount,feight_fee,pay_type,order_status,receiver_name,receiver_phone,receiver_tag_name,receiver_province,receiver_city,receiver_district,receiver_address,payment_time,delivery_time,receive_time,remark,cancel_time,cancel_reason,create_time,update_time,is_deleted + + + + insert into order_info (id, + user_id, + nick_name, + order_no, + coupon_id, + total_amount, + coupon_amount, + original_total_amount, + feight_fee, + pay_type, + order_status, + receiver_name, + receiver_phone, + receiver_tag_name, + receiver_province, + receiver_city, + receiver_district, + receiver_address, + payment_time, + delivery_time, + receive_time, + remark, + cancel_time, + cancel_reason) + values (#{id}, + #{userId}, + #{nickName}, + #{orderNo}, + #{couponId}, + #{totalAmount}, + #{couponAmount}, + #{originalTotalAmount}, + #{feightFee}, + #{payType}, + #{orderStatus}, + #{receiverName}, + #{receiverPhone}, + #{receiverTagName}, + #{receiverProvince}, + #{receiverCity}, + #{receiverDistrict}, + #{receiverAddress}, + #{paymentTime}, + #{deliveryTime}, + #{receiveTime}, + #{remark}, + #{cancelTime}, + #{cancelReason}) + diff --git a/spzx-service/service-order/src/main/resources/mapper/OrderItemMapper.xml b/spzx-service/service-order/src/main/resources/mapper/OrderItemMapper.xml new file mode 100644 index 0000000..0cf73a0 --- /dev/null +++ b/spzx-service/service-order/src/main/resources/mapper/OrderItemMapper.xml @@ -0,0 +1,26 @@ + + + + + + id,order_id,sku_id,sku_name,thumb_img,sku_price,sku_num,create_time,update_time,is_deleted + + + + + insert into order_item (id, + order_id, + sku_id, + sku_name, + thumb_img, + sku_price, + sku_num) + values (#{id}, + #{orderId}, + #{skuId}, + #{skuName}, + #{thumbImg}, + #{skuPrice}, + #{skuNum}) + + diff --git a/spzx-service/service-order/src/main/resources/mapper/OrderLogMapper.xml b/spzx-service/service-order/src/main/resources/mapper/OrderLogMapper.xml new file mode 100644 index 0000000..6a8692a --- /dev/null +++ b/spzx-service/service-order/src/main/resources/mapper/OrderLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + id,order_id,operate_user,process_status,note,create_time,update_time,is_deleted + + + + + insert into order_log (id, + order_id, + operate_user, + process_status, + note) + values (#{id}, + #{orderId}, + #{operateUser}, + #{processStatus}, + #{note}) + + diff --git a/spzx-service/service-user/src/main/java/com/atguigu/user/controller/UserAddressController.java b/spzx-service/service-user/src/main/java/com/atguigu/user/controller/UserAddressController.java index 75a67b3..b24e073 100644 --- a/spzx-service/service-user/src/main/java/com/atguigu/user/controller/UserAddressController.java +++ b/spzx-service/service-user/src/main/java/com/atguigu/user/controller/UserAddressController.java @@ -31,7 +31,7 @@ public class UserAddressController { @Operation(summary = "获取地址信息") @GetMapping("getUserAddress/{id}") - public UserAddress getUserAddress(@PathVariable Long id) { - return userAddressService.getById(id); + public Result getUserAddress(@PathVariable Long id) { + return Result.success(userAddressService.getById(id)); } }