合并

sp-server/pom.xml

@@ -158,7 +158,6 @@
             <version>1.68</version>
         </dependency>
 
-    </dependencies>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

sp-server/src/main/java/com/pj/current/satoken/StpUserUtil.java

@@ -2,6 +2,7 @@ package com.pj.current.satoken;
 
 import java.util.List;
 
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.pj.project4sp.admin.SpAdmin;
 import com.pj.utils.cache.RedisUtil;

sp-server/src/main/java/com/pj/project/tb_business/TbBusiness.java

@@ -249,7 +249,6 @@ public class TbBusiness extends Model<TbBusiness> implements Serializable {
 
     private Integer payStep = 2;
 
-    private Integer payStep=2;
     //是否补录单
     private Integer supplement=0;
     //补录时间

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessController.java

@@ -15,12 +15,14 @@ import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.project.tb_declare.TbDeclareService;
 import com.pj.project.tb_item.TbItem;
 import com.pj.project.tb_notices.TbNoticesService;
+import com.pj.utils.sg.AjaxError;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -20,10 +20,7 @@ import cn.hutool.log.StaticLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.gson.JsonObject;
+
 import com.pj.api.pushfee.oa.CallbackBO;
 import com.pj.api.wx.bo.MsgDataBO;
 import com.pj.api.wx.service.WxService;

sp-server/src/main/java/com/pj/project/tb_invoice_info/TbInvoiceInfoService.java

@@ -27,6 +27,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Service: tb_invoice_info -- 开票信息表