3/14

src/main/java/com/yxt/yythmall/api/customerinvoice/CustomerInvoice.java

@@ -0,0 +1,39 @@
+package com.yxt.yythmall.api.customerinvoice;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoice {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceTypeSid;//发票类型sid
+    private String invoiceType;//发票类型
+    private String headingType;//发票类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String isDefault;//是否默认 1 为默认
+    private String customerSid;
+
+
+
+
+
+
+
+
+
+}

src/main/java/com/yxt/yythmall/api/customerinvoice/CustomerInvoiceDto.java

@@ -0,0 +1,28 @@
+package com.yxt.yythmall.api.customerinvoice;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoiceDto implements Dto {
+    private  String sid;
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceTypeSid;//发票类型sid
+    private String invoiceType;//发票类型
+    private String headingType;//发票类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String isDefault;//是否默认 1 为默认
+    private String customerSid;
+}

src/main/java/com/yxt/yythmall/api/customerinvoice/CustomerInvoiceQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.yythmall.api.customerinvoice;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoiceQuery implements Query {
+    private String shortName;
+    private String name;
+}

src/main/java/com/yxt/yythmall/api/customerinvoice/CustomerInvoiceVo.java

@@ -0,0 +1,28 @@
+package com.yxt.yythmall.api.customerinvoice;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoiceVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceTypeSid;//发票类型sid
+    private String invoiceType;//发票类型
+    private String headingType;//发票类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String isDefault;//是否默认 1 为默认
+    private String customerSid;
+}

src/main/java/com/yxt/yythmall/api/invoiceapprovalrecords/InvoiceApprovalRecords.java

@@ -0,0 +1,25 @@
+package com.yxt.yythmall.api.invoiceapprovalrecords;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecords {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String orderSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+
+}

src/main/java/com/yxt/yythmall/api/invoiceapprovalrecords/InvoiceApprovalRecordsDto.java

@@ -0,0 +1,22 @@
+package com.yxt.yythmall.api.invoiceapprovalrecords;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecordsDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String orderSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+}

src/main/java/com/yxt/yythmall/api/invoiceapprovalrecords/InvoiceApprovalRecordsQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.yythmall.api.invoiceapprovalrecords;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecordsQuery implements Query {
+    private String shortName;
+    private String name;
+    private String reviewStatus;
+}

src/main/java/com/yxt/yythmall/api/invoiceapprovalrecords/InvoiceApprovalRecordsVo.java

@@ -0,0 +1,23 @@
+package com.yxt.yythmall.api.invoiceapprovalrecords;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecordsVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String orderSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+    private String customerName;
+}

src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecords.java

