写用户端接口

rentaiming

2024-05-23 9d0b9260097b60f8a1cd2d6a5a9558c2fa544699

写用户端接口

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java

@@ -2,8 +2,8 @@



import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java

@@ -1,9 +1,9 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.auction.controller.forepart.DTO.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java

@@ -1,20 +1,10 @@
package com.ruoyi.auction.controller.forepart;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionVideo;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.PromotionClient;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/AuctionSalesroomGoodsDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.DTO;
package com.ruoyi.auction.controller.forepart.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionBidRecordDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/ForepartAuctionBidRecordDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.DTO;
package com.ruoyi.auction.controller.forepart.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/ForepartAuctionVideo.java
@@ -1,9 +1,7 @@
package com.ruoyi.auction.controller.forepart.DTO;
package com.ruoyi.auction.controller.forepart.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
public class ForepartAuctionVideo {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/OrderDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/OrderDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.DTO;
package com.ruoyi.auction.controller.forepart.dto;

import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java
@@ -1,6 +1,5 @@
package com.ruoyi.auction.controller.forepart.VO;
package com.ruoyi.auction.controller.forepart.vo;

import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/ForepartAuctionSalesroomGoodsVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.VO;
package com.ruoyi.auction.controller.forepart.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/ForepartAuctionSalesroomVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.VO;
package com.ruoyi.auction.controller.forepart.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java

@@ -1,30 +1,11 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.controller.forepart.DTO.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java

@@ -1,19 +1,10 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysUser;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.List;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionVideoService.java

@@ -1,18 +1,10 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionVideo;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.List;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java

@@ -2,10 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.DTO.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.DTO.OrderDTO;
import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.OrderDTO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionVideo;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.ruoyi.auction.mapper.AuctionVideoMapper;
@@ -12,12 +12,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
import com.ruoyi.system.api.feignClient.PromotionClient;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.List;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/DTO/MemberAddressDTO.java

New file
@@ -0,0 +1,37 @@
package com.ruoyi.member.DTO;

import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class MemberAddressDTO {

    @ApiModelProperty(value = "地址id")
    private Long  Id;

    @ApiModelProperty(value = "会员id")
    private Long memberId;

    @ApiModelProperty(value = "收件人姓名")
    private String recipientName;

    @ApiModelProperty(value = "收件人电话")
    private String recipientPhone;

    @ApiModelProperty(value = "详细地址")
    private String detailedAddress;

    @ApiModelProperty(value = "是否默认")
    @TableLogic
    private Integer isDefault;

    @ApiModelProperty(value = "省份/直辖市")
    private String receiverProvince;

    @ApiModelProperty(value = "省")
    private String receiverCity;

    @ApiModelProperty(value = "区")
    private String receiverRegion;
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java

@@ -4,11 +4,19 @@
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.member.DTO.MemberAddressDTO;
import com.ruoyi.member.domain.pojo.MemberAddress;
import com.ruoyi.member.domain.pojo.MemberCollection;
import com.ruoyi.member.domain.vo.RegionVo;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -28,8 +36,14 @@

    @ApiModelProperty
    private IMemberAddressService iMemberAddressService;

    @ApiModelProperty
    private IRegionService  IRegionService;


    @PostMapping("/getMemberAddressOne")
    @ResponseBody
    @InnerAuth
    public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
        LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(MemberAddress::getMemberId,userId);
@@ -46,4 +60,26 @@
        return R.ok(memberAddress);

    }

    @PostMapping("/getRegione")
    @ResponseBody
    @ApiOperation(value = "获取三级联动的地址")
    public R<List<RegionVo>> getRegione() {
        return R.ok(IRegionService.listRegionVo());
    }

