ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -3,7 +3,10 @@ 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.auction.controller.forepart.vo.ForepartAuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; import com.ruoyi.auction.domain.AuctionSalesroom; import com.ruoyi.auction.service.IAuctionSalesroomService; import com.ruoyi.common.core.domain.R; @@ -73,4 +76,18 @@ } @RequestMapping("/getMemberAuctionSalesroomList") @ResponseBody @ApiOperation(value = "用户端拍卖场信息") public R<PageDTO<MemberAuctionSalesroomVO>> getMemberAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) { return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO)); } @RequestMapping("/getMemberAuctionSalesroomInfo") @ResponseBody @ApiOperation(value = "用户端拍卖场信息详情") public R<MemberAuctionSalesroomInfoVO> getMemberAuctionSalesroomInfo(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) { return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomInfo(memberAuctionSalesroomDTO)); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
@@ -2,11 +2,14 @@ import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; 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; @@ -40,12 +43,8 @@ @ResponseBody @ApiOperation(value = "拍卖大屏的商品介绍") public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO)); } /** * 拍卖师端拍卖场信息 @@ -57,11 +56,6 @@ public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO)); } /** * 拍卖师端拍卖场立即开始 @@ -97,7 +91,6 @@ @ResponseBody @ApiOperation(value = "判断拍卖师端是否还有未拍卖商品") public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO)); } @@ -122,11 +115,12 @@ */ @RequestMapping("/auctionSalesroomGoodsEnd") @ResponseBody @ApiOperation(value = "拍卖师端拍卖商品立即结束") @ApiOperation(value = "拍卖师端拍卖场下一个立即结束") public R<T> auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) { iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO); return R.ok(); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
@@ -14,4 +14,7 @@ @ApiModelProperty(value = "拍卖场名称") private String salesroomName; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/MemberAuctionSalesroomDTO.java
New file @@ -0,0 +1,17 @@ package com.ruoyi.auction.controller.forepart.dto; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class MemberAuctionSalesroomDTO extends BasePage { @ApiModelProperty(value = "会员id") private Long memberId; @ApiModelProperty(value = "拍卖场名称") private String salesroomName; @ApiModelProperty(value = "拍卖会id") private Long auctionSalesroomId; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -25,7 +25,7 @@ private BigDecimal startingPrice; @ApiModelProperty(value = "拍品数量") private Integer itemQuantity; private Integer salesroomStock; @ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合") private Integer SalesroomType; @@ -51,5 +51,11 @@ @ApiModelProperty(value = "下一个商品名称") private String nextGoodsSkuName; @ApiModelProperty(value = "是否出价 1未出价，2出价") private Integer isBond; @ApiModelProperty(value = "是中标 1未中标，2中标") private Integer isStatus; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java
New file @@ -0,0 +1,58 @@ package com.ruoyi.auction.controller.forepart.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.core.enums.AuctionStartStatusEnum; import com.ruoyi.common.core.enums.AuctionTypeEnum; import com.ruoyi.common.core.enums.AuthenticationEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @Data public class MemberAuctionSalesroomInfoVO { @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty(value = "拍卖场名称") private String salesroomName; @ApiModelProperty(value = "开始时间") private LocalDateTime startTime; @ApiModelProperty(value = "结束时间") private LocalDateTime endTime; @ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合") private AuctionTypeEnum type; @ApiModelProperty(value = "保证金") private BigDecimal bound; @ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名") private AuthenticationEnum authentication; @ApiModelProperty(value = "拍卖场说明") private String description; @ApiModelProperty(value = "拍卖场封面图") private String coverPic; @ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束") private AuctionStartStatusEnum status; @ApiModelProperty(value = "分享标题") private String shareTitle; @ApiModelProperty(value = "分享图片") private String sharePic; @ApiModelProperty("是否报名 1未报名，2 已报名") private Integer isApply; @ApiModelProperty(value = "拍卖会的商品") List<ForepartAuctionSalesroomGoodsVO> forepartAuctionSalesroomGoodsVO; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomVO.java
New file @@ -0,0 +1,29 @@ package com.ruoyi.auction.controller.forepart.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class MemberAuctionSalesroomVO { @ApiModelProperty(value = "拍卖场id") private Long SalesroomId; @ApiModelProperty(value = "拍卖场名称") private String salesroomName; @ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束") private Integer status; @ApiModelProperty(value = "拍卖场说明") private String description; @ApiModelProperty(value = "拍卖场封面图") private String coverPic; @ApiModelProperty("是否报名 1未报名，2 已报名") private Integer isApply; @ApiModelProperty("报名人数") private Integer applyNum; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java
@@ -43,9 +43,6 @@ @ApiModelProperty(value = "商品id") private Long goodsSkuId; @ApiModelProperty(value = "商品名称") private String goodsSkuName; @ApiModelProperty(value = "起拍价格") private BigDecimal startingPrice; @@ -53,7 +50,7 @@ private BigDecimal minimumMarkupAmount; @ApiModelProperty(value = "拍品数量") private Integer itemQuantity; private Integer salesroomStock; @ApiModelProperty(value = "兜底成交个数") private Integer guaranteedTradeVolume; ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomGoodsMapper.java
@@ -1,7 +1,11 @@ package com.ruoyi.auction.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.domain.AuctionSalesroomGoods; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -13,4 +17,6 @@ */ public interface AuctionSalesroomGoodsMapper extends BaseMapper<AuctionSalesroomGoods> { List<AuctionSalesroomGoods> getAuctionSalesroomGoods(@Param("param") MemberAuctionSalesroomDTO memberAuctionSalesroomDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java
@@ -1,7 +1,12 @@ package com.ruoyi.auction.mapper; 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.auction.domain.AuctionSalesroom; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -12,5 +17,6 @@ * @since 2024-05-16 */ public interface AuctionSalesroomMapper extends BaseMapper<AuctionSalesroom> { List<AuctionSalesroom> pageMemberAuctionSalesroomList(Page page, @Param("param") MemberAuctionSalesroomDTO memberAuctionSalesroomDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java
@@ -2,9 +2,14 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO; import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; 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; /** @@ -52,4 +57,6 @@ void auctionSalesroomGoodsEnd(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -1,14 +1,20 @@ 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.auction.controller.forepart.vo.ForepartAuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; import com.ruoyi.auction.domain.AuctionSalesroom; import com.ruoyi.common.core.utils.page.PageDTO; 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> @@ -35,4 +41,10 @@ AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO); AppMiniLoginVO actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto); PageDTO<MemberAuctionSalesroomVO> getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO); MemberAuctionSalesroomInfoVO getMemberAuctionSalesroomInfo(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -16,12 +16,16 @@ 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.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO; import com.ruoyi.auction.domain.AuctionSalesroom; import com.ruoyi.auction.domain.AuctionVideo; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO; import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO; import com.ruoyi.auction.domain.*; import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper; import com.ruoyi.auction.mapper.AuctionSalesroomMapper; import com.ruoyi.auction.service.IAuctionSalesroomService; import com.ruoyi.auction.service.IAuctionVideoService; import com.ruoyi.auction.service.*; 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.StringUtils; @@ -29,9 +33,11 @@ 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.SysUserClient; import javax.annotation.Resource; @@ -40,7 +46,9 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -60,6 +68,12 @@ private IAuctionSalesroomService iAuctionSalesroomService; @Resource private IAuctionBidRecordService auctionBidRecordService; @Resource private AuctionSalesroomMapper auctionSalesroomMapper; @Resource private IAuctionVideoService iAuctionVideoService; @Resource @@ -67,6 +81,15 @@ @Resource private WxMaService wxMaService; @Resource private IMemberBondService memberBondService; @Resource private AuctionSalesroomGoodsMapper auctionSalesroomGoodsMapper; @Resource private GoodsSkuClient goodsSkuClient; //微信 @@ -242,6 +265,8 @@ } } private AlipayUserInfoShareResponse getAliUserInfo (String accessToken) throws Exception { AlipayClient alipayClient = new DefaultAlipayClient(ALIPAY_BORDER_PROD,APP_ID_PROD, APP_PRIVATE_KEY, "json", "GBK", ALIPAY_PUBLIC_KEY, "RSA2"); @@ -254,6 +279,105 @@ return null; } @Override public PageDTO<MemberAuctionSalesroomVO> getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) { Page<MemberAuctionSalesroomVO> page = new Page<>(); page.setSize(memberAuctionSalesroomDTO.getPageSize()); page.setCurrent(memberAuctionSalesroomDTO.getPageCurr()); List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomList(page,memberAuctionSalesroomDTO); List<MemberAuctionSalesroomVO> List=new ArrayList<>(); for (AuctionSalesroom auctionSalesroom:auctionSalesroomList){ MemberAuctionSalesroomVO memberAuctionSalesroomVO=new MemberAuctionSalesroomVO(); memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName()); memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription()); 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){ 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()); List.add(memberAuctionSalesroomVO); } page.setRecords(List); return PageDTO.of(page); } @Override public MemberAuctionSalesroomInfoVO getMemberAuctionSalesroomInfo(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) { AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomDTO.getAuctionSalesroomId()); MemberAuctionSalesroomInfoVO memberAuctionSalesroomInfoVO=new MemberAuctionSalesroomInfoVO(); memberAuctionSalesroomInfoVO.setId(byId.getId()); memberAuctionSalesroomInfoVO.setBound(byId.getBound()); memberAuctionSalesroomInfoVO.setAuthentication(byId.getAuthentication()); memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime()); memberAuctionSalesroomInfoVO.setSalesroomName(byId.getSalesroomName()); memberAuctionSalesroomInfoVO.setType(byId.getType()); memberAuctionSalesroomInfoVO.setDescription(byId.getDescription()); memberAuctionSalesroomInfoVO.setSharePic(byId.getSharePic()); memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle()); 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){ memberAuctionSalesroomInfoVO.setIsApply(2); }else{ memberAuctionSalesroomInfoVO.setIsApply(1); } List<ForepartAuctionSalesroomGoodsVO> forepartAuctionSalesroomGoodsVOS=new ArrayList<>(); List<AuctionSalesroomGoods> auctionSalesroomGoods = auctionSalesroomGoodsMapper.getAuctionSalesroomGoods(memberAuctionSalesroomDTO); for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){ ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO=new ForepartAuctionSalesroomGoodsVO(); forepartAuctionSalesroomGoodsVO.setSalesroomId(byId.getId()); forepartAuctionSalesroomGoodsVO.setSalesroomName(byId.getSalesroomName()); GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(salesroomGoods.getGoodsSkuId(), SecurityConstants.INNER) .getData(); forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName()); forepartAuctionSalesroomGoodsVO.setGoodsSkuId(salesroomGoods.getId()); forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic()); forepartAuctionSalesroomGoodsVO.setStartingPrice(salesroomGoods.getStartingPrice()); forepartAuctionSalesroomGoodsVO.setSalesroomStock(salesroomGoods.getSalesroomStock()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(salesroomGoods.getStatus().getCode()); LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId()); wrapper1.eq(AuctionBidRecord::getGoodsSkuId,salesroomGoods.getId()); wrapper1.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1); if (list1!=null){ forepartAuctionSalesroomGoodsVO.setIsBond(2); if (list1.getStatus().getCode()==2){ forepartAuctionSalesroomGoodsVO.setIsStatus(2); }else{ forepartAuctionSalesroomGoodsVO.setIsStatus(1); } }else{ forepartAuctionSalesroomGoodsVO.setIsBond(1); forepartAuctionSalesroomGoodsVO.setIsStatus(1); } forepartAuctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO); } memberAuctionSalesroomInfoVO.setForepartAuctionSalesroomGoodsVO(forepartAuctionSalesroomGoodsVOS); return memberAuctionSalesroomInfoVO; } public static String getAccessTokenByWX() throws Exception { String host = ACCESS_TOKEN_HOST + "?appid=" + WX_APPID + "&secret=" + WX_SECRET + "&grant_type=client_credential"; ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomGoodsMapper.xml
@@ -1,5 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper"> <select id="pageMemberAuctionSalesroomList" resultType="com.ruoyi.auction.domain.AuctionSalesroomGoods"> SELECT * FROM t_auction_salesroom_goods ta WHERE ta.del_flag = 0 <if test="param.auctionSalesroomId!=null and param.auctionSalesroomId != ''"> AND ta.auction_salesroom_id = #{and param.auctionSalesroomId} </if> ORDER BY CASE WHEN status = 0 THEN 2 WHEN status = 1 THEN 1 WHEN status = 2 THEN 3 END,status </select> </mapper> ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -2,4 +2,17 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.auction.mapper.AuctionSalesroomMapper"> <select id="pageMemberAuctionSalesroomList" resultType="com.ruoyi.auction.domain.AuctionSalesroom"> SELECT * FROM t_auction_salesroom ta WHERE ta.del_flag = 0 <if test="param.salesroomName!=null and param.salesroomName != ''"> AND ta.activity_name LIKE CONCAT('%',#{param.salesroomName},'%') </if> ORDER BY CASE WHEN status = 0 THEN 2 WHEN status = 1 THEN 1 WHEN status = 2 THEN 3 END,status </select> </mapper> ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
@@ -78,7 +78,7 @@ @PostMapping("/addMemberAddress") @ResponseBody @ApiOperation(value = "用户添加或者修改地址") public R<T> addMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) { public R addMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) { iMemberAddressService.addMemberAddress(memberAddressDTO); return R.ok(); } @@ -86,7 +86,7 @@ @PostMapping("/delMemberAddress") @ResponseBody @ApiOperation(value = "用户删除地址") public R<T> delMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) { public R delMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) { iMemberAddressService.delMemberAddress(memberAddressDTO); return R.ok(); }