@@ -1,7 +1,9 @@
 package com.yxt.yythmall.api.invoicerecords;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.UUID;
 
 /**
@@ -13,15 +15,19 @@ public class InvoiceRecords {
 
     private String id;
     private String sid= UUID.randomUUID().toString();
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
     private String remarks;
     private String isEnable;
     private String invoiceType;//发票类型
+    private String headingType;//抬头类型
     private String invoiceHeader;//发票抬头
     private String dutyParagraph;//税号
     private String bankOfDeposit;//开户行
     private String bankAccount;//账号
     private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
     private String orderSid;//订单sid
+    private String state;
 
 }

src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecordsDto.java

@@ -1,8 +1,11 @@
 package com.yxt.yythmall.api.invoicerecords;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author wangpengfei
  * @date 2023/11/30 9:27
@@ -11,14 +14,18 @@ import lombok.Data;
 public class InvoiceRecordsDto implements Dto {
     private  String sid;
     private String id;
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
     private String remarks;
     private String isEnable;
     private String invoiceType;//发票类型
+    private String headingType;//抬头类型
     private String invoiceHeader;//发票抬头
     private String dutyParagraph;//税号
     private String bankOfDeposit;//开户行
     private String bankAccount;//账号
     private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
     private String orderSid;//订单sid
+    private String state;//2申请通过  3不通过
 }

src/main/java/com/yxt/yythmall/api/invoicerecords/InvoiceRecordsVo.java

@@ -1,8 +1,11 @@
 package com.yxt.yythmall.api.invoicerecords;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author wangpengfei
  * @date 2023/11/30 9:27
@@ -11,14 +14,22 @@ import lombok.Data;
 public class InvoiceRecordsVo implements Vo {
     private String id;
     private String sid;
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
     private String remarks;
     private String isEnable;
     private String invoiceType;//发票类型
+    private String headingType;//抬头类型
     private String invoiceHeader;//发票抬头
     private String dutyParagraph;//税号
     private String bankOfDeposit;//开户行
     private String bankAccount;//账号
     private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
     private String orderSid;//订单sid
+    private String totalTee;//金额
+    private String outTradeNo;//订单编号
+    private String nick;//昵称
+    private String mobile;//电话
+    private String state;
 }

src/main/java/com/yxt/yythmall/api/invoicetype/InvoiceType.java

@@ -0,0 +1,21 @@
+package com.yxt.yythmall.api.invoicetype;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceType {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String name;
+
+}

src/main/java/com/yxt/yythmall/api/invoicetype/InvoiceTypeDto.java

@@ -0,0 +1,19 @@
+package com.yxt.yythmall.api.invoicetype;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceTypeDto implements Dto {
+    private  String sid;
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String name;//
+
+}

src/main/java/com/yxt/yythmall/api/invoicetype/InvoiceTypeQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.yythmall.api.invoicetype;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceTypeQuery implements Query {
+    private String shortName;
+    private String name;
+}

src/main/java/com/yxt/yythmall/api/invoicetype/InvoiceTypeVo.java

@@ -0,0 +1,18 @@
+package com.yxt.yythmall.api.invoicetype;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceTypeVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String name;
+}

src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java

@@ -31,6 +31,7 @@ public class OrdOrder {
     private int timeRemarks;
     private String returnUrl;
     private String meet;
+    private String invoiceStatus;//开票状态
 //    private String receivablePrice;//应收价格
 
 

src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java

@@ -35,6 +35,7 @@ public class OrdOrderDto implements Dto {
     private String brandId;
     private String bagSid;
     private String meet;
+    private String invoiceStatus;//开票状态
 //    private String receivablePrice;
 
     private List<OrdOrderDetailVo> ordOrderDetailsVoList;

src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderVo.java

@@ -41,4 +41,6 @@ public class OrdOrderVo implements Vo {
     private String endTime;
     private PayResult result;
     private long nowDate;
+    private String invoiceStatus;//开票状态
+    private boolean invoiceB=false;
 }

src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsService.java

@@ -36,7 +36,6 @@ public class ApprovalRecordsService extends MybatisBaseService<ApprovalRecordsMa
 
     public ResultBean save(ApprovalRecordsDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.delete(new QueryWrapper<ApprovalRecords>().eq("customerSid",dto.getCustomerSid()));
         ApprovalRecords entity=new ApprovalRecords();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);

src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceMapper.java

@@ -0,0 +1,29 @@
+package com.yxt.yythmall.biz.customerinvoice;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoice;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+@Mapper
+public interface CustomerInvoiceMapper extends BaseMapper<CustomerInvoice> {
+
+    IPage<CustomerInvoiceVo> ListPageVo(IPage<CustomerInvoice> page, @Param(Constants.WRAPPER) QueryWrapper<CustomerInvoice> qw);
+    @Select("select * from customer_invoice where customerSid=#{customerSid} order by isDefault desc")
+    List<CustomerInvoiceVo> listInvoice(@Param("customerSid")String customerSid);
+
+    @Select("select * from customer_invoice where sid=#{sid}")
+    CustomerInvoiceVo getCustomerInvoiceBySid( @Param("sid") String sid);
+
+}

src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceMapper.xml

@@ -0,0 +1,16 @@
+<?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.yxt.yythmall.biz.customerinvoice.CustomerInvoiceMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="ListPageVo" resultType="com.yxt.yythmall.api.customerinvoice.CustomerInvoiceVo">
+        select
+            *
+        from customer_invoice
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceRest.java

@@ -0,0 +1,57 @@
+package com.yxt.yythmall.biz.customerinvoice;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceDto;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceQuery;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+
+@Api(tags = "客户发票")
+@RestController
+@RequestMapping("customerinvoice")
+public class CustomerInvoiceRest {
+
+    @Autowired
+    CustomerInvoiceService customerInvoiceService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<CustomerInvoiceVo>> ListPageVo(@RequestBody PagerQuery<CustomerInvoiceQuery> pq) {
+        return customerInvoiceService.ListPageVo(pq);
+    }
+    @ApiOperation("根据客户sid查询所有的发票")
+    @GetMapping("/listInvoice/{customerSid}")
+    public ResultBean listInvoice(@PathVariable("customerSid")String customerSid) {
+        return customerInvoiceService.listInvoice(customerSid);
+    }
+    @ApiOperation("保存或者修改")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean saveOrUpdate(@RequestBody CustomerInvoiceDto dto) {
+        return customerInvoiceService.saveOrUpdate(dto);
+    }
+
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getCustomerInvoiceBySid/{sid}")
+    public ResultBean getCustomerInvoiceBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        CustomerInvoiceVo CustomerInvoiceVo=customerInvoiceService.getCustomerInvoiceBySid(sid);
+        return rb.success().setData(CustomerInvoiceVo);
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid) {
+        return customerInvoiceService.delete(sid);
+    }
+
+
+}

src/main/java/com/yxt/yythmall/biz/customerinvoice/CustomerInvoiceService.java

@@ -0,0 +1,79 @@
+package com.yxt.yythmall.biz.customerinvoice;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoice;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceDto;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceQuery;
+import com.yxt.yythmall.api.customerinvoice.CustomerInvoiceVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+@Service
+public class CustomerInvoiceService extends MybatisBaseService<CustomerInvoiceMapper, CustomerInvoice> {
+
+
+    public ResultBean<PagerVo<CustomerInvoiceVo>> ListPageVo(PagerQuery<CustomerInvoiceQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        CustomerInvoiceQuery query = pq.getParams();
+        QueryWrapper<CustomerInvoice> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("name", query.getName());
+        }
+        IPage<CustomerInvoice> page = PagerUtil.queryToPage(pq);
+        IPage<CustomerInvoiceVo> pagging = baseMapper.ListPageVo(page, qw);
+        PagerVo<CustomerInvoiceVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+    public ResultBean listInvoice(String customerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<CustomerInvoiceVo> pagging = baseMapper.listInvoice(customerSid);
+        return rb.success().setData(pagging);
+    }
+
+    public ResultBean saveOrUpdate(CustomerInvoiceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
+        if(dto.getIsDefault().equals("1")){
+            CustomerInvoice customerInvoice = baseMapper.selectOne(new QueryWrapper<CustomerInvoice>().eq("customerSid",dto.getCustomerSid())
+                    .eq("isDefault","1"));
+            customerInvoice.setIsDefault("0");
+            baseMapper.updateById(customerInvoice);
+        }
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            String dtoSid = dto.getSid();
+            CustomerInvoice entity=fetchBySid(dtoSid);
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.updateById(entity);
+            return rb.success().setMsg("修改成功").setData(entity.getSid());
+        }else{
+            CustomerInvoice entity=new CustomerInvoice();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.insert(entity);
+            return rb.success().setMsg("添加成功").setData(entity.getSid());
+        }
+    }
+
+    public CustomerInvoiceVo getCustomerInvoiceBySid(String sid){
+        return baseMapper.getCustomerInvoiceBySid(sid);
+    }
+    public ResultBean delete(String sid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<CustomerInvoice>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+}

src/main/java/com/yxt/yythmall/biz/invoiceapprovalrecords/InvoiceApprovalRecordsMapper.java

@@ -0,0 +1,22 @@
+package com.yxt.yythmall.biz.invoiceapprovalrecords;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecords;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+@Mapper
+public interface InvoiceApprovalRecordsMapper extends BaseMapper<InvoiceApprovalRecords> {
+
+    IPage<InvoiceApprovalRecordsVo> ListPageVo(IPage<InvoiceApprovalRecords> page, @Param(Constants.WRAPPER) QueryWrapper<InvoiceApprovalRecords> qw);
+
+
+}

src/main/java/com/yxt/yythmall/biz/invoiceapprovalrecords/InvoiceApprovalRecordsMapper.xml

@@ -0,0 +1,16 @@
+<?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.yxt.yythmall.biz.invoiceapprovalrecords.InvoiceApprovalRecordsMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="ListPageVo" resultType="com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsVo">
+        select
+            a.*
+        from invoice_approval_records a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

src/main/java/com/yxt/yythmall/biz/invoiceapprovalrecords/InvoiceApprovalRecordsRest.java

@@ -0,0 +1,48 @@
+package com.yxt.yythmall.biz.invoiceapprovalrecords;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsDto;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsQuery;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsVo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+
+@Api(tags = "企业认证")
+@RestController
+@RequestMapping("invoiceapprovalrecords")
+public class InvoiceApprovalRecordsRest {
+
+    @Autowired
+    InvoiceApprovalRecordsService invoiceApprovalRecordsService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<InvoiceApprovalRecordsVo>> ListPageVo(@RequestBody PagerQuery<InvoiceApprovalRecordsQuery> pq) {
+        return invoiceApprovalRecordsService.ListPageVo(pq);
+    }
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody InvoiceApprovalRecordsDto dto) {
+        return invoiceApprovalRecordsService.save(dto);
+    }
+//    @ApiOperation("修改")
+//    @PostMapping("/update")
+//    public ResultBean update(@RequestBody InvoiceApprovalRecordsDto dto) {
+//        return InvoiceApprovalRecordsService.update(dto);
+//    }
+
+
+}

src/main/java/com/yxt/yythmall/biz/invoiceapprovalrecords/InvoiceApprovalRecordsService.java

@@ -0,0 +1,54 @@
+package com.yxt.yythmall.biz.invoiceapprovalrecords;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecords;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsDto;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsQuery;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsVo;
+import com.yxt.yythmall.biz.invoiceapprovalrecords.InvoiceApprovalRecordsMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+@Service
+public class InvoiceApprovalRecordsService extends MybatisBaseService<InvoiceApprovalRecordsMapper, InvoiceApprovalRecords> {
+
+
+    public ResultBean<PagerVo<InvoiceApprovalRecordsVo>> ListPageVo(PagerQuery<InvoiceApprovalRecordsQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        InvoiceApprovalRecordsQuery query = pq.getParams();
+        QueryWrapper<InvoiceApprovalRecords> qw = new QueryWrapper<>();
+        qw.eq("reviewStatus","0");
+        qw.orderByDesc("createTime");
+        IPage<InvoiceApprovalRecords> page = PagerUtil.queryToPage(pq);
+        IPage<InvoiceApprovalRecordsVo> pagging = baseMapper.ListPageVo(page, qw);
+        PagerVo<InvoiceApprovalRecordsVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
+    public ResultBean save(InvoiceApprovalRecordsDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+//        baseMapper.delete(new QueryWrapper<InvoiceApprovalRecords>().eq("customerSid",dto.getCustomerSid()));
+        InvoiceApprovalRecords entity=new InvoiceApprovalRecords();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("添加成功");
+    }
+//    public ResultBean update(InvoiceApprovalRecordsDto dto) {
+//        ResultBean rb=new ResultBean();
+//        InvoiceApprovalRecords entity=baseMapper.selectOne(new QueryWrapper<InvoiceApprovalRecords>().eq("customerSid",dto.getCustomerSid()));
+//        BeanUtil.copyProperties(dto, entity, "id", "sid");
+//        entity.setReviewStatus("0");
+//        baseMapper.updateById(entity);
+//        return rb.success().setMsg("修改成功");
+//    }
+}

src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsMapper.java

@@ -19,9 +19,9 @@ import java.util.List;
 @Mapper
 public interface InvoiceRecordsMapper extends BaseMapper<InvoiceRecords> {
 
-
+    IPage<InvoiceRecordsVo> ListPageVo(IPage<InvoiceRecords> page, @Param(Constants.WRAPPER) QueryWrapper<InvoiceRecords> qw);
     @Select("select * from invoice_records")
-    List<InvoiceRecordsVo> listAll();
+    List<InvoiceRecordsVo> listAll(@Param("customerSid")String customerSid);
 
     @Select("select * from invoice_records where sid=#{sid}")
     InvoiceRecordsVo getInvoiceRecordsBySid( @Param("sid") String sid);

src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsMapper.xml

@@ -3,5 +3,14 @@
 <mapper namespace="com.yxt.yythmall.biz.invoicerecords.InvoiceRecordsMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-
+    <select id="ListPageVo" resultType="com.yxt.yythmall.api.invoicerecords.InvoiceRecordsVo">
+        select
+        a.*,b.totalTee ,b.outTradeNo,c.nick,c.mobile
+        from invoice_records a
+        left join ord_order b on b.sid = a.orderSid
+        left join lpk_customer c on c.sid= b.userSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsRest.java

@@ -16,43 +16,40 @@ import org.springframework.web.bind.annotation.*;
  * @date 2023/11/21 15:03
  */
 
