From 4bac7d10f97b8ca0386d98b55ecb0b97e2532e86 Mon Sep 17 00:00:00 2001 From: longbinbin <2284496322@qq.com> Date: Tue, 3 Dec 2024 14:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0"=E8=AE=A2=E5=8D=95"=E7=9A=84?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=9A=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=92=8C?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/pc/BrokerController.java | 12 +-- .../basic/controller/pc/OrderController.java | 40 +++++++ .../com/ycwl/basic/mapper/pc/OrderMapper.java | 10 +- .../pc/order/entity/OrderItemEntity.java | 30 ++++++ .../pc/order/req/OrderAddOrUpdateReq.java | 101 ++++++++++++++++++ .../model/pc/order/req/OrderItemDTO.java | 30 ++++++ .../model/pc/order/resp/OrderItemVO.java | 32 ++++++ .../model/pc/order/resp/OrderRespVO.java | 4 + .../service/impl/pc/AdminUserServiceImpl.java | 28 ++--- .../service/impl/pc/BrokerServiceImpl.java | 2 + .../service/impl/pc/DeviceServiceImpl.java | 16 +-- .../impl/pc/FaceSampleServiceImpl.java | 28 +++-- .../service/impl/pc/FaceServiceImpl.java | 24 +++-- .../service/impl/pc/MemberServiceImpl.java | 20 ++-- .../service/impl/pc/MenuServiceImpl.java | 16 +-- .../service/impl/pc/OrderServiceImpl.java | 85 +++++++++++++++ .../service/impl/pc/RoleServiceImpl.java | 18 ++-- .../ycwl/basic/service/pc/OrderService.java | 22 ++++ .../com/ycwl/basic/utils/ApiResponse.java | 4 +- .../com/ycwl/basic/utils/SnowFlakeUtil.java | 4 +- src/main/resources/mapper/pc/OrderMapper.xml | 52 +++++++-- 21 files changed, 488 insertions(+), 90 deletions(-) create mode 100644 src/main/java/com/ycwl/basic/controller/pc/OrderController.java create mode 100644 src/main/java/com/ycwl/basic/model/pc/order/entity/OrderItemEntity.java create mode 100644 src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java create mode 100644 src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java create mode 100644 src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java create mode 100644 src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java create mode 100644 src/main/java/com/ycwl/basic/service/pc/OrderService.java diff --git a/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java b/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java index 9e78d4c..110aed8 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java @@ -23,34 +23,34 @@ public class BrokerController { @ApiOperation("分页查询") @PostMapping("/page") public ApiResponse page(@RequestBody BrokerReqQuery brokerReqQuery){ - return ApiResponse.buildSuccessResponse(brokerService.pageQuery(brokerReqQuery)); + return ApiResponse.success(brokerService.pageQuery(brokerReqQuery)); } @ApiOperation("列表查询") @PostMapping("/list") public ApiResponse list(@RequestBody BrokerReqQuery brokerReqQuery){ - return ApiResponse.buildSuccessResponse(brokerService.list(brokerReqQuery)); + return ApiResponse.success(brokerService.list(brokerReqQuery)); } @ApiOperation("详情查询") @GetMapping("/getDetails/{id}") public ApiResponse getDetails(@PathVariable("id") Long id){ - return ApiResponse.buildSuccessResponse(brokerService.getById(id)); + return ApiResponse.success(brokerService.getById(id)); } @ApiOperation("新增或修改") @PostMapping("/addOrUpdate") public ApiResponse addOrUpdate(@RequestBody BrokerEntity broker){ - return ApiResponse.buildSuccessResponse(brokerService.addOrUpdate(broker)); + return ApiResponse.success(brokerService.addOrUpdate(broker)); } @ApiOperation("删除") @DeleteMapping("/delete/{id}") public ApiResponse delete(@PathVariable("id") Long id){ - return ApiResponse.buildSuccessResponse(brokerService.delete(id)); + return ApiResponse.success(brokerService.delete(id)); } @ApiOperation("修改状态") @PutMapping("/updateStatus/{id}") public ApiResponse updateStatus(@PathVariable("id") Long id){ - return ApiResponse.buildSuccessResponse(brokerService.updateStatus(id)); + return ApiResponse.success(brokerService.updateStatus(id)); } } diff --git a/src/main/java/com/ycwl/basic/controller/pc/OrderController.java b/src/main/java/com/ycwl/basic/controller/pc/OrderController.java new file mode 100644 index 0000000..dbb6ee0 --- /dev/null +++ b/src/main/java/com/ycwl/basic/controller/pc/OrderController.java @@ -0,0 +1,40 @@ +package com.ycwl.basic.controller.pc; + +import com.github.pagehelper.PageInfo; +import com.ycwl.basic.model.pc.order.req.OrderReqQuery; +import com.ycwl.basic.model.pc.order.resp.OrderRespVO; +import com.ycwl.basic.service.pc.OrderService; +import com.ycwl.basic.utils.ApiResponse; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/3 13:49 + */ +@RestController +@RequestMapping("/api/order/v1") +@Api(tags = "订单管理") +public class OrderController { + + @Autowired + private OrderService orderService; + + @PostMapping("page") + public ApiResponse> pageQuery(@RequestBody OrderReqQuery query) { + return orderService.pageQuery(query); + } + + @PostMapping("list") + public ApiResponse> list(@RequestBody OrderReqQuery query) { + return orderService.list(query); + } + @GetMapping("detail/{id}") + public ApiResponse detail(@PathVariable("id") Long orderId) { + return orderService.detail(orderId); + } + +} 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 dde0b17..e5b85c2 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java @@ -1,6 +1,8 @@ package com.ycwl.basic.mapper.pc; 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.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; import org.apache.ibatis.annotations.Mapper; @@ -15,9 +17,11 @@ import java.util.List; @Mapper public interface OrderMapper { List list(OrderReqQuery orderReqQuery); - OrderEntity getById(Long id); - int add(OrderEntity order); + OrderRespVO getById(Long id); + int add(OrderAddOrUpdateReq order); // int deleteById(Long id); - int update(OrderEntity order); + int update(OrderAddOrUpdateReq order); + + int addOrderItems(List orderItems); } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/entity/OrderItemEntity.java b/src/main/java/com/ycwl/basic/model/pc/order/entity/OrderItemEntity.java new file mode 100644 index 0000000..91ffb88 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/entity/OrderItemEntity.java @@ -0,0 +1,30 @@ +package com.ycwl.basic.model.pc.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Author：longbinbin + * @Date：2024/12/3 13:57 + * 订单购买的内容（订单明细） + */ +@Data +@TableName("order_item") +public class OrderItemEntity { + @TableId + private Long id; + /** + * 订单id + */ + private Long orderId; + /** + * 商品类型，0其他，1成片，2原片，3模板成片 + */ + private Integer goodsType; + /** + * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id + */ + private Long goodsId; + +} 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/OrderAddOrUpdateReq.java new file mode 100644 index 0000000..1f846c0 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java @@ -0,0 +1,101 @@ +package com.ycwl.basic.model.pc.order.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/3 14:17 + */ +@Data +@ApiModel("订单的新增或修改请求参数") +public class OrderAddOrUpdateReq { + private Long id; + @ApiModelProperty("用户id") + private Long memberId; + /** + * 微信openId + */ + @ApiModelProperty("微信openId") + private Long openId; + /** + * 价格 + */ + @ApiModelProperty("价格") + private BigDecimal price; + /** + * 实际支付价格 + */ + @ApiModelProperty("实际支付价格") + private BigDecimal payPrice; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String remark; + /** + * 推客id + */ + @ApiModelProperty("推客id") + private Long brokerId; + /** + * 推客优惠码 + */ + @ApiModelProperty("推客优惠码") + private String promoCode; + /** + * 退款原因 + */ + @ApiModelProperty("退款原因") + private String refundReason; + /** + * 退款状态，0未提出，1已通过，2待审核 + */ + @ApiModelProperty("退款状态，0未提出，1已通过，2待审核") + private Integer refundStatus; + /** + * 状态，0未支付，1已支付，2已退款，9已取消 + */ + @ApiModelProperty("状态，0未支付，1已支付，2已退款，9已取消") + private Integer status; + /** + * 订单创建时间 + */ + @ApiModelProperty("订单创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createAt; + /** + * 订单更新时间 + */ + @ApiModelProperty("订单更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateAt; + /** + * 订单支付时间 + */ + @ApiModelProperty("订单支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date payAt; + /** + * 订单取消时间 + */ + @ApiModelProperty("订单取消时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date cancelAt; + /** + * 订单退款时间 + */ + @ApiModelProperty("订单退款时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date refundAt; + @ApiModelProperty("订单明细") + private List orderItemList; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java new file mode 100644 index 0000000..157ad45 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java @@ -0,0 +1,30 @@ +package com.ycwl.basic.model.pc.order.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author：longbinbin + * @Date：2024/12/3 14:21 + */ +@Data +@ApiModel("订单明细") +public class OrderItemDTO { + private Long id; + /** + * 订单id + */ + @ApiModelProperty("订单id") + private Long orderId; + /** + * 商品类型，0其他，1成片，2原片，3模板成片 + */ + @ApiModelProperty("商品类型，0其他，1成片，2原片，3模板成片") + private Integer goodsType; + /** + * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id + */ + @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id") + private Long goodsId; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java new file mode 100644 index 0000000..2bf4103 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java @@ -0,0 +1,32 @@ +package com.ycwl.basic.model.pc.order.resp; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author：longbinbin + * @Date：2024/12/3 14:07 + */ +@Data +@ApiModel("订单购买的内容（订单明细）") +public class OrderItemVO { + + private Long id; + /** + * 订单id + */ + @ApiModelProperty("订单id") + private Long orderId; + /** + * 商品类型，0其他，1成片，2原片，3模板成片 + */ + @ApiModelProperty("商品类型，0其他，1成片，2原片，3模板成片") + private Integer goodsType; + /** + * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id + */ + @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id") + private Long goodsId; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java index 98b815b..5d1a15b 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java @@ -1,12 +1,14 @@ package com.ycwl.basic.model.pc.order.resp; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; 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 @@ -96,4 +98,6 @@ public class OrderRespVO { @ApiModelProperty("订单退款时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date refundAt; + @ApiModelProperty("订单明细") + private List orderItemList; } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java index 3d22230..3c8ec80 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java @@ -51,7 +51,7 @@ public class AdminUserServiceImpl implements AdminUserService { PageHelper.startPage(adminUserListReqVO.getPageNum(), adminUserListReqVO.getPageSize()); List list = adminUserMapper.list(adminUserListReqVO); PageInfo pageInfo = new PageInfo(list); - return ApiResponse.buildSuccessResponse(pageInfo); + return ApiResponse.success(pageInfo); } @Override @@ -64,32 +64,32 @@ public class AdminUserServiceImpl implements AdminUserService { // addOrUpdateAdminUserReqVO.setPassword(password); int add = adminUserMapper.add(addOrUpdateAdminUserReqVO); if (add > 0) { - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } } else { int update = adminUserMapper.update(addOrUpdateAdminUserReqVO); if (update > 0) { - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } @Override public ApiResponse delete(String id) { if (adminUserMapper.delete(id) > 0) { - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } @Override public ApiResponse resetPassword(ResetPasswordReqVO resetPasswordReqVO) { resetPasswordReqVO.setPassword(DigestUtil.md5Hex(resetPasswordReqVO.getPassword())); if (adminUserMapper.resetPassword(resetPasswordReqVO) > 0) { - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } @@ -100,10 +100,10 @@ public class AdminUserServiceImpl implements AdminUserService { String password = loginReqVO.getPassword(); LoginEntity login = adminUserMapper.login(account); if (login == null) { - return ApiResponse.buildCommonErrorResponse("账号不存在或密码错误"); + return ApiResponse.commonError("账号不存在或密码错误"); } if (!login.getPassword().equals(DigestUtil.md5Hex(password))) { - return ApiResponse.buildCommonErrorResponse("账号不存在或密码错误"); + return ApiResponse.commonError("账号不存在或密码错误"); } String roleId = login.getRoleId(); @@ -135,7 +135,7 @@ public class AdminUserServiceImpl implements AdminUserService { loginRespVO.setName(login.getStaffName()); loginRespVO.setTypeName(login.getTypeName()); loginRespVO.setMenuNodeList(MenuList); - return ApiResponse.buildSuccessResponse(loginRespVO); + return ApiResponse.success(loginRespVO); } @Override @@ -145,13 +145,13 @@ public class AdminUserServiceImpl implements AdminUserService { String passwordByAccount = adminUserMapper.getPasswordByAccount(updatePasswordReqVO.getId()); String pwd = DigestUtil.md5Hex(updatePasswordReqVO.getPwd()); if (!passwordByAccount.equals(pwd)) { - return ApiResponse.buildCommonErrorResponse("密码错误！修改失败"); + return ApiResponse.commonError("密码错误！修改失败"); } String newPwd = DigestUtil.md5Hex(updatePasswordReqVO.getNewPwd()); updatePasswordReqVO.setNewPwd(newPwd); if (adminUserMapper.updatePassword(updatePasswordReqVO) > 0) { - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java index 6c1a4f1..64208c0 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java @@ -7,6 +7,7 @@ import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO; import com.ycwl.basic.service.pc.BrokerService; +import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,6 +45,7 @@ public class BrokerServiceImpl implements BrokerService { public int addOrUpdate(BrokerEntity broker) { Long id = broker.getId(); if(id==null){ + broker.setId(SnowFlakeUtil.getLongId()); return brokerMapper.add(broker); }else { return brokerMapper.update(broker); diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java index 60c87e8..2f61601 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java @@ -8,6 +8,7 @@ import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; import com.ycwl.basic.service.pc.DeviceService; import com.ycwl.basic.utils.ApiResponse; +import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,36 +27,37 @@ public class DeviceServiceImpl implements DeviceService { PageHelper.startPage(deviceReqQuery.getPageNum(), deviceReqQuery.getPageSize()); List list = deviceMapper.list(deviceReqQuery); PageInfo pageInfo = new PageInfo<>(list); - return ApiResponse.buildSuccessResponse(pageInfo); + return ApiResponse.success(pageInfo); } @Override public ApiResponse> list(DeviceReqQuery deviceReqQuery) { - return ApiResponse.buildSuccessResponse(deviceMapper.list(deviceReqQuery)); + return ApiResponse.success(deviceMapper.list(deviceReqQuery)); } @Override public ApiResponse getById(Long id) { - return ApiResponse.buildSuccessResponse(deviceMapper.getById(id)); + return ApiResponse.success(deviceMapper.getById(id)); } @Override public ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery) { Long id = deviceReqQuery.getId(); if (id == null) { - return ApiResponse.buildSuccessResponse(deviceMapper.add(deviceReqQuery)); + deviceReqQuery.setId(SnowFlakeUtil.getLongId()); + return ApiResponse.success(deviceMapper.add(deviceReqQuery)); } else { - return ApiResponse.buildSuccessResponse(deviceMapper.update(deviceReqQuery)); + return ApiResponse.success(deviceMapper.update(deviceReqQuery)); } } @Override public ApiResponse deleteById(Long id) { - return ApiResponse.buildSuccessResponse(deviceMapper.deleteById(id)); + return ApiResponse.success(deviceMapper.deleteById(id)); } @Override public ApiResponse updateStatus(Long id) { - return ApiResponse.buildSuccessResponse(deviceMapper.updateStatus(id)); + return ApiResponse.success(deviceMapper.updateStatus(id)); } } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java index 8e35f70..e86532c 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java @@ -3,15 +3,12 @@ package com.ycwl.basic.service.impl.pc; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ycwl.basic.mapper.pc.FaceSampleMapper; -import com.ycwl.basic.model.pc.face.entity.FaceEntity; -import com.ycwl.basic.model.pc.face.req.FaceReqQuery; -import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.service.pc.FaceSampleService; -import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; +import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,52 +28,53 @@ public class FaceSampleServiceImpl implements FaceSampleService { PageHelper.startPage(faceSampleReqQuery.getPageNum(),faceSampleReqQuery.getPageSize()); List list = faceSampleMapper.list(faceSampleReqQuery); PageInfo pageInfo = new PageInfo<>(list); - return ApiResponse.buildSuccessResponse(pageInfo); + return ApiResponse.success(pageInfo); } @Override public ApiResponse> list(FaceSampleReqQuery faceSampleReqQuery) { - return ApiResponse.buildSuccessResponse(faceSampleMapper.list(faceSampleReqQuery)); + return ApiResponse.success(faceSampleMapper.list(faceSampleReqQuery)); } @Override public ApiResponse getById(Long id) { - return ApiResponse.buildSuccessResponse(faceSampleMapper.getById(id)); + return ApiResponse.success(faceSampleMapper.getById(id)); } @Override public ApiResponse add(FaceSampleEntity faceSample) { + faceSample.setId(SnowFlakeUtil.getLongId()); int i = faceSampleMapper.add(faceSample); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("添加失败"); + return ApiResponse.commonError("添加失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse deleteById(Long id) { int i = faceSampleMapper.deleteById(id); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("删除失败"); + return ApiResponse.commonError("删除失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse deleteByIds(List ids) { int i = faceSampleMapper.deleteByIds(ids); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("删除失败"); + return ApiResponse.commonError("删除失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse update(FaceSampleEntity faceSample) { int i = faceSampleMapper.update(faceSample); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("修改失败"); + return ApiResponse.commonError("修改失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java index 53b777d..b6e9257 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java @@ -8,6 +8,7 @@ import com.ycwl.basic.model.pc.face.req.FaceReqQuery; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; +import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,52 +28,53 @@ public class FaceServiceImpl implements FaceService { PageHelper.startPage(faceReqQuery.getPageNum(),faceReqQuery.getPageSize()); List list = faceMapper.list(faceReqQuery); PageInfo pageInfo = new PageInfo<>(list); - return ApiResponse.buildSuccessResponse(pageInfo); + return ApiResponse.success(pageInfo); } @Override public ApiResponse> list(FaceReqQuery faceReqQuery) { - return ApiResponse.buildSuccessResponse(faceMapper.list(faceReqQuery)); + return ApiResponse.success(faceMapper.list(faceReqQuery)); } @Override public ApiResponse getById(Long id) { - return ApiResponse.buildSuccessResponse(faceMapper.getById(id)); + return ApiResponse.success(faceMapper.getById(id)); } @Override public ApiResponse add(FaceEntity face) { + face.setId(SnowFlakeUtil.getLongId()); int i = faceMapper.add(face); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("添加失败"); + return ApiResponse.commonError("添加失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse deleteById(Long id) { int i = faceMapper.deleteById(id); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("删除失败"); + return ApiResponse.commonError("删除失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse deleteByIds(List ids) { int i = faceMapper.deleteByIds(ids); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("删除失败"); + return ApiResponse.commonError("删除失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse update(FaceEntity face) { int i = faceMapper.update(face); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("修改失败"); + return ApiResponse.commonError("修改失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java index ab2b5db..8565e8f 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java @@ -8,6 +8,7 @@ import com.ycwl.basic.model.pc.member.req.MemberReqQuery; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.service.pc.MemberService; import com.ycwl.basic.utils.ApiResponse; +import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,44 +28,45 @@ public class MemberServiceImpl implements MemberService { PageHelper.startPage(memberReqQuery.getPageNum(), memberReqQuery.getPageSize()); List list = memberMapper.list(memberReqQuery); PageInfo pageInfo = new PageInfo<>(list); - return ApiResponse.buildSuccessResponse(pageInfo); + return ApiResponse.success(pageInfo); } @Override public ApiResponse> list(MemberReqQuery memberReqQuery) { - return ApiResponse.buildSuccessResponse(memberMapper.list(memberReqQuery)); + return ApiResponse.success(memberMapper.list(memberReqQuery)); } @Override public ApiResponse getById(Long id) { - return ApiResponse.buildSuccessResponse(memberMapper.getById(id)); + return ApiResponse.success(memberMapper.getById(id)); } @Override public ApiResponse add(MemberEntity member) { + member.setId(SnowFlakeUtil.getLongId()); int i = memberMapper.add(member); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("添加失败"); + return ApiResponse.commonError("添加失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse deleteById(Long id) { int i = memberMapper.deleteById(id); if (i == 0) { - return ApiResponse.buildCommonErrorResponse("删除失败"); + return ApiResponse.commonError("删除失败"); } - return ApiResponse.buildSuccessResponse(i); + return ApiResponse.success(i); } @Override public ApiResponse update(MemberEntity member) { int update = memberMapper.update(member); if (update == 0) { - return ApiResponse.buildCommonErrorResponse("更新失败"); + return ApiResponse.commonError("更新失败"); } - return ApiResponse.buildSuccessResponse(update); + return ApiResponse.success(update); } } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java index f378803..fe4fe8c 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java @@ -5,6 +5,7 @@ import com.ycwl.basic.model.pc.menu.MenuNode; import com.ycwl.basic.model.pc.menu.entity.MenuEntity; import com.ycwl.basic.service.pc.MenuService; import com.ycwl.basic.utils.ApiResponse; +import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; @@ -40,16 +41,17 @@ public class MenuServiceImpl implements MenuService { } } } - return ApiResponse.buildSuccessResponse(MenuList); + return ApiResponse.success(MenuList); } @Override public ApiResponse add(MenuEntity menu) { + menu.setId(SnowFlakeUtil.getId()); int add = menuMapper.add(menu); if(add>0){ - return ApiResponse.buildSuccessResponse(add); + return ApiResponse.success(add); }else { - return ApiResponse.buildCommonErrorResponse("添加失败"); + return ApiResponse.commonError("添加失败"); } } @@ -57,9 +59,9 @@ public class MenuServiceImpl implements MenuService { public ApiResponse update(MenuEntity menu) { int update = menuMapper.update(menu); if(update>0){ - return ApiResponse.buildSuccessResponse(update); + return ApiResponse.success(update); }else { - return ApiResponse.buildCommonErrorResponse("更新失败"); + return ApiResponse.commonError("更新失败"); } } @@ -67,9 +69,9 @@ public class MenuServiceImpl implements MenuService { public ApiResponse deleteById(Long id) { int deleteById = menuMapper.deleteById(id); if(deleteById>0){ - return ApiResponse.buildSuccessResponse(deleteById); + return ApiResponse.success(deleteById); }else { - return ApiResponse.buildCommonErrorResponse("删除失败"); + return ApiResponse.commonError("删除失败"); } } } 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 new file mode 100644 index 0000000..7e18b51 --- /dev/null +++ b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java @@ -0,0 +1,85 @@ +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.mapper.pc.OrderMapper; +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.OrderReqQuery; +import com.ycwl.basic.model.pc.order.resp.OrderRespVO; +import com.ycwl.basic.service.pc.OrderService; +import com.ycwl.basic.utils.ApiResponse; +import com.ycwl.basic.utils.SnowFlakeUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/3 13:54 + */ +@Slf4j +@Service +public class OrderServiceImpl implements OrderService { + + @Autowired + private OrderMapper orderMapper; + + @Override + public ApiResponse> pageQuery(OrderReqQuery query) { + PageHelper.startPage(query.getPageNum(), query.getPageSize()); + List list = orderMapper.list(query); + PageInfo pageInfo = new PageInfo<>(list); + return ApiResponse.success(pageInfo); + } + + @Override + public ApiResponse> list(OrderReqQuery query) { + return ApiResponse.success(orderMapper.list(query)); + } + + @Override + public ApiResponse detail(Long orderId) { + return ApiResponse.success(orderMapper.getById(orderId)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public ApiResponse add(OrderAddOrUpdateReq order) { + Long orderId = SnowFlakeUtil.getLongId(); + order.setId(orderId); + int add = orderMapper.add(order); + if (add == 0) { + return ApiResponse.commonError("订单添加失败"); + }else { + List orderItemList = order.getOrderItemList(); + List orderItems = new ArrayList<>(); + orderItemList.forEach(orderItemDTO -> { + OrderItemEntity orderItemEntity = new OrderItemEntity(); + BeanUtil.copyProperties(orderItemDTO, orderItemEntity); + orderItemEntity.setOrderId(orderId); + }); + int addOrderItems = orderMapper.addOrderItems(orderItems); + if (addOrderItems == 0) { + log.error("订单明细添加失败"); + return ApiResponse.commonError("订单添加失败"); + } + return ApiResponse.success(add); + } + } + + @Override + public ApiResponse update(OrderAddOrUpdateReq query) { + int update = orderMapper.update(query); + if (update == 0) { + return ApiResponse.commonError("订单更新失败"); + } + return ApiResponse.success(update); + } +} diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java index eaeb5f4..2072555 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java @@ -42,7 +42,7 @@ public class RoleServiceImpl implements RoleService { // } List list = roleMapper.list(roleListReqVO); PageInfo pageInfo = new PageInfo(list); - return ApiResponse.buildSuccessResponse(pageInfo); + return ApiResponse.success(pageInfo); } @Override @@ -55,7 +55,7 @@ public class RoleServiceImpl implements RoleService { if(addOrUpdateRoleReqVO.getMenuIdList()!=null&addOrUpdateRoleReqVO.getMenuIdList().size()>0) { menuMapper.addRoleMenu(roleId, addOrUpdateRoleReqVO.getMenuIdList()); } - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } }else { if(roleMapper.update(addOrUpdateRoleReqVO)>0){ @@ -63,19 +63,19 @@ public class RoleServiceImpl implements RoleService { if(addOrUpdateRoleReqVO.getMenuIdList()!=null&addOrUpdateRoleReqVO.getMenuIdList().size()>0){ menuMapper.addRoleMenu(addOrUpdateRoleReqVO.getId(),addOrUpdateRoleReqVO.getMenuIdList()); } - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } @Override public ApiResponse delete(String id) { if(roleMapper.delete(id)>0){ menuMapper.deleteRoleMenuByRoleId(id); - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } @Override @@ -95,16 +95,16 @@ public class RoleServiceImpl implements RoleService { } } } - return ApiResponse.buildSuccessResponse(MenuList); + return ApiResponse.success(MenuList); } @Override public ApiResponse updateStatus(String id) { if(roleMapper.updateStatus(id)>0){ redisTemplate.opsForValue().set(ROLE_STATUS+id,roleMapper.getRoleStatus(id)); - return ApiResponse.buildSuccessResponse(null); + return ApiResponse.success(null); } - return ApiResponse.buildCommonErrorResponse("失败"); + return ApiResponse.commonError("失败"); } } diff --git a/src/main/java/com/ycwl/basic/service/pc/OrderService.java b/src/main/java/com/ycwl/basic/service/pc/OrderService.java new file mode 100644 index 0000000..782eecf --- /dev/null +++ b/src/main/java/com/ycwl/basic/service/pc/OrderService.java @@ -0,0 +1,22 @@ +package com.ycwl.basic.service.pc; + +import com.github.pagehelper.PageInfo; +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.OrderReqQuery; +import com.ycwl.basic.model.pc.order.resp.OrderRespVO; +import com.ycwl.basic.utils.ApiResponse; + +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/3 13:51 + */ +public interface OrderService { + ApiResponse> pageQuery(OrderReqQuery query); + ApiResponse> list(OrderReqQuery query); + ApiResponse detail(Long orderId); + ApiResponse add(OrderAddOrUpdateReq query); + ApiResponse update(OrderAddOrUpdateReq query); +} diff --git a/src/main/java/com/ycwl/basic/utils/ApiResponse.java b/src/main/java/com/ycwl/basic/utils/ApiResponse.java index c729fdf..d0250ec 100644 --- a/src/main/java/com/ycwl/basic/utils/ApiResponse.java +++ b/src/main/java/com/ycwl/basic/utils/ApiResponse.java @@ -47,7 +47,7 @@ public class ApiResponse implements Serializable { * @param data 返回数据内容 * @return */ - public static ApiResponse buildSuccessResponse(T data) { + public static ApiResponse success(T data) { ApiResponse response = new ApiResponse(); response.setCode(ApiConst.Code.CODE_SUCCESS.code()); response.setData(data); @@ -71,7 +71,7 @@ public class ApiResponse implements Serializable { * @param msg * @return */ - public static ApiResponse buildCommonErrorResponse(String msg) { + public static ApiResponse commonError(String msg) { return buildResponse(ApiConst.Code.CODE_COMMON_ERROR, msg); } diff --git a/src/main/java/com/ycwl/basic/utils/SnowFlakeUtil.java b/src/main/java/com/ycwl/basic/utils/SnowFlakeUtil.java index 7fc4d6f..89cc9c5 100644 --- a/src/main/java/com/ycwl/basic/utils/SnowFlakeUtil.java +++ b/src/main/java/com/ycwl/basic/utils/SnowFlakeUtil.java @@ -69,7 +69,9 @@ public class SnowFlakeUtil { | (machineId<< UniqueIdMetaData.MACHINE_SHIFT_BITS) | sequence); } - + public static Long getLongId(){ + return Long.valueOf(getId()); + } diff --git a/src/main/resources/mapper/pc/OrderMapper.xml b/src/main/resources/mapper/pc/OrderMapper.xml index 46ac8e5..47aa3f0 100644 --- a/src/main/resources/mapper/pc/OrderMapper.xml +++ b/src/main/resources/mapper/pc/OrderMapper.xml @@ -1,10 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + insert into `order`(id, member_id, openid,price, pay_price, remark, broker_id, promo_code) VALUES (#{id}, #{memberId}, #{openid},#{price}, #{payPrice}, #{remark}, #{brokerId}, #{promoCode}) + + insert into order_item(id, order_id, goods_type, goods_id) VALUES + + (#{item.id}, #{item.orderId}, #{item.goodsType}, #{item.goodsId}) + + update `order` @@ -41,11 +73,15 @@ delete from `order` where id = #{id} - + select o.id, o.member_id,m.nickname ,m.real_name , o.openid, price, pay_price, remark, o.broker_id, o.promo_code, + refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at from `order` o left join member m on o.member_id = m.id + left join order_item oi on o.id = oi.order_id + left join template t on oi.goods_type='3' and oi.goods_id = t.id + left join source sr on oi.goods_type='2' and oi.goods_id = sr.id + left join video vd on oi.goods_type='1' and oi.goods_id = vd.id and o.id = #{id} @@ -78,7 +114,7 @@ and refund_status = #{refundStatus} - and `status` = #{status} + and o.`status` = #{status} and o.create_at >= #{startCreateTime} @@ -107,12 +143,16 @@ order by o.create_at desc - select o.id, o.member_id, o.openid, o.price, o.pay_price, o.remark, o.broker_id, o.promo_code, o.refund_reason, o.refund_status, o.status, o.create_at, o.update_at, o.pay_at, o.cancel_at, o.refund_at, - m.nickname memberNickname, m.real_name memberRealName + m.nickname , m.real_name from `order` o left join member m on m.id = o.member_id + left join order_item oi on o.id = oi.order_id + left join template t on oi.goods_type='3' and oi.goods_id = t.id + left join source sr on oi.goods_type='2' and oi.goods_id = sr.id + left join video vd on oi.goods_type='1' and oi.goods_id = vd.id where o.id = #{id} \ No newline at end of file