From 18f7f8a9432ac5082952de471811989743ecbd09 Mon Sep 17 00:00:00 2001 From: longbinbin <2284496322@qq.com> Date: Wed, 11 Dec 2024 14:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mobile/AppOrderController.java | 6 +- .../com/ycwl/basic/mapper/pc/OrderMapper.java | 7 ++- .../basic/model/pc/order/req/OrderAddReq.java | 61 +++++++++++++++++++ ...ddOrUpdateReq.java => OrderUpdateReq.java} | 13 ++-- .../service/impl/pc/OrderServiceImpl.java | 33 +++++----- .../ycwl/basic/service/pc/OrderService.java | 7 ++- .../com/ycwl/basic/utils/JwtAnalysisUtil.java | 3 +- src/main/resources/mapper/pc/ScenicMapper.xml | 7 ++- 8 files changed, 98 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java rename src/main/java/com/ycwl/basic/model/pc/order/req/{OrderAddOrUpdateReq.java => OrderUpdateReq.java} (89%) diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java index 28fea4c..cfd6e36 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java @@ -1,12 +1,10 @@ package com.ycwl.basic.controller.mobile; import com.github.pagehelper.PageInfo; -import com.ycwl.basic.annotation.IgnoreToken; import com.ycwl.basic.constant.BaseContextHandler; import com.ycwl.basic.model.mobile.order.OrderAppPageReq; import com.ycwl.basic.model.mobile.order.RefundOrderReq; -import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq; -import com.ycwl.basic.model.pc.order.req.OrderReqQuery; +import com.ycwl.basic.model.pc.order.req.OrderAddReq; import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO; import com.ycwl.basic.model.wx.WxPayRespVO; import com.ycwl.basic.service.pc.OrderService; @@ -44,7 +42,7 @@ public class AppOrderController { @ApiOperation("用户端订单新增") @PostMapping("/addOrder") - public ApiResponse addOrder(@RequestBody OrderAddOrUpdateReq orderAddReq) throws Exception { + public ApiResponse addOrder(@RequestBody OrderAddReq orderAddReq) throws Exception { return orderService.add(orderAddReq); } diff --git a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java index ae0607a..071a798 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java @@ -2,7 +2,8 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.mobile.order.OrderAppPageReq; import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; -import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq; +import com.ycwl.basic.model.pc.order.req.OrderUpdateReq; +import com.ycwl.basic.model.pc.order.req.OrderAddReq; import com.ycwl.basic.model.pc.order.req.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; @@ -19,9 +20,9 @@ import java.util.List; public interface OrderMapper { List list(OrderReqQuery orderReqQuery); OrderRespVO getById(Long id); - int add(OrderAddOrUpdateReq order); + int add(OrderAddReq order); // int deleteById(Long id); - int update(OrderAddOrUpdateReq order); + int update(OrderUpdateReq order); /** * 添加订单明细 diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java new file mode 100644 index 0000000..dd03f05 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java @@ -0,0 +1,61 @@ +package com.ycwl.basic.model.pc.order.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/3 14:17 + */ +@Data +@ApiModel("订单的新增或修改请求参数") +public class OrderAddReq { + @ApiModelProperty(value = "订单id",hidden = true) + private Long id; + @ApiModelProperty(value = "用户id",hidden = true) + private Long memberId; + /** + * 微信openId + */ + @ApiModelProperty(value = "微信openId", hidden = true) + private Long openId; + + @ApiModelProperty("景区id") + private Long scenicId; + /** + * 价格 + */ + @ApiModelProperty(value = "价格", hidden = true) + private BigDecimal price; + /** + * 实际支付价格 + */ + @ApiModelProperty(value = "实际支付价格",hidden = true) + private BigDecimal payPrice; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String remark; +// /** +// * 推客id +// */ +// @ApiModelProperty("推客id") +// private Long brokerId; +// /** +// * 推客优惠码 +// */ +// @ApiModelProperty("推客优惠码") +// private String promoCode; + @ApiModelProperty("订单商品类型 1成片，2源素材") + private Integer goodsType; + @ApiModelProperty("订单商品明细") + private List goodsItemList; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java similarity index 89% rename from src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java rename to src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java index f084cab..f8234a2 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.order.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; -import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; -import com.ycwl.basic.model.pc.order.resp.OrderItemVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,26 +16,27 @@ import java.util.List; */ @Data @ApiModel("订单的新增或修改请求参数") -public class OrderAddOrUpdateReq { +public class OrderUpdateReq { + @ApiModelProperty(value = "订单id",hidden = true) private Long id; - @ApiModelProperty("用户id") + @ApiModelProperty(value = "用户id",hidden = true) private Long memberId; /** * 微信openId */ - @ApiModelProperty("微信openId") + @ApiModelProperty(value = "微信openId", hidden = true) private Long openId; @ApiModelProperty("景区id") private Long scenicId; /** * 价格 */ - @ApiModelProperty("价格") + @ApiModelProperty(value = "价格", hidden = true) private BigDecimal price; /** * 实际支付价格 */ - @ApiModelProperty("实际支付价格") + @ApiModelProperty(value = "实际支付价格",hidden = true) private BigDecimal payPrice; /** * 备注 diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java index 4cb9d21..c9f6c72 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java @@ -1,6 +1,5 @@ package com.ycwl.basic.service.impl.pc; -import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ycwl.basic.constant.BaseContextHandler; @@ -21,17 +20,15 @@ import com.ycwl.basic.model.mobile.order.RefundOrderReq; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.order.entity.OrderEntity; import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; -import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq; -import com.ycwl.basic.model.pc.order.req.OrderItemDTO; +import com.ycwl.basic.model.pc.order.req.OrderUpdateReq; +import com.ycwl.basic.model.pc.order.req.OrderAddReq; import com.ycwl.basic.model.pc.order.req.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO; import com.ycwl.basic.model.pc.order.resp.OrderItemVO; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; import com.ycwl.basic.model.pc.orderOp.entity.OrderOperationEntity; import com.ycwl.basic.model.pc.source.entity.SourceEntity; -import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.video.entity.VideoEntity; -import com.ycwl.basic.model.pc.video.resp.VideoRespVO; import com.ycwl.basic.model.wx.WXPayOrderReqVO; import com.ycwl.basic.model.wx.WxPayRespVO; import com.ycwl.basic.service.mobile.AppMemberService; @@ -96,7 +93,7 @@ public class OrderServiceImpl implements OrderService { @Override @Transactional(rollbackFor = Exception.class) - public ApiResponse add(OrderAddOrUpdateReq order) throws Exception { + public ApiResponse add(OrderAddReq order) throws Exception { Long orderId = SnowFlakeUtil.getLongId(); order.setId(orderId); int add = orderMapper.add(order); @@ -179,7 +176,7 @@ public class OrderServiceImpl implements OrderService { } @Override - public ApiResponse update(OrderAddOrUpdateReq query) { + public ApiResponse update(OrderUpdateReq query) { int update = orderMapper.update(query); if (update == NumberConstant.ZERO) { return ApiResponse.fail("订单更新失败"); @@ -194,22 +191,22 @@ public class OrderServiceImpl implements OrderService { */ @Override public void updateOrderState(Long orderSn, OrderStateEnum orderStateEnum, String reason) { - OrderAddOrUpdateReq orderAddOrUpdateReq = new OrderAddOrUpdateReq(); - orderAddOrUpdateReq.setId(orderSn); + OrderUpdateReq orderUpdateReq = new OrderUpdateReq(); + orderUpdateReq.setId(orderSn); if (orderStateEnum.getType() == NumberConstant.ONE) { - orderAddOrUpdateReq.setRefundStatus(orderStateEnum.getState()); - orderAddOrUpdateReq.setRefundAt(new Date()); + orderUpdateReq.setRefundStatus(orderStateEnum.getState()); + orderUpdateReq.setRefundAt(new Date()); if (orderStateEnum.getState() == OrderStateEnum.PASSED.getState()) { - orderAddOrUpdateReq.setRemark(reason); + orderUpdateReq.setRemark(reason); } else if (Objects.nonNull(reason)) { - orderAddOrUpdateReq.setRefundReason(reason); + orderUpdateReq.setRefundReason(reason); } } else if (orderStateEnum.getType() == NumberConstant.TWO) { int state = orderStateEnum.getState(); - orderAddOrUpdateReq.setPayAt(new Date()); - orderAddOrUpdateReq.setStatus(orderStateEnum.getState()); + orderUpdateReq.setPayAt(new Date()); + orderUpdateReq.setStatus(orderStateEnum.getState()); if (state == OrderStateEnum.CANCELED.getState()) { - orderAddOrUpdateReq.setCancelAt(new Date()); + orderUpdateReq.setCancelAt(new Date()); } //如果订单未支付就把商品状态更改成未购买 if (state != OrderStateEnum.PAID.getState()) { @@ -250,7 +247,7 @@ public class OrderServiceImpl implements OrderService { }); } } - orderMapper.update(orderAddOrUpdateReq); + orderMapper.update(orderUpdateReq); } @Override @@ -312,7 +309,7 @@ public class OrderServiceImpl implements OrderService { @Override public void remarkOrder(Long orderId, OrderEntity query) { - OrderAddOrUpdateReq updateOrder = new OrderAddOrUpdateReq(); + OrderUpdateReq updateOrder = new OrderUpdateReq(); updateOrder.setId(orderId); updateOrder.setRemark(query.getRemark()); orderMapper.update(updateOrder); diff --git a/src/main/java/com/ycwl/basic/service/pc/OrderService.java b/src/main/java/com/ycwl/basic/service/pc/OrderService.java index d3a8ef8..d6136b2 100644 --- a/src/main/java/com/ycwl/basic/service/pc/OrderService.java +++ b/src/main/java/com/ycwl/basic/service/pc/OrderService.java @@ -5,7 +5,8 @@ import com.ycwl.basic.enums.OrderStateEnum; import com.ycwl.basic.model.mobile.order.OrderAppPageReq; import com.ycwl.basic.model.mobile.order.RefundOrderReq; import com.ycwl.basic.model.pc.order.entity.OrderEntity; -import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq; +import com.ycwl.basic.model.pc.order.req.OrderUpdateReq; +import com.ycwl.basic.model.pc.order.req.OrderAddReq; import com.ycwl.basic.model.pc.order.req.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; @@ -25,9 +26,9 @@ public interface OrderService { ApiResponse detail(Long orderId); - ApiResponse add(OrderAddOrUpdateReq query) throws Exception; + ApiResponse add(OrderAddReq query) throws Exception; - ApiResponse update(OrderAddOrUpdateReq query); + ApiResponse update(OrderUpdateReq query); void updateOrderState(Long orderSn, OrderStateEnum orderStateEnum, String refundReason); diff --git a/src/main/java/com/ycwl/basic/utils/JwtAnalysisUtil.java b/src/main/java/com/ycwl/basic/utils/JwtAnalysisUtil.java index 64dcbe6..26685bb 100644 --- a/src/main/java/com/ycwl/basic/utils/JwtAnalysisUtil.java +++ b/src/main/java/com/ycwl/basic/utils/JwtAnalysisUtil.java @@ -74,7 +74,8 @@ public class JwtAnalysisUtil { } Long userId = null; if (body.get("userId")!=null) { - userId= (Long) body.get("userId"); + String strUserId = StringUtil.a(body.get("userId")); + userId= Long.parseLong(strUserId); } return new JwtInfo(StringUtil.a(body.get("name")), userId, diff --git a/src/main/resources/mapper/pc/ScenicMapper.xml b/src/main/resources/mapper/pc/ScenicMapper.xml index 1301c11..a3580d3 100644 --- a/src/main/resources/mapper/pc/ScenicMapper.xml +++ b/src/main/resources/mapper/pc/ScenicMapper.xml @@ -83,7 +83,7 @@ select s.id, `name`, `phone`, introduction, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time, c.start_time, c.end_time, (select scenic_account.account from scenic_account where scenic_account.scenic_id = s.id and scenic_account.is_super = 1 limit 1) as account, - c.is_default, c.create_time + c.is_default, c.create_time createTime2,s.price from scenic s left join scenic_config c on s.id = c.id @@ -112,7 +112,7 @@