eganwu преди 1 година
родител
ревизия
f216dc7a2f

+ 1 - 1
src/custom/restcontroller/system/payment/wechatpay.java

@@ -8,7 +8,7 @@ import common.annotation.API;
 import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
-import utility.WeChatHelper;
+import utility.wechat.WeChatHelper;
 import utility.tools.Encryption;
 import utility.wechat.miniprogram.WechatMiniProgram;
 import utility.wechat.wechatpay.nativepay.NativePay;

+ 2 - 5
src/custom/restcontroller/system/payorder/payorder.java

@@ -6,19 +6,16 @@ import com.alibaba.fastjson.JSONObject;
 import common.Controller;
 import common.YosException;
 import common.annotation.API;
-import common.annotation.CACHEING;
 import common.data.*;
 import common.data.db.DataPool;
-import common.parameter.parameter;
 import restcontroller.R;
-import utility.WeChatHelper;
+import utility.wechat.WeChatHelper;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.List;
 
 import static common.parameter.parameter.usersiteIdList;
-import static utility.WeChatHelper.refund;
+import static utility.wechat.WeChatHelper.refund;
 
 
 /**

+ 1 - 3
src/custom/service/WechatService.java

@@ -5,12 +5,10 @@ import common.ServiceController;
 import common.YosException;
 import common.data.Row;
 import common.data.Rows;
-import utility.WeChatHelper;
+import utility.wechat.WeChatHelper;
 
 import java.io.IOException;
 
-import static utility.WeChatHelper.refund;
-
 
 public class WechatService extends ServiceController {
 

+ 1 - 1
src/custom/utility/WeChatHelper.java → src/custom/utility/wechat/WeChatHelper.java

@@ -1,4 +1,4 @@
-package utility;
+package utility.wechat;
 
 import beans.remind.Remind;
 import com.alibaba.fastjson.JSONObject;

+ 1 - 1
src/custom/utility/wechat/wechatpay/POJO/CreateOrderRequest.java

@@ -13,7 +13,7 @@ import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.dom.DOMElement;
-import utility.WeChatHelper;
+import utility.wechat.WeChatHelper;
 import utility.tools.WebRequest;
 
 import java.io.IOException;

+ 1 - 1
src/custom/utility/wechat/wechatpay/WechatPay.java

@@ -5,7 +5,7 @@ import common.YosException;
 import common.data.Row;
 import common.data.Rows;
 import common.data.db.DBConnect;
-import utility.WeChatHelper;
+import utility.wechat.WeChatHelper;
 import utility.wechat.wechatpay.POJO.*;
 
 import java.util.ArrayList;

+ 1 - 1
src/custom/utility/wechat/wechatpay/nativepay/NativePay.java

@@ -11,7 +11,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.glassfish.grizzly.http.util.Base64Utils;
-import utility.WeChatHelper;
+import utility.wechat.WeChatHelper;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.GCMParameterSpec;