From 8f2f35da0cbb07d8bf0d04468c8a2bdf5ee895e5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 三月 2025 10:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index 6f770d5..f759f0b 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -1,12 +1,16 @@
package com.ruoyi.auction.controller.forepart;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionSalesroomService;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -14,16 +18,20 @@
import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.dto.SmsSendDTO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
+import com.ruoyi.system.api.feignClient.AuthClient;
+import com.ruoyi.system.api.feignClient.MemberClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.math.BigDecimal;
@@ -62,6 +70,10 @@
@Resource
private AuctionBondJlMapper auctionBondJlMapper;
+ @Resource
+ private AuthClient authClient;
+ @Resource
+ private MemberClient memberClient;
/**
* 拍卖大屏获取拍卖信息
@@ -125,11 +137,14 @@
@ApiOperation(value = "用户端-拍卖立即报名")
public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
log.info("=================================开始拍卖报名=================================");
+ String startTime = "";
if (memberAuctionSalesroomBondDTO.getBondType() == 1) {
AuctionGoods auctionGoods = AuctionGoodsMapper.selectById(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
if (auctionGoods.getListingStatus().getCode()==1){
throw new ServiceException("商品拍卖下线");
}
+ startTime = DateUtil.format(auctionGoods.getStartTime(),
+ DatePattern.NORM_DATETIME_PATTERN);
LambdaQueryWrapper<AuctionBondJl> wrapper = Wrappers.lambdaQuery();
wrapper.eq(AuctionBondJl::getAuctionGoodsId,
memberAuctionSalesroomBondDTO.getAuctionGoodsId());
@@ -158,6 +173,8 @@
auctionSalesroomWrapper.eq(AuctionSalesroom::getDelFlag, 0);
byId = iAuctionSalesroomService.getOne(auctionSalesroomWrapper);
}
+ startTime = DateUtil.format(byId.getStartTime(),
+ DatePattern.NORM_DATETIME_PATTERN);
memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId());
LambdaQueryWrapper<AuctionBondJl> wrapper = Wrappers.lambdaQuery();
wrapper.eq(AuctionBondJl::getAuctionSalesroomId,
@@ -181,6 +198,13 @@
}
PayInfoVO payInfoVO = iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO);
+ R<Member> membeOne = memberClient.getMembeOne(memberAuctionSalesroomBondDTO.getMemberId(),
+ SecurityConstants.INNER);
+ authClient.sendSms(
+ SmsSendDTO.builder().mobileList(Lists.newArrayList(membeOne.getData().getPhone()))
+ .content(String.format("报名成功，拍卖将于%s开始，请注意时间！", startTime))
+ .build(),
+ SecurityConstants.INNER);
return R.ok(payInfoVO);
}
--
Gitblit v1.7.1