    @PostMapping("/getMemberAddressList")
    @ResponseBody
    @ApiOperation(value = "获取用户地址")
    public R<List<MemberAddress>> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
        return R.ok(iMemberAddressService.getMemberAddressList(memberAddressDTO));
    }

    @PostMapping("/addMemberAddress")
    @ResponseBody
    @ApiOperation(value = "用户添加或者修改地址")
    public R<T> addMemberAddress(MemberAddressDTO memberAddressDTO) {
        iMemberAddressService.addMemberAddress(memberAddressDTO);
        return R.ok();
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberAddress.java

@@ -74,5 +74,14 @@
    @TableLogic
    private Integer isDefault;

    @ApiModelProperty(value = "省份/直辖市")
    private String receiverProvince;

    @ApiModelProperty(value = "省")
    private String receiverCity;

    @ApiModelProperty(value = "区")
    private String receiverRegion;


}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java

@@ -1,7 +1,10 @@
package com.ruoyi.member.service;

import com.ruoyi.member.DTO.MemberAddressDTO;
import com.ruoyi.member.domain.pojo.MemberAddress;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
@@ -12,5 +15,7 @@
 * @since 2024-05-16
 */
public interface IMemberAddressService extends IService<MemberAddress> {
    List<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO);

    void addMemberAddress(MemberAddressDTO memberAddressDTO);
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java

@@ -1,10 +1,16 @@
package com.ruoyi.member.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.member.DTO.MemberAddressDTO;
import com.ruoyi.member.domain.pojo.MemberAddress;
import com.ruoyi.member.mapper.MemberAddressMapper;
import com.ruoyi.member.service.IMemberAddressService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -16,5 +22,44 @@
 */
@Service
public class MemberAddressServiceImpl extends ServiceImpl<MemberAddressMapper, MemberAddress> implements IMemberAddressService {
    @Resource
    private  IMemberAddressService iMemberAddressService;
    @Override
    public List<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
        LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberAddress::getMemberId,memberAddressDTO.getMemberId());
        wrapper.eq(MemberAddress::getDelFlag,0);
        wrapper.orderByDesc(MemberAddress::getIsDefault);
        return iMemberAddressService.list(wrapper);
    }

    @Override
    public void addMemberAddress(MemberAddressDTO memberAddressDTO) {
        MemberAddress memberAddress=new MemberAddress();
        if (memberAddressDTO.getId()!=null){
            memberAddress=iMemberAddressService.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);
           if (memberAddress1!=null){
               memberAddress1.setIsDefault(1);
               iMemberAddressService.updateById(memberAddress1);
           }
       }
       memberAddress.setMemberId(memberAddressDTO.getMemberId());
       memberAddress.setReceiverCity(memberAddressDTO.getReceiverCity());
       memberAddress.setReceiverProvince(memberAddressDTO.getReceiverProvince());
       memberAddress.setReceiverRegion(memberAddressDTO.getReceiverRegion());
       memberAddress.setCity(memberAddressDTO.getReceiverProvince()+memberAddressDTO.getReceiverCity()+memberAddressDTO.getReceiverRegion());
       memberAddress.setRecipientName(memberAddressDTO.getRecipientName());
       memberAddress.setRecipientPhone(memberAddressDTO.getRecipientPhone());
       memberAddress.setDetailedAddress(memberAddressDTO.getDetailedAddress());
       memberAddress.setIsDefault(memberAddressDTO.getIsDefault());
       iMemberAddressService.save(memberAddress);

    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/alipay/config/AlipayConfig.java

@@ -23,7 +23,7 @@
    // 商户收款账号
    public static final String seller_email = ParamUtil.getValue("seller_email");
    // 支付宝的公钥
    public static String ali_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgRS4mO8v95swMPfUAezNK5hM+M/HqX0GT/QEPaICcQU1CNAup7pZuFm0jWyWrA0eOOWCzN5Qky0UEWZjZAd06xvYtxCNCgKh3SoGXWNUVIQ/iTFrZHWK9hn58Krm0vTLSZH1fxhqcYZmiE/ndeJvWRNHZB2UEQhLc5mE/nl3fC3zvMUcY77btfFm/MLRdJRSK83trG1dJ4pXqmROi77rg3dIF6rsdtqB3BCLQ9mks6m/lTx89tcZD6TVooMd4tPUsBnC0bWjqm2d020ufLEi6sf+Lh5UUsT6ueNTk1Pbc/5oOlRjOeV/MQLj4icoWstKn8pWc97FTVAQ9Pmce3COKQIDAQAB";
    public static String ali_public_key =ParamUtil.getValue("ali_public_key");;
    // appId
    public static String app_id = ParamUtil.getValue("app_id");
    // 回调地址

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java

