rentaiming
2024-05-24 079a2f88430675d90bef0d3126be4cb5dbf92427
写用户端接口
9个文件已修改
2个文件已添加
394 ■■■■■ 已修改文件
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceDTO.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceRiseDTO.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoice.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoiceRise.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
@@ -1,9 +1,19 @@
package com.ruoyi.order.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.service.IMemberInvoiceService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PostMapping;
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;
/**
 * <p>
@@ -16,5 +26,15 @@
@RestController
@RequestMapping("/member-invoice")
public class MemberInvoiceController {
    @Resource
    private IMemberInvoiceService iMemberInvoiceService;
    @PostMapping("/saveMemberInvoice")
    @ResponseBody
    @ApiOperation(value = "添加编辑用户发票抬头")
    public R<T> saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
        iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
        return R.ok();
    }
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
@@ -1,9 +1,22 @@
package com.ruoyi.order.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.ruoyi.order.service.IOrderService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PostMapping;
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>
@@ -17,4 +30,61 @@
@RequestMapping("/member-invoice-rise")
public class MemberInvoiceRiseController {
    @Resource
    private IMemberInvoiceRiseService iMemberInvoiceRiseService;
    @Resource
    private IOrderService iOrderService;
    @PostMapping("/getMemberInvoiceRiseList")
    @ResponseBody
    @ApiOperation(value = "获取用户发票抬头")
    public R<List<MemberInvoiceRise>> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return R.ok(iMemberInvoiceRiseService.getMemberInvoiceRiseList(memberInvoiceRiseDTO));
    }
    @PostMapping("/saveMemberInvoiceRise")
    @ResponseBody
    @ApiOperation(value = "添加编辑用户发票抬头")
    public R<T> saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        iMemberInvoiceRiseService.saveMemberInvoiceRise(memberInvoiceRiseDTO);
        return R.ok();
    }
    @PostMapping("/saveIsDefault")
    @ResponseBody
    @ApiOperation(value = "设置默认")
    public R<T> saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        iMemberInvoiceRiseService.saveIsDefault(memberInvoiceRiseDTO);
        return R.ok();
    }
    @PostMapping("/delMemberInvoiceRise")
    @ResponseBody
    @ApiOperation(value = "删除用户发票抬头")
    public R<T> delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        iMemberInvoiceRiseService.delMemberInvoiceRise(memberInvoiceRiseDTO);
        return R.ok();
    }
    @PostMapping("/getMemberInvoiceRiseOne")
    @ResponseBody
    @ApiOperation(value = "获取用户发票抬头单个")
    public R<MemberInvoiceRise> getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return R.ok(iMemberInvoiceRiseService.getMemberInvoiceRiseOne(memberInvoiceRiseDTO));
    }
    @PostMapping("/getIsDefault")
    @ResponseBody
    @ApiOperation(value = "获取用户发票抬头默认")
    public R<MemberInvoiceRise> getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return R.ok(iMemberInvoiceRiseService.getIsDefault(memberInvoiceRiseDTO));
    }
    @PostMapping("/getOrderList")
    @ResponseBody
    @ApiOperation(value = "获取用户已开票和未开票列表")
    public R<List<Order>> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return R.ok(iMemberInvoiceRiseService.getOrderList(memberInvoiceRiseDTO));
    }
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceDTO.java
New file
@@ -0,0 +1,49 @@
package com.ruoyi.order.controller.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class MemberInvoiceDTO {
    @ApiModelProperty(value = "发票金额")
    private BigDecimal invoiceMoney;
    @ApiModelProperty(value = "开票状态 1待审核,2 已开票,3 拒绝")
    private Integer invoiceStatus;
    @ApiModelProperty(value = "会员id")
    private Long memberId;
    @ApiModelProperty(value = "邮箱")
    private String mail;
    @ApiModelProperty(value = "发票类型 1 普通,2 专票")
    private Integer invoiceType;
    @ApiModelProperty(value = "抬头类型 1 企业单位,2 个人/非企业单位")
    private Integer riseType;
    @ApiModelProperty(value = "公司名称")
    private String corporationName;
    @ApiModelProperty(value = "公司税号")
    private String corporationId;
    @ApiModelProperty(value = "公司地址")
    private String corporationAddress;
    @ApiModelProperty(value = "公司电话")
    private String corporationPhone;
    @ApiModelProperty(value = "公司开户行")
    private String corporationOpen;
    @ApiModelProperty(value = "公司账号")
    private String corporationAccount;
    @ApiModelProperty(value = "订单编号List")
    private List<Integer> orderId;
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/dto/MemberInvoiceRiseDTO.java
New file
@@ -0,0 +1,50 @@
package com.ruoyi.order.controller.dto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class MemberInvoiceRiseDTO {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @ApiModelProperty(value = "发票类型 1 普通,2 专票")
    private Integer invoiceType;
    @ApiModelProperty(value = "抬头类型 1 企业单位,2 个人/非企业单位")
    private Integer riseType;
    @ApiModelProperty(value = "公司名称")
    private String corporationName;
    @ApiModelProperty(value = "公司税号")
    private String corporationId;
    @ApiModelProperty(value = "公司地址")
    private String corporationAddress;
    @ApiModelProperty(value = "公司电话")
    private String corporationPhone;
    @ApiModelProperty(value = "公司开户行")
    private String corporationOpen;
    @ApiModelProperty(value = "公司账号")
    private String corporationAccount;
    @ApiModelProperty(value = "1是其他,2 是默认")
    private Integer isDefault;
    @ApiModelProperty(value = "会员id")
    private Long memberId;
    @ApiModelProperty(value = "1已开票,2 未开票")
    private  Integer OrderType;
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoice.java
@@ -67,5 +67,32 @@
    @ApiModelProperty(value = "会员id")
    private Long memberId;
    @ApiModelProperty(value = "邮箱")
    private String mail;
    @ApiModelProperty(value = "发票类型 1 普通,2 专票")
    private Integer invoiceType;
    @ApiModelProperty(value = "抬头类型 1 企业单位,2 个人/非企业单位")
    private Integer riseType;
    @ApiModelProperty(value = "公司名称")
    private String corporationName;
    @ApiModelProperty(value = "公司税号")
    private String corporationId;
    @ApiModelProperty(value = "公司地址")
    private String corporationAddress;
    @ApiModelProperty(value = "公司电话")
    private String corporationPhone;
    @ApiModelProperty(value = "公司开户行")
    private String corporationOpen;
    @ApiModelProperty(value = "公司账号")
    private String corporationAccount;
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoiceRise.java
@@ -25,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_member_invoice_rise")
@ApiModel(value = "MemberInvoiceRise对象", description = "我的发票抬头")
@ApiModel(value = "MemberInvoiceRise", description = "我的发票抬头")
public class MemberInvoiceRise implements Serializable {
    private static final long serialVersionUID = 1L;
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
@@ -126,6 +126,8 @@
    @ApiModelProperty(value = "保证金")
    private BigDecimal bound;
    @ApiModelProperty(value = "开票状态 开票状态 1 待开票,2待审核,3 已开票,4 拒绝")
    private Integer invoiceStatus;
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java
@@ -1,7 +1,12 @@
package com.ruoyi.order.service;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.pojo.Order;
import java.util.List;
/**
 * <p>
@@ -13,4 +18,18 @@
 */