-@Api(tags = "礼品卡生成记录")
+@Api(tags = "开发票记录")
 @RestController
 @RequestMapping("invoicerecords")
 public class InvoiceRecordsRest {
 
     @Autowired
-    InvoiceRecordsService InvoiceRecordsService;
+    InvoiceRecordsService invoiceRecordsService;
 
-
+    @ApiOperation("分页列表")
-    @ApiOperation("查询所有的发票信息")
+    @PostMapping("/listPage")
-    @GetMapping("/listAll")
+    public ResultBean<PagerVo<InvoiceRecordsVo>> ListPageVo(@RequestBody PagerQuery<InvoiceRecordsQuery> pq) {
-    public ResultBean listAll() {
+        return invoiceRecordsService.ListPageVo(pq);
-        return InvoiceRecordsService.listAll();
     }
     @ApiOperation("保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody InvoiceRecordsDto dto) {
-        return InvoiceRecordsService.save(dto);
+        return invoiceRecordsService.save(dto);
     }
     @ApiOperation("修改")
     @PostMapping("/update")
     public ResultBean update(@RequestBody InvoiceRecordsDto dto) {
-        return InvoiceRecordsService.update(dto);
+        return invoiceRecordsService.update(dto);
     }
 
     @ApiOperation("根据sid查询")
     @GetMapping("/getInvoiceRecordsBySid/{sid}")
     public ResultBean getInvoiceRecordsBySid(@PathVariable String sid){
         ResultBean rb = ResultBean.fireFail();
-        InvoiceRecordsVo InvoiceRecordsVo=InvoiceRecordsService.getInvoiceRecordsBySid(sid);
+        InvoiceRecordsVo InvoiceRecordsVo=invoiceRecordsService.getInvoiceRecordsBySid(sid);
         return rb.success().setData(InvoiceRecordsVo);
     }
-    @ApiOperation("删除")
+    @ApiOperation("审核")
-    @DeleteMapping("/delete/{sid}")
+    @PostMapping("/toExamine")
-    public ResultBean delete(@PathVariable String sid) {
+    public ResultBean toExamine(@RequestBody InvoiceRecordsDto dto){
-        return InvoiceRecordsService.delete(sid);
+        return invoiceRecordsService.toExamine(dto);
     }
-
-
 }

src/main/java/com/yxt/yythmall/biz/invoicerecords/InvoiceRecordsService.java

@@ -1,5 +1,6 @@
 package com.yxt.yythmall.biz.invoicerecords;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,10 +10,17 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.invoiceapprovalrecords.InvoiceApprovalRecordsDto;
 import com.yxt.yythmall.api.invoicerecords.InvoiceRecords;
 import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsDto;
 import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsQuery;
 import com.yxt.yythmall.api.invoicerecords.InvoiceRecordsVo;
+import com.yxt.yythmall.api.ordorder.OrdOrder;
+import com.yxt.yythmall.api.sysuser.SysUser;
+import com.yxt.yythmall.biz.invoiceapprovalrecords.InvoiceApprovalRecordsService;
+import com.yxt.yythmall.biz.ordorder.OrdOrderService;
+import com.yxt.yythmall.biz.sysuser.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,20 +31,43 @@ import java.util.List;
  */
 @Service
 public class InvoiceRecordsService extends MybatisBaseService<InvoiceRecordsMapper, InvoiceRecords> {
+    @Autowired
+    OrdOrderService ordOrderService;
+    @Autowired
+    InvoiceApprovalRecordsService invoiceApprovalRecordsService;
+    @Autowired
+    SysUserService sysUserService;
 
-
+    public ResultBean<PagerVo<InvoiceRecordsVo>> ListPageVo(PagerQuery<InvoiceRecordsQuery> pq) {
-
-    public ResultBean listAll() {
         ResultBean rb = ResultBean.fireFail();
-        List<InvoiceRecordsVo> pagging = baseMapper.listAll();
+        InvoiceRecordsQuery query = pq.getParams();
-        return rb.success().setData(pagging);
+        QueryWrapper<InvoiceRecords> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("name", query.getName());
         }
+        qw.eq("state","0");
+        IPage<InvoiceRecords> page = PagerUtil.queryToPage(pq);
+        IPage<InvoiceRecordsVo> pagging = baseMapper.ListPageVo(page, qw);
+        PagerVo<InvoiceRecordsVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
 
     public ResultBean save(InvoiceRecordsDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getOrderSid())){
+            return rb.setMsg("参数不全");
+        }
+        InvoiceRecords invoiceRecords=baseMapper.selectOne(new QueryWrapper<InvoiceRecords>().eq("orderSid",dto.getOrderSid()));
+        if(invoiceRecords!=null){
+            baseMapper.deleteById(invoiceRecords.getId());
+        }
         InvoiceRecords entity=new InvoiceRecords();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
+        OrdOrder order=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("sid",dto.getOrderSid()));
+        order.setInvoiceStatus("1");
+        ordOrderService.updateById(order);
         return rb.success().setMsg("添加成功");
     }
     public ResultBean update(InvoiceRecordsDto dto) {
@@ -50,14 +81,24 @@ public class InvoiceRecordsService extends MybatisBaseService<InvoiceRecordsMapp
     public InvoiceRecordsVo getInvoiceRecordsBySid(String sid){
         return baseMapper.getInvoiceRecordsBySid(sid);
     }
-    public ResultBean delete(String sid) {
+    public ResultBean toExamine(InvoiceRecordsDto dto){
-        ResultBean rb=new ResultBean();
+        ResultBean rb=new ResultBean().fail();
-        baseMapper.delete(new QueryWrapper<InvoiceRecords>().eq("sid",sid));
+        InvoiceRecords invoiceRecords=baseMapper.selectOne(new QueryWrapper<InvoiceRecords>().eq("sid",dto.getSid()));
-        return rb.success().setMsg("删除成功");
+        invoiceRecords.setState(dto.getState());
+        baseMapper.updateById(invoiceRecords);
+        OrdOrder order=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("sid",invoiceRecords.getOrderSid()));
+        order.setInvoiceStatus(dto.getState());
+        ordOrderService.updateById(order);
+        InvoiceApprovalRecordsDto dto1=new InvoiceApprovalRecordsDto();
+        dto1.setOrderSid(invoiceRecords.getOrderSid());
+        dto1.setApprovalOpinions(dto.getRemarks());
+        Object id= StpUtil.getLoginIdByToken(StpUtil.getTokenValue());
+        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("id",id));
+        dto1.setOperator(sysUser.getUserName());
+        dto1.setOperatorSid(sysUser.getSid());
+        dto1.setApprovalStatus(dto.getState());
+        invoiceApprovalRecordsService.save(dto1);
+        return rb.success().setMsg("成功");
     }
 
-
-    public List<InvoiceRecords> listAllBank() {
-        return baseMapper.selectList(null);
-    }
 }