@@ -1,9 +1,18 @@
package com.ruoyi.promotion.controller;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.service.IPromotionBannerService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -16,5 +25,13 @@
@RestController
@RequestMapping("/promotion-banner")
public class PromotionBannerController {
    @Resource
    private IPromotionBannerService iPromotionBannerService;
    @RequestMapping("/getBaanerList")
    @ResponseBody
    @ApiOperation(value = "商场或者资讯的轮播图")
    public R<List<PromotionBanner>> getBaanerList(@PathVariable("bannerType") Integer bannerType) {
        return R.ok(iPromotionBannerService.getBaanerList(bannerType));
    }

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java

@@ -1,9 +1,21 @@
package com.ruoyi.promotion.controller;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.ruoyi.promotion.service.IPromotionWishListService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -16,5 +28,35 @@
@RestController
@RequestMapping("/promotion-wish-list")
public class PromotionWishListController {
    @Resource
    private IPromotionWishListService iPromotionWishListService;
    @RequestMapping("/getPromotionWishList")
    @ResponseBody
    @ApiOperation(value = "获取心愿单列表")
    public R<List<PromotionWishList>> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) {
        return R.ok(iPromotionWishListService.getPromotionWishList(promotionWishListDTO));
    }

    @RequestMapping("/savePromotionWishList")
    @ResponseBody
    @ApiOperation(value = "添加心愿单列表")
    public R<T> savePromotionWishList(PromotionWishListDTO promotionWishListDTO) {
        iPromotionWishListService.savePromotionWishList(promotionWishListDTO);
        return R.ok();
    }

    @RequestMapping("/getPromotionWishOne")
    @ResponseBody
    @ApiOperation(value = "获取心愿单个")
    public R<PromotionWishList> getPromotionWishOne(PromotionWishListDTO promotionWishListDTO) {
        return R.ok(iPromotionWishListService.getPromotionWishOne(promotionWishListDTO));
    }

    @RequestMapping("/delPromotionWishOne")
    @ResponseBody
    @ApiOperation(value = "删除心愿单个")
    public R<T> delPromotionWishOne(PromotionWishListDTO promotionWishListDTO) {
        iPromotionWishListService.delPromotionWishOne(promotionWishListDTO);
        return R.ok();
    }
}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java

New file
@@ -0,0 +1,31 @@
package com.ruoyi.promotion.controller.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;

@Data
public class PromotionWishListDTO {
    @ApiModelProperty(value = "心愿求购id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long romotionWishId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "期望价格")
    private BigDecimal expectedPrice;

    @ApiModelProperty(value = "商品图片")
    private MultipartFile[]  goodsImageUrl;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "会员id")
    private  Long memberId;
}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionWishList.java

@@ -71,4 +71,7 @@
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "会员id")
    private  Long memberId;

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionBannerService.java

@@ -1,7 +1,11 @@
package com.ruoyi.promotion.service;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.bind.annotation.PathVariable;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,6 @@
 */
public interface IPromotionBannerService extends IService<PromotionBanner> {

    List<PromotionBanner> getBaanerList(Integer bannerType);

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java

@@ -1,7 +1,10 @@
package com.ruoyi.promotion.service;

import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,10 @@
 */
public interface IPromotionWishListService extends IService<PromotionWishList> {

    List<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO);
    PromotionWishList getPromotionWishOne(PromotionWishListDTO promotionWishListDTO);
    void savePromotionWishList(PromotionWishListDTO promotionWishListDTO);

