ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java @@ -1,4 +1,4 @@ package com.ruoyi.order.domain.pojo; package com.ruoyi.system.api.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/MemberAuctionSalesroomDTO.java @@ -1,4 +1,4 @@ package com.ruoyi.auction.controller.forepart.dto; package com.ruoyi.system.api.domain.dto; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModelProperty; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -2,6 +2,8 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; import com.ruoyi.system.api.domain.dto.OrderDTO; import com.ruoyi.system.api.feignClient.OrderClient; @@ -43,6 +45,11 @@ public R<List<Order>> getOrderByGroupPurchaseId(Long id, String source) { return R.fail("根据团购商品id获取订单列表失败:" + cause.getMessage()); } @Override public R<List<OrderAuctionBond>> getOrderAuctionBondList(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, String source) { return R.fail("获取保证金订单列表失败:" + cause.getMessage()); } }; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -4,6 +4,8 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; import com.ruoyi.system.api.domain.dto.OrderDTO; import com.ruoyi.system.api.factory.OrderFallbackFactory; @@ -56,4 +58,8 @@ @GetMapping("/order/group-purchase-id/{id}") R<List<Order>> getOrderByGroupPurchaseId(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/order-auction-bond/getOrderAuctionBondList") R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -3,7 +3,7 @@ import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; @@ -97,4 +97,11 @@ return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomSweep(MemberAuctionSalesroomDTO)); } @RequestMapping("/SaveSignUpNow") @ResponseBody @ApiOperation(value = "用户端拍卖立即报名") public R<MemberAuctionSalesroomVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) { return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomSweep(MemberAuctionSalesroomDTO)); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
@@ -3,12 +3,10 @@ import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.*; import com.ruoyi.auction.domain.AuctionSalesroomGoods; import com.ruoyi.auction.service.IAuctionSalesroomGoodsService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberBondController.java
File was deleted ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionBidRecordDTO.java
@@ -9,15 +9,12 @@ public class ForepartAuctionBidRecordDTO { @ApiModelProperty("拍卖场编号") @NotNull(message = "拍卖场编号不能为空") private String auctionSalesroomQrcode; @ApiModelProperty("拍卖员电话号码") @NotNull(message = "拍卖员电话号码不能为空") private String phone; @ApiModelProperty("拍卖员密码") @NotNull(message = "拍卖员密码不能为空") private String password; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/SaveSignUpNowDTO.java
New file @@ -0,0 +1,21 @@ package com.ruoyi.auction.controller.forepart.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class SaveSignUpNowDTO { @ApiModelProperty(value = "拍卖会id") private Long auctionSalesroomId; @ApiModelProperty(value = "商品id") private Long goodsSkuId; @ApiModelProperty(value = "会员id") private Long memberId; @ApiModelProperty(value = "1拍卖会，2普通拍卖品") private Integer isAuctionSalesroom; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java
File was deleted ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomGoodsMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.auction.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.domain.AuctionSalesroomGoods; import org.apache.ibatis.annotations.Param;
@@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.domain.AuctionSalesroom; import org.apache.ibatis.annotations.Param;
File was deleted ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java
@@ -3,10 +3,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.*; import com.ruoyi.auction.domain.AuctionSalesroomGoods; import com.ruoyi.common.core.utils.page.PageDTO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -1,10 +1,9 @@ package com.ruoyi.auction.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; @@ -13,8 +12,6 @@ import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; /** * <p> ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IMemberBondService.java
File was deleted ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -16,7 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO; @@ -31,13 +32,12 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.auction.util.HttpUtils; import com.ruoyi.system.api.constants.SecurityConstant; import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import com.ruoyi.system.api.feignClient.OrderClient; import com.ruoyi.system.api.feignClient.SysUserClient; import javax.annotation.Resource; @@ -50,9 +50,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import static com.ruoyi.member.service.impl.MemberServiceImpl.getAccessTokenByWX; /** * <p> @@ -83,13 +80,13 @@ private WxMaService wxMaService; @Resource private IMemberBondService memberBondService; @Resource private AuctionSalesroomGoodsMapper auctionSalesroomGoodsMapper; @Resource private GoodsSkuClient goodsSkuClient; @Resource private OrderClient orderClient; //微信 @@ -293,21 +290,16 @@ memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode()); memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId()); memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic()); LambdaQueryWrapper<MemberBond> wrapper=Wrappers.lambdaQuery(); wrapper.eq(MemberBond::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper.eq(MemberBond::getAuctionRoomId,auctionSalesroom.getId()); wrapper.eq(MemberBond::getDelFlag,0); List<MemberBond> list = memberBondService.list(wrapper); if (list.size()>0){ List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData(); if (data.size()>0){ memberAuctionSalesroomVO.setIsApply(2); }else{ memberAuctionSalesroomVO.setIsApply(1); } LambdaQueryWrapper<MemberBond> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(MemberBond::getAuctionRoomId,auctionSalesroom.getId()); wrapper1.eq(MemberBond::getDelFlag,0); List<MemberBond> list1 = memberBondService.list(wrapper1); memberAuctionSalesroomVO.setApplyNum(list1.size()); MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO(); memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId()); List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData(); memberAuctionSalesroomVO.setApplyNum(data1.size()); List.add(memberAuctionSalesroomVO); } page.setRecords(List); @@ -330,12 +322,8 @@ memberAuctionSalesroomInfoVO.setStartTime(byId.getStartTime()); memberAuctionSalesroomInfoVO.setStatus(byId.getStatus()); memberAuctionSalesroomInfoVO.setCoverPic(byId.getCoverPic()); LambdaQueryWrapper<MemberBond> wrapper=Wrappers.lambdaQuery(); wrapper.eq(MemberBond::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper.eq(MemberBond::getAuctionRoomId,byId.getId()); wrapper.eq(MemberBond::getDelFlag,0); List<MemberBond> list = memberBondService.list(wrapper); if (list.size()>0){ List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData(); if (data.size()>0){ memberAuctionSalesroomInfoVO.setIsApply(2); }else{ memberAuctionSalesroomInfoVO.setIsApply(1); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberBondServiceImpl.java
File was deleted ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/MemberBondMapper.xml
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
@@ -1,9 +1,13 @@ package com.ruoyi.order.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.order.service.IOrderAuctionBondService; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; import javax.annotation.Resource; import org.apache.poi.ss.formula.functions.T; @@ -12,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * <p> @@ -41,4 +47,18 @@ } @InnerAuth @PostMapping("/getOrderAuctionBondList") @ResponseBody public R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) { LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery(); wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,memberAuctionSalesroomDTO.getAuctionSalesroomId()); wrapper.eq(OrderAuctionBond::getDelFlag,0); List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper); return R.ok(list); } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderAuctionBondMapper.java
@@ -1,6 +1,6 @@ package com.ruoyi.order.mapper; import com.ruoyi.order.domain.pojo.OrderAuctionBond; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderAuctionBondService.java
@@ -1,11 +1,10 @@ package com.ruoyi.order.service; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.domain.pojo.OrderAuctionBond; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.RequestBody; /** * <p> ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.domain.pojo.OrderAuctionBond; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.order.domain.pojo.Paylog; import com.ruoyi.order.mapper.OrderAuctionBondMapper; import com.ruoyi.order.service.IOrderAuctionBondService; @@ -15,7 +15,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.awt.*; import java.util.List; /**