src/main/java/com/yxt/yythmall/biz/invoicetype/InvoiceTypeMapper.java

@@ -0,0 +1,29 @@
+package com.yxt.yythmall.biz.invoicetype;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.yythmall.api.invoicetype.InvoiceType;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+@Mapper
+public interface InvoiceTypeMapper extends BaseMapper<InvoiceType> {
+
+    IPage<InvoiceTypeVo> ListPageVo(IPage<InvoiceType> page, @Param(Constants.WRAPPER) QueryWrapper<InvoiceType> qw);
+    @Select("select * from invoice_type")
+    List<InvoiceTypeVo> listAll();
+
+    @Select("select * from invoice_type where sid=#{sid}")
+    InvoiceTypeVo getInvoiceTypeBySid( @Param("sid") String sid);
+
+}

src/main/java/com/yxt/yythmall/biz/invoicetype/InvoiceTypeMapper.xml

@@ -0,0 +1,16 @@
+<?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.yxt.yythmall.biz.invoicetype.InvoiceTypeMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="ListPageVo" resultType="com.yxt.yythmall.api.invoicetype.InvoiceTypeVo">
+        select
+            *
+        from invoice_type
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

src/main/java/com/yxt/yythmall/biz/invoicetype/InvoiceTypeRest.java

@@ -0,0 +1,58 @@
+package com.yxt.yythmall.biz.invoicetype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeDto;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeQuery;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+
+@Api(tags = "发票类型")
+@RestController
+@RequestMapping("invoicetype")
+public class InvoiceTypeRest {
+
+    @Autowired
+    InvoiceTypeService invoiceTypeService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<InvoiceTypeVo>> ListPageVo(@RequestBody PagerQuery<InvoiceTypeQuery> pq) {
+        return invoiceTypeService.ListPageVo(pq);
+    }
+    @ApiOperation("查询全部")
+    @GetMapping("/listAll")
+    public ResultBean listAll() {
+        return invoiceTypeService.listAll();
+    }
+    @ApiOperation("保存或修改")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean saveOrUpdate(@RequestBody InvoiceTypeDto dto) {
+        return invoiceTypeService.saveOrUpdate(dto);
+    }
+
+
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getInvoiceTypeBySid/{sid}")
+    public ResultBean getInvoiceTypeBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        InvoiceTypeVo InvoiceTypeVo=invoiceTypeService.getInvoiceTypeBySid(sid);
+        return rb.success().setData(InvoiceTypeVo);
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid) {
+        return invoiceTypeService.delete(sid);
+    }
+
+
+}