public interface IMemberInvoiceRiseService extends IService<MemberInvoiceRise> {
  List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  void saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  void delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  MemberInvoiceRise getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  MemberInvoiceRise getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
  List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO);
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceService.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.service;
import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -12,5 +13,5 @@
 * @since 2024-05-23
 */
public interface IMemberInvoiceService extends IService<MemberInvoice> {
   void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO);
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
@@ -1,10 +1,19 @@
package com.ruoyi.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.service.IOrderService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
 * <p>
@@ -17,4 +26,102 @@
@Service
public class MemberInvoiceRiseServiceImpl extends ServiceImpl<MemberInvoiceRiseMapper, MemberInvoiceRise> implements IMemberInvoiceRiseService {
    @Resource
    private  IMemberInvoiceRiseService iMemberInvoiceRiseService;
    @Resource
    private IOrderService iOrderService;
    @Override
    public List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
        return  iMemberInvoiceRiseService.list(wrapper);
    }
    @Override
    public void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
        if (memberInvoiceRise==null){
            memberInvoiceRise=new MemberInvoiceRise();
        }
        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
        memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
        memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
        memberInvoiceRise.setCorporationName(memberInvoiceRiseDTO.getCorporationName());
        memberInvoiceRise.setCorporationId(memberInvoiceRiseDTO.getCorporationId());
        memberInvoiceRise.setCorporationAddress(memberInvoiceRiseDTO.getCorporationAddress());
        memberInvoiceRise.setCorporationAccount(memberInvoiceRiseDTO.getCorporationAccount());
        memberInvoiceRise.setCorporationOpen(memberInvoiceRiseDTO.getCorporationOpen());
        memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone());
        if (memberInvoiceRise1==null){
            memberInvoiceRise.setIsDefault(2);
        }
        iMemberInvoiceRiseService.saveOrUpdate(memberInvoiceRise);
        }
    @Override
    public void saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
        memberInvoiceRise1.setIsDefault(1);
        iMemberInvoiceRiseService.updateById(memberInvoiceRise1);
        MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
        memberInvoiceRise.setIsDefault(2);
        iMemberInvoiceRiseService.updateById(memberInvoiceRise);
    }
    @Override
    public void delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
                iMemberInvoiceRiseService.removeById(memberInvoiceRiseDTO.getId());
    }
    @Override
    public MemberInvoiceRise getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
    }
    @Override
    public MemberInvoiceRise getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
        return memberInvoiceRise1;
    }
    @Override
    public List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(Order::getOrderStatus,4);
        wrapper.eq(Order::getDelFlag,0);
        List<Integer> list=new ArrayList<>();
        if (memberInvoiceRiseDTO.getOrderType()==1){
            list.add(2);
            list.add(3);
            wrapper.in(Order::getInvoiceStatus,list);
        }else{
            list.add(1);
            list.add(4);
            wrapper.in(Order::getInvoiceStatus,list);
        }
        return iOrderService.list(wrapper);
    }
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -1,10 +1,18 @@
package com.ruoyi.order.service.impl;
import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.service.IOrderService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
 * <p>
