ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -119,6 +119,8 @@ public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) { return R.ok( iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO)); } /** * 拍卖师端拍卖场立即开始 * ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -120,7 +120,6 @@ auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName()); auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic()); auctionGoodsVOS.add(auctionGoodsVO); } page.setRecords(auctionGoodsVOS); return PageDTO.of(page); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -17,7 +17,9 @@ import com.ruoyi.auction.mapper.AuctionBidRecordMapper; import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper; import com.ruoyi.auction.mapper.AuctionSalesroomMapper; import com.ruoyi.auction.service.IAuctionBrowseRecordService; 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.enums.AuctionOrderTypeEnum; @@ -69,6 +71,13 @@ @Resource private OrderClient orderClient; @Resource private IAuctionBrowseRecordService iAuctionBrowseRecordService; @Resource private IAuctionSalesroomService iAuctionSalesroomService; @@ -308,7 +317,7 @@ if (auctionSalesroomGoods.size()>0){ for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){ salesroomGoods.setStatus(AuctionStartStatusEnum.ENDED); iAuctionSalesroomGoodsService.updateById(salesroomGoods); this.updateById(salesroomGoods); GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO(); goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId()); @@ -383,7 +392,7 @@ wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId()); AuctionSalesroomGoods auctionSalesroomGood=this.getOne(wrapper2); AuctionSalesroom auctionSalesroom=this.getById(auctionSalesroomGood.getAuctionSalesroomId()); AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGood.getAuctionSalesroomId()); AuctionSalesroomGoods auctionSalesroomGoods=this.getById(auctionSalesroomGoodsDTO.getGoodsSkuId()); List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>(); ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
@@ -11,7 +11,6 @@ import com.ruoyi.system.api.domain.MemberAddress; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** * <p> @@ -23,8 +22,7 @@ */ @Service public class MemberAddressServiceImpl extends ServiceImpl<MemberAddressMapper, MemberAddress> implements IMemberAddressService { @Resource private IMemberAddressService iMemberAddressService; @Override public PageDTO<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO) { Page<MemberAddress> page = new Page<>(memberAddressDTO.getPageCurr(), memberAddressDTO.getPageSize()); @@ -32,7 +30,7 @@ wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId()); wrapper.eq(MemberAddress::getDelFlag,0); wrapper.orderByDesc(MemberAddress::getIsDefault); Page<MemberAddress> page1 = iMemberAddressService.page(page, wrapper); Page<MemberAddress> page1 = this.page(page, wrapper); return PageDTO.of(page1); } @@ -40,17 +38,17 @@ public void addMemberAddress(MemberAddressDTO memberAddressDTO) { MemberAddress memberAddress=new MemberAddress(); if (memberAddressDTO.getId()!=null){ memberAddress=iMemberAddressService.getById(memberAddressDTO.getId()); memberAddress=this.getById(memberAddressDTO.getId()); } if(memberAddressDTO.getIsDefault()==2){ LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery(); wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId()); wrapper.eq(MemberAddress::getDelFlag,0); wrapper.eq(MemberAddress::getIsDefault,2); MemberAddress memberAddress1=iMemberAddressService.getOne(wrapper); MemberAddress memberAddress1=this.getOne(wrapper); if (memberAddress1!=null){ memberAddress1.setIsDefault(1); iMemberAddressService.updateById(memberAddress1); this.updateById(memberAddress1); } } memberAddress.setMemberId(memberAddressDTO.getMemberId()); @@ -62,12 +60,12 @@ memberAddress.setRecipientPhone(memberAddressDTO.getRecipientPhone()); memberAddress.setDetailedAddress(memberAddressDTO.getDetailedAddress()); memberAddress.setIsDefault(memberAddressDTO.getIsDefault()); iMemberAddressService.saveOrUpdate(memberAddress); this.saveOrUpdate(memberAddress); } @Override public void delMemberAddress(MemberAddressDTO memberAddressDTO) { iMemberAddressService.removeById(memberAddressDTO.getId()); this.removeById(memberAddressDTO.getId()); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
@@ -9,7 +9,6 @@ import com.ruoyi.member.dto.MemberDTO; import com.ruoyi.member.mapper.MemberPointsMapper; import com.ruoyi.member.service.IMemberPointsService; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** @@ -23,14 +22,13 @@ @Service public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, MemberPoints> implements IMemberPointsService { @Resource private IMemberPointsService iMemberPointsService; @Override public PageDTO<MemberPoints> getMemberPoints(MemberDTO memberDTO) { Page<MemberPoints> page = new Page<>(memberDTO.getPageCurr(), memberDTO.getPageSize()); LambdaQueryWrapper<MemberPoints> wrapper= Wrappers.lambdaQuery(); wrapper.eq(MemberPoints::getMemberId,memberDTO.getMemberid()); Page<MemberPoints> page1 = iMemberPointsService.page(page, wrapper); Page<MemberPoints> page1 = this.page(page, wrapper); return PageDTO.of(page1); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -103,10 +103,6 @@ private static final String ALIPAY_PUBLIC_KEY = ""; @Resource private IMemberService iMemberService; @Resource private WxMaService wxMaService; @@ -149,7 +145,7 @@ LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Member::getZfbOpenid,response.getUserId()); Member member=iMemberService.getOne(wrapper); Member member=this.getOne(wrapper); SysUser sysUser = null; if (member != null) { sysUser = sysUserService.getSysUser(member.getUserId()).getData(); @@ -179,7 +175,7 @@ //获取用户 LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Member::getZfbOpenid,session.getOpenid()); Member member=iMemberService.getOne(wrapper); Member member=this.getOne(wrapper); SysUser sysUser = null; if (member != null) { sysUser = sysUserService.getSysUser(member.getUserId()).getData(); @@ -201,25 +197,25 @@ @Override public Member getMembeid(MemberDTO memberDTO) { return iMemberService.getById(memberDTO.getMemberid()); return this.getById(memberDTO.getMemberid()); } @Override public void updateMembeid(MemberDTO memberDTO) { Member member= iMemberService.getById(memberDTO.getMemberid()); Member member= this.getById(memberDTO.getMemberid()); if (memberDTO.getAvatar()!=null){ member.setAvatar(memberDTO.getAvatar()); } if (memberDTO.getNickname()!=null){ member.setNickname(memberDTO.getNickname()); } iMemberService.updateById(member); this.updateById(member); } @Override public void authentificationMembe(MemberDTO memberDTO) { Member member= iMemberService.getById(memberDTO.getMemberid()); Member member= this.getById(memberDTO.getMemberid()); member.setPhone(memberDTO.getPhone()); member.setIdNumber(memberDTO.getIdNumber()); member.setRealName(memberDTO.getRealName()); @@ -270,7 +266,7 @@ member.setGender(GenderEnum.MALE); } iMemberService.updateById(member); this.updateById(member); } public static String getGender(String idNumber) { @@ -305,7 +301,7 @@ if (appMiniRegisterDTO.getType() == 1) { LambdaQueryWrapper<Member> wrapper = Wrappers.lambdaQuery(); wrapper.eq(Member::getZfbOpenid, appMiniRegisterDTO.getZfbuserid()); Member member = iMemberService.getOne(wrapper); Member member = this.getOne(wrapper); //获取用户为空则新建 if (member == null) { @@ -328,7 +324,7 @@ member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); member.setWxUnionid(appMiniRegisterDTO.getWxUnionid()); member.setMiniOpenid(appMiniRegisterDTO.getMiniOpenid()); iMemberService.save(member); this.save(member); appMiniLoginVO.setMiniOpenid(member.getMiniOpenid()); appMiniLoginVO.setWxUnionid(member.getWxUnionid()); @@ -345,7 +341,7 @@ if (appMiniRegisterDTO.getType() == 2) { LambdaQueryWrapper<Member> wrapper = Wrappers.lambdaQuery(); wrapper.eq(Member::getMiniOpenid, appMiniRegisterDTO.getMiniOpenid()); Member member = iMemberService.getOne(wrapper); Member member = this.getOne(wrapper); //获取用户为空则新建 if (member == null) { //创建新用户 @@ -367,7 +363,7 @@ member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); member.setWxUnionid(appMiniRegisterDTO.getWxUnionid()); member.setMiniOpenid(appMiniRegisterDTO.getMiniOpenid()); iMemberService.save(member); this.save(member); appMiniLoginVO.setMiniOpenid(member.getMiniOpenid()); appMiniLoginVO.setWxUnionid(member.getWxUnionid()); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
@@ -6,9 +6,9 @@ import com.ruoyi.order.domain.MemberInvoice; import com.ruoyi.order.dto.MemberInvoiceDTO; import com.ruoyi.order.service.IMemberInvoiceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javax.annotation.Resource; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,11 +25,24 @@ */ @RestController @RequestMapping("/member-invoice") @Api(value = "用户端-我的发票相关接口", tags = "用户端-我的发票相关接口", description = "用户端-我的发票相关接口") public class MemberInvoiceController { @Resource private IMemberInvoiceService iMemberInvoiceService; @PostMapping("/saveMemberInvoice") @ResponseBody @ApiOperation(value = "用户端-用户添加发票") public R saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) { iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO); return R.ok(); } @PostMapping("/getMemberInvoiceList") @ResponseBody @ApiOperation(value = "用户端-获取用户开票历史") public R<PageDTO<MemberInvoice>> getMemberInvoiceList(@RequestBody MemberInvoiceDTO memberInvoiceDTO) { return R.ok(iMemberInvoiceService.getMemberInvoiceList(memberInvoiceDTO)); } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
@@ -6,6 +6,7 @@ import com.ruoyi.order.domain.MemberInvoiceOrder; import com.ruoyi.order.dto.MemberInvoiceDTO; import com.ruoyi.order.service.IMemberInvoiceOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javax.annotation.Resource; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +25,16 @@ */ @RestController @RequestMapping("/member-invoice-order") @Api(value = "用户端-用户开票历史详情相关接口", tags = "用户端-用户开票历史详情相关接口", description = "用户端-用户开票历史详情关接口") public class MemberInvoiceOrderController { @Resource private IMemberInvoiceOrderService iMemberInvoiceOrderService; @PostMapping("/getMemberInvoiceInfo") @ResponseBody @ApiOperation(value = "用户端-获取用户开票历史详情") public R<PageDTO<MemberInvoiceOrder>> getMemberInvoiceInfo(@RequestBody MemberInvoiceDTO memberInvoiceDTO) { return R.ok(iMemberInvoiceOrderService.getMemberInvoiceInfo(memberInvoiceDTO)); } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
@@ -3,20 +3,13 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.order.domain.MemberInvoice; import com.ruoyi.order.domain.MemberInvoiceOrder; import com.ruoyi.order.dto.MemberInvoiceDTO; import com.ruoyi.order.domain.MemberInvoiceRise; import com.ruoyi.order.dto.MemberInvoiceRiseDTO; import com.ruoyi.order.service.IMemberInvoiceOrderService; import com.ruoyi.order.service.IMemberInvoiceRiseService; import com.ruoyi.order.service.IMemberInvoiceService; import com.ruoyi.order.service.IOrderService; import com.ruoyi.system.api.domain.Order; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javax.annotation.Resource; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,15 +32,6 @@ @Resource private IMemberInvoiceRiseService iMemberInvoiceRiseService; @Resource private IMemberInvoiceOrderService iMemberInvoiceOrderService; @Resource private IMemberInvoiceService iMemberInvoiceService; @Resource private IOrderService iOrderService; @PostMapping("/getMemberInvoiceRiseList") @ResponseBody @@ -101,25 +85,7 @@ return R.ok(iMemberInvoiceRiseService.getOrderList(memberInvoiceRiseDTO)); } @PostMapping("/getMemberInvoiceInfo") @ResponseBody @ApiOperation(value = "用户端-获取用户开票历史详情") public R<PageDTO<MemberInvoiceOrder>> getMemberInvoiceInfo(@RequestBody MemberInvoiceDTO memberInvoiceDTO) { return R.ok(iMemberInvoiceOrderService.getMemberInvoiceInfo(memberInvoiceDTO)); } @PostMapping("/saveMemberInvoice") @ResponseBody @ApiOperation(value = "用户端-用户添加发票") public R saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) { iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO); return R.ok(); } @PostMapping("/getMemberInvoiceList") @ResponseBody @ApiOperation(value = "用户端-获取用户开票历史") public R<PageDTO<MemberInvoice>> getMemberInvoiceList(@RequestBody MemberInvoiceDTO memberInvoiceDTO) { return R.ok(iMemberInvoiceService.getMemberInvoiceList(memberInvoiceDTO)); } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceOrderServiceImpl.java
@@ -9,7 +9,6 @@ import com.ruoyi.order.dto.MemberInvoiceDTO; import com.ruoyi.order.mapper.MemberInvoiceOrderMapper; import com.ruoyi.order.service.IMemberInvoiceOrderService; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** @@ -22,14 +21,13 @@ */ @Service public class MemberInvoiceOrderServiceImpl extends ServiceImpl<MemberInvoiceOrderMapper, MemberInvoiceOrder> implements IMemberInvoiceOrderService { @Resource private IMemberInvoiceOrderService iMemberInvoiceOrderService; @Override public PageDTO<MemberInvoiceOrder> getMemberInvoiceInfo(MemberInvoiceDTO memberInvoiceDTO) { Page<MemberInvoiceOrder> page = new Page<>(memberInvoiceDTO.getPageCurr(), memberInvoiceDTO.getPageSize()); LambdaQueryWrapper<MemberInvoiceOrder> wrapper = Wrappers.lambdaQuery(); wrapper.eq(MemberInvoiceOrder::getInvoiceId, memberInvoiceDTO.getId()); Page<MemberInvoiceOrder> page1 = iMemberInvoiceOrderService.page(page, wrapper); Page<MemberInvoiceOrder> page1 = this.page(page, wrapper); return PageDTO.of(page1); } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
@@ -27,8 +27,6 @@ @Service public class MemberInvoiceRiseServiceImpl extends ServiceImpl<MemberInvoiceRiseMapper, MemberInvoiceRise> implements IMemberInvoiceRiseService { @Resource private IMemberInvoiceRiseService iMemberInvoiceRiseService; @Resource private IOrderService iOrderService; @@ -40,14 +38,14 @@ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper.eq(MemberInvoiceRise::getDelFlag,0); wrapper.orderByDesc(MemberInvoiceRise::getIsDefault); Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, wrapper); Page<MemberInvoiceRise> page1 = this.page(page, wrapper); return PageDTO.of(page1); } @Override public void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) { MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId()); MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId()); if (memberInvoiceRise==null){ memberInvoiceRise=new MemberInvoiceRise(); } @@ -55,7 +53,7 @@ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper.eq(MemberInvoiceRise::getDelFlag,0); wrapper.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper); MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper); memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType()); memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType()); @@ -69,7 +67,7 @@ if (memberInvoiceRise1==null){ memberInvoiceRise.setIsDefault(2); } iMemberInvoiceRiseService.saveOrUpdate(memberInvoiceRise); this.saveOrUpdate(memberInvoiceRise); } @Override @@ -78,23 +76,23 @@ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper.eq(MemberInvoiceRise::getDelFlag,0); wrapper.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper); MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper); memberInvoiceRise1.setIsDefault(1); iMemberInvoiceRiseService.updateById(memberInvoiceRise1); this.updateById(memberInvoiceRise1); MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId()); MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId()); memberInvoiceRise.setIsDefault(2); iMemberInvoiceRiseService.updateById(memberInvoiceRise); this.updateById(memberInvoiceRise); } @Override public void delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) { iMemberInvoiceRiseService.removeById(memberInvoiceRiseDTO.getId()); this.removeById(memberInvoiceRiseDTO.getId()); } @Override public MemberInvoiceRise getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) { return iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId()); return this.getById(memberInvoiceRiseDTO.getId()); } @Override @@ -103,7 +101,7 @@ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper.eq(MemberInvoiceRise::getDelFlag,0); wrapper.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper); MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper); return memberInvoiceRise1; }
@@ -38,8 +38,6 @@ @Service public class MemberInvoiceServiceImpl extends ServiceImpl<MemberInvoiceMapper, MemberInvoice> implements IMemberInvoiceService { @Resource private IMemberInvoiceService iMemberInvoiceService; @Resource private IMemberInvoiceOrderService iMemberInvoiceOrderService; @@ -71,7 +69,7 @@ memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone()); memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen()); memberInvoice.setRiseType(memberInvoiceDTO.getRiseType()); iMemberInvoiceService.save(memberInvoice); this.save(memberInvoice); List<Integer> memberInvoiceOrderList=memberInvoiceDTO.getOrderId(); for (Integer memberInvoiceOrder:memberInvoiceOrderList){ @@ -115,7 +113,7 @@ wrapper.eq(MemberInvoice::getMemberId, memberInvoiceDTO.getMemberId()); wrapper.eq(MemberInvoice::getDelFlag, 0); wrapper.orderByDesc(MemberInvoice::getCreateTime); Page<MemberInvoice> page1 = iMemberInvoiceService.page(page, wrapper); Page<MemberInvoice> page1 = this.page(page, wrapper); return PageDTO.of(page1); } } ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -11,7 +11,6 @@ import com.ruoyi.promotion.service.ICouponMemberService; import java.time.LocalDateTime; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** @@ -25,25 +24,24 @@ @Service public class CouponMemberServiceImpl extends ServiceImpl<CouponMemberMapper, CouponMember> implements ICouponMemberService { @Resource private ICouponMemberService iCouponMemberService; @Override public PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) { LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery(); wrapper.eq(CouponMember::getCouponStatus,1); wrapper.eq(CouponMember::getDelFlag,0); List<CouponMember> couponMemberList=iCouponMemberService.list(wrapper); List<CouponMember> couponMemberList=this.list(wrapper); for (CouponMember couponMember:couponMemberList){ if(LocalDateTime.now().isAfter(couponMember.getEndDate())){ couponMember.setCouponStatus(0); iCouponMemberService.updateById(couponMember); this.updateById(couponMember); } } Page<CouponMember> page = new Page<>(couponMemberDTO.getPageCurr(), couponMemberDTO.getPageSize()); LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(CouponMember::getCouponStatus,couponMemberDTO.getCouponStatus()); wrapper1.eq(CouponMember::getDelFlag,0); Page<CouponMember> page1 = iCouponMemberService.page(page, wrapper); Page<CouponMember> page1 = this.page(page, wrapper); return PageDTO.of(page1); } } ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionBannerServiceImpl.java
@@ -7,7 +7,6 @@ import com.ruoyi.promotion.mapper.PromotionBannerMapper; import com.ruoyi.promotion.service.IPromotionBannerService; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** @@ -21,14 +20,12 @@ @Service public class PromotionBannerServiceImpl extends ServiceImpl<PromotionBannerMapper, PromotionBanner> implements IPromotionBannerService { @Resource private IPromotionBannerService iPromotionBannerService; @Override public List<PromotionBanner> getBaanerList(Integer bannerType) { LambdaQueryWrapper<PromotionBanner> wrapper= Wrappers.lambdaQuery(); wrapper.eq(PromotionBanner::getBannerType,bannerType); wrapper.eq(PromotionBanner::getDelFlag,0); wrapper.orderByDesc(PromotionBanner::getSortNum); return iPromotionBannerService.list(wrapper); return this.list(wrapper); } } ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
@@ -13,7 +13,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -28,15 +27,14 @@ @Service public class PromotionWishListServiceImpl extends ServiceImpl<PromotionWishListMapper, PromotionWishList> implements IPromotionWishListService { @Resource private IPromotionWishListService iPromotionWishListService; @Override public PageDTO<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) { Page<PromotionWishList> page = new Page<>(promotionWishListDTO.getPageCurr(), promotionWishListDTO.getPageSize()); LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery(); wrapper.eq(PromotionWishList::getMemberId,promotionWishListDTO.getMemberId()); Page<PromotionWishList> page1 = iPromotionWishListService.page(page, wrapper); Page<PromotionWishList> page1 = this.page(page, wrapper); return PageDTO.of(page1); } @@ -58,12 +56,12 @@ } promotionWishList.setGoodsImageUrl(urlList.toString()); } iPromotionWishListService.save(promotionWishList); this.save(promotionWishList); } @Override public void delPromotionWishOne(PromotionWishListDTO promotionWishListDTO) { iPromotionWishListService.removeById(promotionWishListDTO.getRomotionWishId()); this.removeById(promotionWishListDTO.getRomotionWishId()); } @Override @@ -71,7 +69,7 @@ LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery(); wrapper.eq(PromotionWishList::getId,promotionWishListDTO.getRomotionWishId()); wrapper.eq(PromotionWishList::getDelFlag,0); return iPromotionWishListService.getOne(wrapper); return this.getOne(wrapper); } }