src/main/java/com/yxt/yythmall/biz/invoicetype/InvoiceTypeService.java

@@ -0,0 +1,76 @@
+package com.yxt.yythmall.biz.invoicetype;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.invoicetype.InvoiceType;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeDto;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeQuery;
+import com.yxt.yythmall.api.invoicetype.InvoiceTypeVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:03
+ */
+@Service
+public class InvoiceTypeService extends MybatisBaseService<InvoiceTypeMapper, InvoiceType> {
+
+
+    public ResultBean<PagerVo<InvoiceTypeVo>> ListPageVo(PagerQuery<InvoiceTypeQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        InvoiceTypeQuery query = pq.getParams();
+        QueryWrapper<InvoiceType> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("name", query.getName());
+        }
+        IPage<InvoiceType> page = PagerUtil.queryToPage(pq);
+        IPage<InvoiceTypeVo> pagging = baseMapper.ListPageVo(page, qw);
+        PagerVo<InvoiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+    public ResultBean listAll() {
+        ResultBean rb = ResultBean.fireFail();
+        List<InvoiceTypeVo> pagging = baseMapper.listAll();
+        return rb.success().setData(pagging);
+    }
+
+    public ResultBean saveOrUpdate(InvoiceTypeDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isNotBlank(dto.getSid())){
+            String dtoSid = dto.getSid();
+            InvoiceType entity=fetchBySid(dtoSid);
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.updateById(entity);
+            return rb.success().setMsg("修改成功");
+        }else{
+            InvoiceType entity=new InvoiceType();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.insert(entity);
+            return rb.success().setMsg("添加成功");
+        }
+
+    }
+
+    public InvoiceTypeVo getInvoiceTypeBySid(String sid){
+        return baseMapper.getInvoiceTypeBySid(sid);
+    }
+    public ResultBean delete(String sid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<InvoiceType>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+
+
+    public List<InvoiceType> listAllBank() {
+        return baseMapper.selectList(null);
+    }
+}

