ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -109,7 +109,7 @@ @ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名") @JsonInclude(JsonInclude.Include.ALWAYS) private AuthenticationEnum authentication; private Integer authentication; @ApiModelProperty("是否报名 1未报名，2 已报名") @JsonInclude(JsonInclude.Include.ALWAYS) ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -472,7 +472,7 @@ } auctionGoodsinfoVO.setCoverPic(goodsSkuOne.getCoverPic()); auctionGoodsinfoVO.setAlbum(goodsSkuOne.getAlbum()); auctionGoodsinfoVO.setAuthentication(byId.getAuthentication()); auctionGoodsinfoVO.setAuthentication(byId.getAuthentication().getCode()); auctionGoodsinfoVO.setMinimumMarkupAmount(byId.getMinimumMarkupAmount()); auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec()); auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit()); @@ -481,8 +481,8 @@ auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail()); auctionGoodsinfoVO.setBond(byId.getBond()); auctionGoodsinfoVO.setYears(goodsSkuOne.getYears()); auctionGoodsinfoVO.setSharePic(goodsSkuOne.getSharePic()); auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle()); auctionGoodsinfoVO.setSharePic(byId.getSharePic()); auctionGoodsinfoVO.setShareTitle(byId.getShareTitle()); LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getAuctionType,1); wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId()); @@ -549,6 +549,7 @@ LambdaQueryWrapper<AuctionBidRecord> wrapper5= Wrappers.lambdaQuery(); wrapper5.eq(AuctionBidRecord::getAuctionType,1); wrapper5.eq(AuctionBidRecord::getTargetId,byId.getId()); wrapper5.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId()); wrapper5.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list5 = auctionBidRecordService.getOne(wrapper5); if (list5!=null){ ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -627,7 +627,7 @@ auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount()); auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime()); auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname()); auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getId()); auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getMemberId()); auctionBidRecordVOList.add(auctionBidRecordVO); } LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -679,13 +679,15 @@ throw new ServiceException("出价不能比每次最少加价低"); } LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,bidVO.getMemberId()); /* wrapper1.eq(AuctionBidRecord::getMemberId,bidVO.getMemberId());*/ wrapper1.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId()); wrapper1.eq(AuctionBidRecord::getDelFlag,0); wrapper1.orderByDesc(AuctionBidRecord::getLastBidAmount); wrapper1.last("limit 1"); AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1); if (one!=null){ BigDecimal bigDecimal1=one.getLastBidAmount().add(byId.getMinimumMarkupAmount()); if (bigDecimal1.doubleValue()<bidVO.getLastBidAmount().doubleValue()){ if (bigDecimal1.doubleValue()>bidVO.getLastBidAmount().doubleValue()){ throw new ServiceException("出价不能比上次出价加每次最少加价低"); } one.setLastBidAmount(bidVO.getLastBidAmount()); @@ -716,7 +718,7 @@ Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM); map.put("auctionSalesroomId", bidVO.getAuctionSalesroomId()); map.put("auctionSalesroomId", byId.getId()); map.put("byId", byId.getStartStatus()); map.put("lastBidAmount",one2.getLastBidAmount()); map.put("message_type", "BidRecor"); ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomGoodsMapper.xml
@@ -31,6 +31,6 @@ WHEN status = 0 THEN 2 WHEN status = 1 THEN 1 WHEN status = 2 THEN 3 END,status END,status Desc,sort_num Asc </select> </mapper> ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -14,7 +14,7 @@ WHEN status = 0 THEN 2 WHEN status = 1 THEN 1 WHEN status = 2 THEN 3 END,status END,status desc ,start_time ASC </select> <select id="pageMemberAuctionSalesroomWdList" resultType="com.ruoyi.system.api.domain.AuctionSalesroom"> ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -192,7 +192,7 @@ sysUser.setNickName("白金用户"); sysUser.setUserType("03"); sysUser.setPhonenumber(response.getOpenId()); sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); String password = "123456"; sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUser = sysUserService.registerUser(sysUser).getData(); @@ -204,7 +204,7 @@ member.setDelFlag(0); member.setNickname("白酒用户"); member.setPhone(appMiniLoginDto.getPhone()); member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); member.setZfbOpenid(response.getOpenId()); this.save(member); appMiniLoginVo.setZfbuserid(response.getUserId()); @@ -250,7 +250,7 @@ sysUser.setUserName(memberId); sysUser.setNickName("白金用户"); sysUser.setUserType("03"); sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); String password = "123456"; sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUser = sysUserService.registerUser(sysUser).getData(); @@ -261,7 +261,7 @@ member.setUserId(sysUser.getUserId()); member.setDelFlag(0); member.setNickname("白酒用户"); member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png"); member.setWxUnionid(unionid); member.setPhone(appMiniLoginDto.getPhone()); member.setMiniOpenid(openid); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
@@ -130,7 +130,7 @@ if (auctionGoodsListDTO.getGoodsSkuId()!=null){ wrapper.eq(OrderAuctionBond::getAuctionGoodsId,auctionGoodsListDTO.getGoodsSkuId()); } wrapper.eq(OrderAuctionBond::getBoundStatus,1); wrapper.eq(OrderAuctionBond::getBoundStatus,2); wrapper.eq(OrderAuctionBond::getDelFlag,0); List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper); return R.ok(list);