@@ -17,4 +25,41 @@
@Service
public class MemberInvoiceServiceImpl extends ServiceImpl<MemberInvoiceMapper, MemberInvoice> implements IMemberInvoiceService {
    @Resource
    private IMemberInvoiceService iMemberInvoiceService;
    @Resource
    private IMemberInvoiceOrderService IMemberInvoiceOrderService;
    @Resource
    private IOrderService iOrderService;
    @Override
    public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
        MemberInvoice memberInvoice =new MemberInvoice();
        memberInvoice.setMemberId(memberInvoiceDTO.getMemberId());
        memberInvoice.setInvoiceMoney(memberInvoiceDTO.getInvoiceMoney());
        memberInvoice.setInvoiceStatus(1);
        memberInvoice.setMail(memberInvoiceDTO.getMail());
        memberInvoice.setInvoiceType(memberInvoiceDTO.getInvoiceType());
        memberInvoice.setCorporationAccount(memberInvoiceDTO.getCorporationAccount());
        memberInvoice.setCorporationId(memberInvoiceDTO.getCorporationId());
        memberInvoice.setCorporationAddress(memberInvoiceDTO.getCorporationAddress());
        memberInvoice.setCorporationName(memberInvoiceDTO.getCorporationName());
        memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone());
        memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen());
        memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
        iMemberInvoiceService.save(memberInvoice);
       List<Integer> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
       for (Integer memberInvoiceOrder:memberInvoiceOrderList){
           MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
           Order order= iOrderService.getById(memberInvoiceOrder);
           memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
           memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
           memberInvoiceOrder1.setOrderNo(order.getOrderNo());
           memberInvoiceOrder1.setOrderName("");
       }
    }
}