   void delPromotionWishOne(PromotionWishListDTO promotionWishListDTO);

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionBannerServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.promotion.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.mapper.PromotionBannerMapper;
import com.ruoyi.promotion.service.IPromotionBannerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,4 +22,14 @@
@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);
    }
}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java

@@ -1,10 +1,21 @@
package com.ruoyi.promotion.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.ruoyi.promotion.mapper.PromotionWishListMapper;
import com.ruoyi.promotion.service.IPromotionWishListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import util.HuaWeiOBSUtil;

import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

/**
 * <p>
@@ -17,4 +28,47 @@
@Service
public class PromotionWishListServiceImpl extends ServiceImpl<PromotionWishListMapper, PromotionWishList> implements IPromotionWishListService {

    @Resource
    private  IPromotionWishListService iPromotionWishListService;
    @Override
    public List<PromotionWishList> getPromotionWishList(PromotionWishListDTO promotionWishListDTO) {
        LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(PromotionWishList::getMemberId,promotionWishListDTO.getMemberId());
        return iPromotionWishListService.list(wrapper);
    }

    @Override
    public void savePromotionWishList(PromotionWishListDTO promotionWishListDTO) {
        PromotionWishList promotionWishList=new PromotionWishList();
        promotionWishList.setExpectedPrice(promotionWishListDTO.getExpectedPrice());
        promotionWishList.setGoodsName(promotionWishListDTO.getGoodsName());
        promotionWishList.setRemark(promotionWishListDTO.getRemark());
        List<String> urlList=new ArrayList<>();
        if (promotionWishListDTO.getGoodsImageUrl().length>0){
            for (MultipartFile file:promotionWishListDTO.getGoodsImageUrl()){
                try {
                    String url= HuaWeiOBSUtil.obsUpload(file);
                    urlList.add(url);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
            }
            promotionWishList.setGoodsImageUrl(urlList.toString());
        }
        iPromotionWishListService.save(promotionWishList);
    }

    @Override
    public void delPromotionWishOne(PromotionWishListDTO promotionWishListDTO) {
        iPromotionWishListService.removeById(promotionWishListDTO.getRomotionWishId());
    }

    @Override
    public PromotionWishList getPromotionWishOne(PromotionWishListDTO promotionWishListDTO) {
        LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(PromotionWishList::getId,promotionWishListDTO.getRomotionWishId());
        wrapper.eq(PromotionWishList::getDelFlag,0);
        return iPromotionWishListService.getOne(wrapper);
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java

@@ -1,9 +1,18 @@
package com.ruoyi.system.controller;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.domain.Agreement;
import com.ruoyi.system.service.IAgreementService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -16,5 +25,12 @@
@RestController
@RequestMapping("/agreement")
public class AgreementController {

    @Resource
    private IAgreementService  iAgreementService;
    @RequestMapping("/getAgreement")
    @ResponseBody
    @ApiOperation(value = "获取用户协议/隐私协议")
    public R<Agreement> getAgreement(@PathVariable("agreementType") Integer agreementType) {
        return R.ok(iAgreementService.getAgreement(agreementType));
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IAgreementService.java

@@ -1,7 +1,10 @@
package com.ruoyi.system.service;

import com.ruoyi.system.domain.pojo.Agreement;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.domain.Agreement;
import org.springframework.web.bind.annotation.PathVariable;

/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface IAgreementService extends IService<Agreement> {

    Agreement getAgreement(Integer agreementType);

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.system.service.impl;

import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.Agreement;
import com.ruoyi.system.mapper.AgreementMapper;
import com.ruoyi.system.service.IAgreementService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * <p>
@@ -17,4 +22,14 @@
@Service
public class AgreementServiceImpl extends ServiceImpl<AgreementMapper, Agreement> implements IAgreementService {

    @Resource
    private  IAgreementService iAgreementService;

    @Override
    public Agreement getAgreement(Integer agreementType) {
        LambdaQueryWrapper<Agreement> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Agreement::getAgreementType,agreementType);
        wrapper.eq(Agreement::getDelFlag,0);
        return iAgreementService.getOne(wrapper);
    }
}