From 1bcfe58cfb2eea0f6e4469fe74b5a0ffa68cb6f3 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Sat, 18 May 2024 18:31:15 +0800 Subject: [PATCH] init --- .../xq/controller/GroupOrderController.java | 24 +++----- .../java/com/ruoyi/xq/domain/GroupOrder.java | 2 + .../admin/groupOrder/GroupOrderAdminVo.java | 11 ++++ .../com/ruoyi/xq/mapper/GroupOrderMapper.java | 5 ++ .../ruoyi/xq/service/GroupOrderService.java | 7 +++ .../impl/ActivityOrderServiceImpl.java | 3 + .../xq/service/impl/AuthOrderServiceImpl.java | 3 + .../service/impl/GroupOrderServiceImpl.java | 25 ++++++++ .../xq/service/impl/VipOrderServiceImpl.java | 7 +-- .../service/impl/WxTransOrderServiceImpl.java | 4 ++ .../resources/mapper/xq/GroupOrderMapper.xml | 57 +++++++++++-------- 11 files changed, 103 insertions(+), 45 deletions(-) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/groupOrder/GroupOrderAdminVo.java diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/GroupOrderController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/GroupOrderController.java index 2ab108e..e109618 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/GroupOrderController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/GroupOrderController.java @@ -13,6 +13,8 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.GroupOrder; +import com.ruoyi.xq.dto.admin.groupOrder.GroupOrderAdminVo; +import com.ruoyi.xq.dto.app.common.IdReq; import com.ruoyi.xq.service.GroupOrderService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -41,8 +43,8 @@ public class GroupOrderController extends BaseController { */ @SaCheckPermission("xq:groupOrder:list") @GetMapping("/list") - public TableDataInfo list(GroupOrder bo, PageQuery pageQuery) { - Page page = groupOrderService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(GroupOrderAdminVo bo, PageQuery pageQuery) { + Page page = groupOrderService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -58,26 +60,16 @@ public class GroupOrderController extends BaseController { return R.ok(groupOrderService.getById(id)); } - /** - * 新增入群订单 - */ - @SaCheckPermission("xq:groupOrder:add") - @Log(title = "入群订单", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody GroupOrder bo) { - return toAjax(groupOrderService.save(bo)); - } - /** * 修改入群订单 */ @SaCheckPermission("xq:groupOrder:edit") @Log(title = "入群订单", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody GroupOrder bo) { - return toAjax(groupOrderService.updateById(bo)); + @PostMapping("/dealStatus/commit") + public R edit(@RequestBody IdReq bo) { + groupOrderService.commitDealStatus(bo.getId()); + return R.ok(); } /** diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/GroupOrder.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/GroupOrder.java index ac819ef..4feda2e 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/GroupOrder.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/GroupOrder.java @@ -106,6 +106,8 @@ public class GroupOrder implements Serializable { */ private Long adminId; + private Integer dealStatus; + private LocalDateTime createTime; private LocalDateTime updateTime; diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/groupOrder/GroupOrderAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/groupOrder/GroupOrderAdminVo.java new file mode 100644 index 0000000..2006d9a --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/groupOrder/GroupOrderAdminVo.java @@ -0,0 +1,11 @@ +package com.ruoyi.xq.dto.admin.groupOrder; + +import com.ruoyi.xq.domain.GroupOrder; +import lombok.Data; + +@Data +public class GroupOrderAdminVo extends GroupOrder { + private String nickname; + private String mobile; + private String avatar; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/GroupOrderMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/GroupOrderMapper.java index 7192c46..048405a 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/GroupOrderMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/GroupOrderMapper.java @@ -1,7 +1,11 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.GroupOrder; +import com.ruoyi.xq.dto.admin.groupOrder.GroupOrderAdminVo; +import org.apache.ibatis.annotations.Param; /** * 入群订单Mapper接口 @@ -11,4 +15,5 @@ import com.ruoyi.xq.domain.GroupOrder; */ public interface GroupOrderMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") GroupOrderAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/GroupOrderService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/GroupOrderService.java index d71eab0..2510daf 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/GroupOrderService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/GroupOrderService.java @@ -1,7 +1,10 @@ package com.ruoyi.xq.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.GroupOrder; +import com.ruoyi.xq.dto.admin.groupOrder.GroupOrderAdminVo; import com.ruoyi.xq.dto.app.group.CreateGroupOrderReq; import com.ruoyi.xq.dto.app.pay.ConsumeResp; import com.ruoyi.xq.enums.pay.PlatformTypeEnum; @@ -23,4 +26,8 @@ public interface GroupOrderService extends IService { GroupOrder getByOrderNo(String orderNo); ConsumeResp doSuccess(String orderNo, Map params, String appId, PlatformTypeEnum payTypeEnum); + + Page pageAdmin(PageQuery pageQuery, GroupOrderAdminVo bo); + + void commitDealStatus(Long id); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityOrderServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityOrderServiceImpl.java index a91962b..bbe046b 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityOrderServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityOrderServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.xq.domain.ActivityOrder; import com.ruoyi.xq.domain.ActivityShop; +import com.ruoyi.xq.domain.GroupOrder; import com.ruoyi.xq.dto.admin.activity.ActivityOrderAdminVo; import com.ruoyi.xq.dto.app.activity.CreateOrderReq; import com.ruoyi.xq.dto.app.pay.ConsumeResp; @@ -30,6 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Map; /** @@ -107,6 +109,7 @@ public class ActivityOrderServiceImpl extends ServiceImpl .eq(AuthOrder::getPayStatus, PayStatusEnum.READY_PAY.getCode()) .set(AuthOrder::getPayStatus, PayStatusEnum.PAY.getCode()) .set(AuthOrder::getTraceId, traceId) + .set(AuthOrder::getPayTime, LocalDateTime.now()) .set(AuthOrder::getReturnContent, JSON.toJSONString(params)) .set(AuthOrder::getAppid,appId) .set(AuthOrder::getPlatformType, payTypeEnum.getCode())); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/GroupOrderServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/GroupOrderServiceImpl.java index 4a797ae..2a6925b 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/GroupOrderServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/GroupOrderServiceImpl.java @@ -2,11 +2,14 @@ package com.ruoyi.xq.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.xq.domain.ActivityOrder; import com.ruoyi.xq.domain.Group; import com.ruoyi.xq.domain.GroupOrder; +import com.ruoyi.xq.dto.admin.groupOrder.GroupOrderAdminVo; import com.ruoyi.xq.dto.app.group.CreateGroupOrderReq; import com.ruoyi.xq.dto.app.pay.ConsumeResp; import com.ruoyi.xq.dto.common.user.MinUser; @@ -24,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Map; /** @@ -100,6 +104,7 @@ public class GroupOrderServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, GroupOrderAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(),bo); + } + + @Override + public void commitDealStatus(Long id) { + GroupOrder groupOrder = this.getById(id); + if(groupOrder == null){ + throw new ServiceException("订单不存在"); + } + if(!PayStatusEnum.PAY.getCode().equals(groupOrder.getPayStatus())){ + throw new ServiceException("未支付无法处理"); + } + this.update(Wrappers.lambdaUpdate(GroupOrder.class) + .eq(GroupOrder::getId, id) + .eq(GroupOrder::getPayStatus, PayStatusEnum.PAY.getCode()) + .set(GroupOrder::getDealStatus, 1)); + } + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/VipOrderServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/VipOrderServiceImpl.java index 5f5c290..a9222b9 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/VipOrderServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/VipOrderServiceImpl.java @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.xq.domain.ConsumeLog; -import com.ruoyi.xq.domain.User; -import com.ruoyi.xq.domain.VipOrder; -import com.ruoyi.xq.domain.VipPrice; +import com.ruoyi.xq.domain.*; import com.ruoyi.xq.dto.admin.vipOrder.VipOrderAdminVo; import com.ruoyi.xq.dto.app.pay.ConsumeResp; import com.ruoyi.xq.enums.common.OrderTypeEnum; @@ -28,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Map; /** @@ -98,6 +96,7 @@ public class VipOrderServiceImpl extends ServiceImpl im .eq(VipOrder::getId, vipOrder.getId()) .eq(VipOrder::getPayStatus, PayStatusEnum.READY_PAY.getCode()) .set(VipOrder::getPayStatus, PayStatusEnum.PAY.getCode()) + .set(VipOrder::getPayTime, LocalDateTime.now()) .set(VipOrder::getTraceId, traceId) .set(VipOrder::getReturnContent, JSON.toJSONString(params)) .set(VipOrder::getAppid,appId) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransOrderServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransOrderServiceImpl.java index 9382de8..85cf07d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransOrderServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransOrderServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.xq.domain.AuthOrder; +import com.ruoyi.xq.domain.GroupOrder; import com.ruoyi.xq.domain.User; import com.ruoyi.xq.domain.WxTransOrder; import com.ruoyi.xq.dto.admin.account.WxTransOrderAdminVo; @@ -29,6 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Map; /** @@ -88,6 +91,7 @@ public class WxTransOrderServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - - - - - +