Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-11-01 f91bb885d680d3f30cbf1bcffdd6819b3b10e6b1

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java

@@ -3,13 +3,16 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.TInvoiceInformation;
import com.ruoyi.account.api.vo.InvoiceInformationVo;
import com.ruoyi.account.service.TInvoiceInformationService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -34,10 +37,18 @@
   @ResponseBody
   @GetMapping(value = "/getInvoiceInformationList")
   @ApiOperation(value = "获取开票抬头数据列表", tags = {"小程序-充电发票"})
   public AjaxResult<List<TInvoiceInformation>> getInvoiceInformationList(){
   public AjaxResult<List<InvoiceInformationVo>> getInvoiceInformationList(){
      Long userId = tokenService.getLoginUserApplet().getUserId();
      List<TInvoiceInformation> list = invoiceInformationService.list(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getAppUserId, userId).eq(TInvoiceInformation::getDelFlag, 0));
      return AjaxResult.success(list);
      List<TInvoiceInformation> list = invoiceInformationService.list(new LambdaQueryWrapper<TInvoiceInformation>()
            .eq(TInvoiceInformation::getAppUserId, userId).eq(TInvoiceInformation::getDelFlag, 0).orderByDesc(TInvoiceInformation::getIsDefault));
      List<InvoiceInformationVo> lists = new ArrayList<>();
      for (TInvoiceInformation tInvoiceInformation : list) {
         InvoiceInformationVo vo = new InvoiceInformationVo();
         BeanUtils.copyProperties(tInvoiceInformation, vo);
         vo.setId(tInvoiceInformation.getId().toString());
         lists.add(vo);
      }
      return AjaxResult.success(lists);
   }
   
   
@@ -48,7 +59,7 @@
   public AjaxResult addInvoiceInformation(@RequestBody TInvoiceInformation invoiceInformation){
      Long userId = tokenService.getLoginUserApplet().getUserId();
      //如果当前是默认抬头，则需要去除其他的默认配置
      if(1 == invoiceInformation.getIsDefault()){
      if(null != invoiceInformation.getIsDefault() && 1 == invoiceInformation.getIsDefault()){
         TInvoiceInformation one = invoiceInformationService.getOne(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getDelFlag, 0)
               .eq(TInvoiceInformation::getIsDefault, 1).eq(TInvoiceInformation::getAppUserId, userId));
         if(null != one){
@@ -79,7 +90,7 @@
   public AjaxResult editInvoiceInformation(@RequestBody TInvoiceInformation invoiceInformation){
      Long userId = tokenService.getLoginUserApplet().getUserId();
      //如果当前是默认抬头，则需要去除其他的默认配置
      if(1 == invoiceInformation.getIsDefault()){
      if(null != invoiceInformation.getIsDefault() && 1 == invoiceInformation.getIsDefault()){
         TInvoiceInformation one = invoiceInformationService.getOne(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getDelFlag, 0)
               .eq(TInvoiceInformation::getIsDefault, 1).eq(TInvoiceInformation::getAppUserId, userId));
         if(null != one && !one.getId().equals(invoiceInformation.getId())){