1

src/main/java/com/fdkankan/sale/controller/TestController.java

@@ -1,25 +1,15 @@
 package com.fdkankan.sale.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.sale.common.ResultData;
-import com.fdkankan.sale.entity.PriceList;
-import com.fdkankan.sale.entity.SysUser;
-import com.fdkankan.sale.httpClient.client.WxClient;
-import com.fdkankan.sale.pay.wx.WXUtil;
 import com.fdkankan.sale.service.IPriceListService;
 import com.fdkankan.sale.service.ISysUserService;
 import com.fdkankan.sale.util.MyExcelUtil;
-import com.fdkankan.sale.util.OrderListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.sound.midi.Soundbank;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Scanner;
 
 @RestController
 @RequestMapping("/test")

src/main/java/com/fdkankan/sale/controller/pay/OrderWechatPayController.java

@@ -1,39 +1,21 @@
-package com.fdkankan.sale.controller.pay;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.constant.ConstantUrl;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.sale.common.CacheUtil;
-import com.fdkankan.sale.common.ResultCode;
+package com.fdkankan.sale.wx.controller;
+
 import com.fdkankan.sale.common.ResultData;
 import com.fdkankan.sale.controller.BaseController;
-import com.fdkankan.sale.entity.Repair;
-import com.fdkankan.sale.entity.RepairPay;
-import com.fdkankan.sale.exception.BusinessException;
-import com.fdkankan.sale.pay.wx.WXPayDefaultConfig;
-import com.fdkankan.sale.pay.wx.WechatPayService;
-import com.fdkankan.sale.pay.wx.WxPayBean;
+import com.fdkankan.sale.wx.pay.WechatPayService;
 import com.fdkankan.sale.service.IPriceListService;
 import com.fdkankan.sale.service.IRepairLogService;
 import com.fdkankan.sale.service.IRepairPayService;
 import com.fdkankan.sale.service.IRepairService;
-import com.fdkankan.sale.util.DateUtil;
 import com.fdkankan.sale.util.UrlUtils;
 import com.fdkankan.sale.vo.request.WechatMobileParam;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.BufferedOutputStream;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Log4j2
 /**支付中心-微信支付模块"*/

src/main/java/com/fdkankan/sale/controller/RepairCustomerController.java

@@ -1,25 +1,15 @@
-package com.fdkankan.sale.controller;
+package com.fdkankan.sale.wx.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.annotation.Post;
-import com.fdkankan.sale.common.CacheUtil;
-import com.fdkankan.sale.common.ResultCode;
 import com.fdkankan.sale.common.ResultData;
-import com.fdkankan.sale.entity.RepairComment;
 import com.fdkankan.sale.entity.RepairInvoice;
-import com.fdkankan.sale.exception.BusinessException;
 import com.fdkankan.sale.httpClient.client.WxClient;
-import com.fdkankan.sale.pay.wx.WXPayDefaultConfig;
-import com.fdkankan.sale.pay.wx.WXUtil;
-import com.fdkankan.sale.service.IRepairCommentService;
-import com.fdkankan.sale.service.IRepairService;
+import com.fdkankan.sale.wx.pay.WXPayDefaultConfig;
 import com.fdkankan.sale.service.impl.RepairCustomerService;
 import com.fdkankan.sale.service.impl.RepairSaleService;
 import com.fdkankan.sale.vo.request.RecordingParam;
 import com.fdkankan.sale.vo.request.RepairParam;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/fdkankan/sale/pay/wx/RSAUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 
 import org.springframework.core.io.ClassPathResource;
 import sun.misc.BASE64Decoder;

src/main/java/com/fdkankan/sale/pay/wx/WXPay.java

@@ -1,6 +1,4 @@
-package com.fdkankan.sale.pay.wx;
-
-import org.springframework.stereotype.Service;
+package com.fdkankan.sale.wx.pay;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.KeyManagerFactory;

src/main/java/com/fdkankan/sale/pay/wx/WXPayConstants.java

@@ -1,4 +1,4 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 
 /**
  * 常量

src/main/java/com/fdkankan/sale/pay/wx/WXPayDefaultConfig.java

@@ -1,4 +1,4 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

src/main/java/com/fdkankan/sale/pay/wx/WXPayUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -13,7 +13,6 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;

src/main/java/com/fdkankan/sale/pay/wx/WXUtil.java

@@ -1,14 +1,10 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.http.HttpUtil;
 import okhttp3.HttpUrl;
 
 import java.nio.charset.StandardCharsets;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
 import java.security.Signature;
 import java.util.Base64;
-import java.util.Random;
 
 public class WXUtil {
 

src/main/java/com/fdkankan/sale/pay/wx/WechatPayService.java

@@ -1,11 +1,9 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.util.MD5;
 import com.fdkankan.sale.common.CacheUtil;
 import com.fdkankan.sale.common.ResultCode;
-import com.fdkankan.sale.entity.PriceList;
 import com.fdkankan.sale.entity.Repair;
 import com.fdkankan.sale.entity.RepairPay;
 import com.fdkankan.sale.exception.BusinessException;
@@ -14,7 +12,6 @@ import com.fdkankan.sale.service.IRepairLogService;
 import com.fdkankan.sale.service.IRepairPayService;
 import com.fdkankan.sale.service.IRepairService;
 import com.fdkankan.sale.util.DateUtil;
-import com.fdkankan.sale.util.UrlUtils;
 import com.fdkankan.sale.vo.request.WechatMobileParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +23,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;

src/main/java/com/fdkankan/sale/pay/wx/WxPayBean.java

@@ -1,4 +1,4 @@
-package com.fdkankan.sale.pay.wx;
+package com.fdkankan.sale.wx.pay;
 
 import lombok.Data;