src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderRest.java

@@ -49,6 +49,11 @@ public class OrdOrderRest {
     public ResultBean<OrdOrderVo> getOrderDetails(@PathVariable("sid") String sid) {
         return ordOrderService.getOrderDetails(sid);
     }
+    @GetMapping("/OrderDetailsNew/{sid}")
+    @ApiOperation(value = "支付记录明细")
+    public ResultBean<OrdOrderVo> OrderDetailsNew(@PathVariable("sid") String sid) {
+        return ordOrderService.OrderDetailsNew(sid);
+    }
     @GetMapping("/changePayState/{sid}")
     @ApiOperation(value = "改变订单状态")
     public ResultBean changePayState(@PathVariable("sid") String sid) {

src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java

@@ -509,10 +509,87 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
             result.setBus(a);
             pagging.setResult(result);
         }
+        if(pagging.getPayStatus()==4){
+            pagging=invoicingRules(pagging);
+        }
+        return rb.success().setData(pagging);
+    }
+    public ResultBean<OrdOrderVo> OrderDetailsNew(String sid) {
+        ResultBean rb = new ResultBean().fail();
+        OrdOrderVo pagging = baseMapper.getOrderDetails(sid);
+        if (StringUtils.isBlank(sid)) {
+            return rb.setMsg("参数不全");
+        }
+        List<OrdOrderDetail> details = ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid", pagging.getSid()));
+        if (StringUtils.isBlank(pagging.getMeet())) {
+            pagging.setMeet(pagging.getTotalTee());
+        }
+        DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+        pagging.setSurcharge(removeZeros(String.valueOf(decimalFormat.format(Double.valueOf(pagging.getTotalTee()) - Double.valueOf(pagging.getMeet())))));
+        for (OrdOrderDetail detail : details) {
+            LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", detail.getGoodsSid()));
+            detail.setPicUrl(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl());
+            detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份");
+            detail.setUnitName(lpkGoods.getUnitName());
+            detail.setSpecificationUnit(lpkGoods.getSpecificationUnit());
+        }
+        pagging.setOrdOrderDetails(details);
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long milli = DateUtil.current();
+        pagging.setNowDate(milli);
+        pagging.setEndTime(sdf1.format(DateUtil.offsetMinute(pagging.getCreateTime(), pagging.getTimeRemarks())));
+        if (pagging.getPayStatus() == 2) {
+            PayResult result = new PayResult();
+            if (details.size() > 1) {
+                result.setGoods(details.get(0).getGoodsName().toString() + "等" + (details.size() - 1) + "件商品");
+            } else {
+                result.setGoods(details.get(0).getGoodsName().toString() + "商品");
+            }
+            result.setPrice(pagging.getTotalTee());
+//        result.setOrderId(rbData.getOutTradeNo());
+            result.setOrderId(pagging.getOutTradeNo());
+            result.setRemainder(String.valueOf(10 * 60));
+
+            PayUrl payUrl = new PayUrl();
+            payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay");
+            PayParams aVoid = new PayParams();
+            aVoid.setMainSid(pagging.getMainSid());
+            payUrl.setParams(aVoid);
+
+            OrderUrl orderUrl = new OrderUrl();
+            OrderParams orderParams = new OrderParams();
+            orderParams.setMainSid("");
+            orderUrl.setParams(orderParams);
+
+            TradeNoUrl tradeNoUrl = new TradeNoUrl();
+            tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery");
+            TradeParams tradeParams = new TradeParams();
+            tradeParams.setMainSid(pagging.getMainSid());
+            tradeNoUrl.setParams(tradeParams);
+
+//        result.setOrder_url(orderUrl);
+            result.setPay_url(payUrl);
+            result.setTrade_no_url(tradeNoUrl);
+            String[] a = new String[]{"pay"};
+            result.setBus(a);
+            pagging.setResult(result);
+        }
+        if(pagging.getPayStatus()==4){
+            pagging=invoicingRules(pagging);
+        }
         return rb.success().setData(pagging);
     }
 
-
+    public OrdOrderVo invoicingRules(OrdOrderVo pagging) {
+        if(pagging.getInvoiceStatus().equals("0")){
+            pagging.setInvoiceB(true);
+            return pagging;
+        }else if(pagging.getInvoiceStatus().equals("3")){
+            pagging.setInvoiceB(true);
+            return pagging;
+        }
+        return pagging;
+    }
     public ResultBean changePayState(String sid) {
         ResultBean rb = new ResultBean().fail();
         if (StringUtils.isBlank(sid)) {

src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java

@@ -111,6 +111,10 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/lpkgoods/isEnterprise/**")
                 .excludePathPatterns("/enterprisecertification/save")
                 .excludePathPatterns("/lpksreservoorders/cancelReservation/**")
+                .excludePathPatterns("/customerinvoice/listInvoice/**")
+                .excludePathPatterns("/customerinvoice/saveOrUpdate")
+                .excludePathPatterns("/invoicetype/listAll")
+                .excludePathPatterns("/invoicerecords/save")
                 .excludePathPatterns("//wxapi/**")
         ;
     }