代码优化

play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java

@@ -3,7 +3,6 @@ package com.starry.admin.common.oss.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.io.FileTypeUtil;
-import com.starry.common.utils.IdUtils;
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
@@ -13,6 +12,7 @@ import com.aliyun.oss.model.PutObjectRequest;
 import com.starry.admin.common.exception.CustomException;
 import com.starry.admin.common.oss.OssProperties;
 import com.starry.admin.common.oss.service.IOssFileService;
+import com.starry.common.utils.IdUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.stereotype.Service;

play-admin/src/main/java/com/starry/admin/common/play/wx/HttpUtils.java

@@ -1,176 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.starry.admin.common.exception.CustomException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.EntityUtils;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import java.io.*;
-import java.net.ConnectException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyStore;
-
-@Slf4j
-public class HttpUtils {
-
-    public static JSONObject httpRequest(String requestUrl, String requestMethod, String outputStr) {
-        StringBuilder buffer = new StringBuilder();
-        try {
-            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
-            TrustManager[] tm = {new MyX509TrustManager()};
-            SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
-            sslContext.init(null, tm, new java.security.SecureRandom());
-            // 从上述SSLContext对象中得到SSLSocketFactory对象
-            SSLSocketFactory ssf = sslContext.getSocketFactory();
-
-            URL url = new URL(requestUrl);
-            HttpsURLConnection httpUrlConn = (HttpsURLConnection) url.openConnection();
-            httpUrlConn.setSSLSocketFactory(ssf);
-            httpUrlConn.setDoOutput(true);
-            httpUrlConn.setDoInput(true);
-            httpUrlConn.setUseCaches(false);
-            // 设置请求方式（GET/POST）
-            httpUrlConn.setRequestMethod(requestMethod);
-            if ("GET".equalsIgnoreCase(requestMethod)) httpUrlConn.connect();
-            // 当有数据需要提交时
-            if (null != outputStr) {
-                OutputStream outputStream = httpUrlConn.getOutputStream();
-                // 注意编码格式，防止中文乱码
-                outputStream.write(outputStr.getBytes(StandardCharsets.UTF_8));
-                outputStream.close();
-            }
-            // 将返回的输入流转换成字符串
-            InputStream inputStream = httpUrlConn.getInputStream();
-            InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-
-            String str;
-            while ((str = bufferedReader.readLine()) != null) {
-                buffer.append(str);
-            }
-            bufferedReader.close();
-            inputStreamReader.close();
-            // 释放资源
-            inputStream.close();
-            httpUrlConn.disconnect();
-            return JSONObject.parseObject(buffer.toString());
-        } catch (ConnectException ce) {
-            log.error("weixin server connection timed out");
-        } catch (Exception e) {
-            log.error("weixin play error", e);
-        }
-        return null;
-    }
-
-
-    public static String sendPost(String requestUrl, String outputStr) throws IOException {
-        HttpURLConnection conn = getConnection(requestUrl);
-        // 当outputStr不为null时向输出流写数据
-        if (null != outputStr) {
-            OutputStream outputStream = conn.getOutputStream();
-            // 注意编码格式
-            outputStream.write(outputStr.getBytes(StandardCharsets.UTF_8));
-            outputStream.close();
-        }
-
-        try (InputStream inputStream = conn.getInputStream(); BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
-            // 从输入流读取返回内容
-            String str;
-            StringBuilder buffer = new StringBuilder();
-            while ((str = bufferedReader.readLine()) != null) {
-                buffer.append(str);
-            }
-            // 释放资源
-            conn.disconnect();
-            return buffer.toString();
-        } catch (Exception e) {
-            log.error("sendPost error，url = {},outputStr={}", requestUrl, outputStr, e);
-        }
-        return null;
-    }
-
-
-    /**
-     * 需要使用证书请求接口
-     */
-    public static String requestWithCert(String url, String pay_cert, String mchid, String data) throws Exception {
-        KeyStore keyStore = KeyStore.getInstance("PKCS12");
-        try (FileInputStream is = new FileInputStream(pay_cert)) {
-            // 这里写密码..默认是你的MCHID
-            keyStore.load(is, mchid.toCharArray());
-        }
-        // Trust own CA and all self-signed certs
-        SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, mchid.toCharArray())// 这里也是写密码的
-                .build();
-        // Allow TLSv1 protocol only
-        SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslcontext, new String[]{"TLSv1"}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
-        try (CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(socketFactory).build()) {
-            HttpPost httpPost = getHttpPost(url, data);
-            try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
-                HttpEntity entity = response.getEntity();
-                String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8");
-                EntityUtils.consume(entity);
-                return jsonStr;
-            }
-        }
-    }
-
-    private static HttpPost getHttpPost(String url, String data) {
-        HttpPost httpPost = new HttpPost(url); // 设置响应头信息
-        httpPost.addHeader("Connection", "keep-alive");
-        httpPost.addHeader("Accept", "*/*");
-        httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-        httpPost.addHeader("Host", "api.mch.weixin.qq.com");
-        httpPost.addHeader("X-Requested-With", "XMLHttpRequest");
-        httpPost.addHeader("Cache-Control", "max-age=0");
-        httpPost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
-        httpPost.setEntity(new StringEntity(data, "UTF-8"));
-        return httpPost;
-    }
-
-
-    /**
-     * 获取网络连接
-     *
-     * @param url URL
-     * @return URLConnection
-     */
-    private static HttpURLConnection getConnection(String url) {
-        try {
-            URL realUrl = new URL(url);
-            // 打开和URL之间的连接
-            URLConnection conn = realUrl.openConnection();
-            // 设置通用的请求属性
-            conn.setRequestProperty("Charset", "UTF-8");
-            conn.setRequestProperty("accept", "*/*");
-            conn.setRequestProperty("connection", "Keep-Alive");
-            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-            // 发送POST请求必须设置如下两行
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            conn.setRequestProperty("content-type", "application/x-www-form-urlencoded");
-            return (HttpURLConnection) conn;
-        } catch (IOException e) {
-            log.error("getConnection error", e);
-            throw new CustomException("getConnection error," + e.getMessage());
-        }
-
-    }
-
-
-}

play-admin/src/main/java/com/starry/admin/common/play/wx/MyX509TrustManager.java

@@ -1,28 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-import javax.net.ssl.X509TrustManager;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-
-/**
- * 对于https请求，我们需要一个证书信任管理器，这个管理器类需要自己定义，但需要实现X509TrustManager接口
- * 证书信任管理器（用于https请求）
- * 这个证书管理器的作用就是让它信任我们指定的证书，上面的代码意味着信任所有证书，不管是否权威机构颁发。
- *
- * @author jiangyin
- */
-public class MyX509TrustManager implements X509TrustManager {
-
-    @Override
-    public void checkClientTrusted(X509Certificate[] chain, String authType) {
-    }
-
-    public void checkServerTrusted(X509Certificate[] chain, String authType) {
-    }
-
-    public X509Certificate[] getAcceptedIssuers() {
-        return null;
-    }
-
-}

play-admin/src/main/java/com/starry/admin/common/play/wx/WXPayXmlUtil.java

@@ -1,27 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-import org.w3c.dom.Document;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-public final class WXPayXmlUtil {
-    public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
-        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        documentBuilderFactory.setXIncludeAware(false);
-        documentBuilderFactory.setExpandEntityReferences(false);
-
-        return documentBuilderFactory.newDocumentBuilder();
-    }
-
-    public static Document newDocument() throws ParserConfigurationException {
-        return newDocumentBuilder().newDocument();
-    }
-}

play-admin/src/main/java/com/starry/admin/common/play/wx/WeChatConstants.java

@@ -1,50 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-/**
- * 位置支付常量
- *
- * @author admin
- */
-public class WeChatConstants {
-
-    public enum SignType {
-        MD5, HMACSHA256
-    }
-
-    public static final String FIELD_SIGN = "sign";
-
-    /**
-     * 支付成功回调地址
-     */
-    public static String NOTIFY_URL = "https://july.hucs.top/api/wx/pay/jsCallback";
-
-
-    /**
-     * 支付证书路径
-     */
-    public static String PAY_CERT_LOC = "C:\\CTO\\java\\apache-tomcat-8.0.50\\wxcert\\";
-
-    /**
-     * 微信 trade_type 参数
-     */
-    public static final String TRADE_TYPE_JSAPI = "JSAPI";// JSAPI支付  例如 : 直接调用微信支付
-    public static final String TRADE_TYPE_NATIVE = "NATIVE";// Native支付  例如 : 扫码支付
-
-    /**
-     * 统一下单
-     */
-    public static String UNIFIEDORDER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
-    /**
-     * 订单支付状态查询
-     */
-    public static String ORDERQUERY_URL = "https://api.mch.weixin.qq.com/pay/orderquery";
-    /**
-     * 退款
-     */
-    public static String REFUND_URL = "https://api.mch.weixin.qq.com/secapi/pay/refund";
-    /**
-     * 提现
-     */
-    public static String TRANSFERS_URL = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
-
-}

play-admin/src/main/java/com/starry/admin/common/play/wx/WxCustomPayUtils.java

@@ -1,368 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-import com.starry.common.utils.IdUtils;
-import cn.hutool.crypto.digest.MD5;
-import com.github.wxpay.sdk.WXPayUtil;
-import com.starry.admin.common.exception.CustomException;
-import com.starry.common.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.*;
-
-/**
- * 微信支付辅助类
- *
- * @author admin
- */
-@Slf4j
-public class WxCustomPayUtils {
-
-    private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-    private static final Random RANDOM = new SecureRandom();
-
-
-    /**
-     * 获取微信支付请求参数（map格式）
-     *
-     * @param openId         微信公众号ID
-     * @param appid          用户ID
-     * @param mchId          商户ID
-     * @param orderId        订单ID
-     * @param nonceStr       订单ID
-     * @param spBillCreateIp 终端设备ID
-     * @param body           商品描述
-     * @param totalFee       商品金额
-     * @param attach         附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用（传入租户ID）
-     */
-    public static Map<String, String> getPayRequestParameters(String openId, String appid, String mchId, String orderId, String nonceStr, String spBillCreateIp, String body, String attach, long totalFee) {
-        Map<String, String> playRequestParameters = new HashMap<>(16);
-        playRequestParameters.put("openId", openId);
-        playRequestParameters.put("appid", appid);
-        playRequestParameters.put("mch_id", mchId);
-        playRequestParameters.put("nonce_str", nonceStr);
-        playRequestParameters.put("body", body);
-        playRequestParameters.put("attach", attach);
-        playRequestParameters.put("out_trade_no", orderId);
-        playRequestParameters.put("total_fee", String.valueOf(totalFee));
-        playRequestParameters.put("spbill_create_ip", spBillCreateIp);
-        playRequestParameters.put("notify_url", WeChatConstants.NOTIFY_URL);
-        playRequestParameters.put("trade_type", "JSAPI");
-        return playRequestParameters;
-    }
-
-    /**
-     * @param playRequestParameters 微信支付请求参数
-     * @param orderId               订单ID
-     * @param sign                  签名信息
-     */
-    public static String unifiedOrderJsApi(Map<String, String> playRequestParameters, String orderId, String sign) throws Exception {
-        playRequestParameters.put("sign", sign);
-        // 将所有参数(map)转xml格式
-        String xml = WXPayUtil.mapToXml(playRequestParameters);
-        String newXml = new String(xml.getBytes(StandardCharsets.UTF_8));
-        log.error("xml:{}", newXml);
-        // 发送post请求"统一下单接口"返回预支付id:prepay_id
-        String xmlStr = HttpUtils.sendPost(WeChatConstants.UNIFIEDORDER_URL, newXml);
-        log.info("xmlStr:{}", xmlStr);
-        if (StringUtils.isBlank(xmlStr)) {
-            throw new CustomException("微信支付返回信息为空");
-        }
-        Map<String, String> map = WXPayUtil.xmlToMap(xmlStr);
-        // 如果预支付返回状态码为不为SUCCESS,说明预支付接口调用失败(通讯业务失败),抛出异常,业务进行处理
-        if (!map.get("return_code").equals("SUCCESS")) {
-            throw new CustomException(map.get("return_msg"));
-        }
-        // 如果预支付返回状态码为不为SUCCESS,说明预支付接口调用失败(交易业务失败),抛出异常,业务进行处理
-        if (!map.get("result_code ").equals("SUCCESS")) {
-            throw new CustomException(map.get("err_code_des"));
-        }
-        return map.get("prepay_id");
-    }
-
-    /**
-     * 订单支付状态查询
-     *
-     * @param wechat_appid
-     * @param wechat_mchid
-     * @param wechat_seckey
-     * @param out_trade_no
-     * @return
-     * @throws Exception
-     */
-    public static Map<String, String> orderQuery(String wechat_appid, String wechat_mchid, String wechat_seckey, String out_trade_no) throws Exception {
-        // 拼接 参数
-        Map<String, String> paraMap = new HashMap<String, String>();
-        paraMap.put("appid", wechat_appid);
-        paraMap.put("mch_id", wechat_mchid);
-        paraMap.put("nonce_str", IdUtils.getUuid());
-        paraMap.put("out_trade_no", out_trade_no);// 订单号
-        String sign = WXPayUtil.generateSignature(paraMap, wechat_seckey);
-        paraMap.put("sign", sign);
-        String xml = WXPayUtil.mapToXml(paraMap);// 将所有参数(map)转xml格式
-        String xmlStr = HttpUtils.sendPost(WeChatConstants.ORDERQUERY_URL, xml);// 发送post请求"统一下单接口"返回预支付id:prepay_id
-        return WXPayUtil.xmlToMap(xmlStr);
-    }
-
-    /**
-     * XML格式字符串转换为Map
-     *
-     * @param strXML XML字符串
-     * @return XML数据转换后的Map
-     */
-    public static Map<String, String> xmlToMap(String strXML) throws Exception {
-        Map<String, String> data = new HashMap<>();
-        DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
-//            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
-        InputStream stream = new ByteArrayInputStream(strXML.getBytes("GBK"));
-        Document doc = documentBuilder.parse(stream);
-        doc.getDocumentElement().normalize();
-        NodeList nodeList = doc.getDocumentElement().getChildNodes();
-        for (int idx = 0; idx < nodeList.getLength(); ++idx) {
-            Node node = nodeList.item(idx);
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
-                Element element = (Element) node;
-                data.put(element.getNodeName(), element.getTextContent());
-            }
-        }
-        try {
-            stream.close();
-        } catch (Exception ignored) {
-
-        }
-        return data;
-    }
-
-
-    /**
-     * 将Map转换为XML格式的字符串
-     *
-     * @param data Map类型数据
-     * @return XML格式的字符串
-     * @throws Exception 系统异常
-     */
-    public static String mapToXml(Map<String, String> data) throws Exception {
-        Document document = WXPayXmlUtil.newDocument();
-        Element root = document.createElement("xml");
-        document.appendChild(root);
-        for (String key : data.keySet()) {
-            String value = data.get(key);
-            if (value == null) {
-                value = "";
-            }
-            value = value.trim();
-            Element filed = document.createElement(key);
-            filed.appendChild(document.createTextNode(value));
-            root.appendChild(filed);
-        }
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer transformer = tf.newTransformer();
-        DOMSource source = new DOMSource(document);
-        transformer.setOutputProperty(OutputKeys.ENCODING, "GBK");
-//        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-        StringWriter writer = new StringWriter();
-        StreamResult result = new StreamResult(writer);
-        transformer.transform(source, result);
-        String output = writer.getBuffer().toString();
-        try {
-            writer.close();
-        } catch (Exception ignored) {
-        }
-        return output;
-    }
-
-
-    /**
-     * 生成带有 sign 的 XML 格式字符串
-     *
-     * @param data Map类型数据
-     * @param key  API密钥
-     * @return 含有sign字段的XML
-     */
-    public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
-        return generateSignedXml(data, key, WeChatConstants.SignType.MD5);
-    }
-
-    /**
-     * 生成带有 sign 的 XML 格式字符串
-     *
-     * @param data     Map类型数据
-     * @param key      API密钥
-     * @param signType 签名类型
-     * @return 含有sign字段的XML
-     */
-    public static String generateSignedXml(final Map<String, String> data, String key, WeChatConstants.SignType signType) throws Exception {
-        String sign = generateSignature(data, key, signType);
-        data.put(WeChatConstants.FIELD_SIGN, sign);
-        return mapToXml(data);
-    }
-
-
-    /**
-     * 判断签名是否正确
-     *
-     * @param xmlStr XML格式数据
-     * @param key    API密钥
-     * @return 签名是否正确
-     * @throws Exception 系统异常
-     */
-    public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
-        Map<String, String> data = xmlToMap(xmlStr);
-        if (!data.containsKey(WeChatConstants.FIELD_SIGN)) {
-            return false;
-        }
-        String sign = data.get(WeChatConstants.FIELD_SIGN);
-        return generateSignature(data, key).equals(sign);
-    }
-
-    /**
-     * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
-     *
-     * @param data Map类型数据
-     * @param key  API密钥
-     * @return 签名是否正确
-     * @throws Exception 系统异常
-     */
-    public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
-        return isSignatureValid(data, key, WeChatConstants.SignType.MD5);
-    }
-
-    /**
-     * 判断签名是否正确，必须包含sign字段，否则返回false。
-     *
-     * @param data     Map类型数据
-     * @param key      API密钥
-     * @param signType 签名方式
-     * @return 签名是否正确
-     * @throws Exception 系统异常
-     */
-    public static boolean isSignatureValid(Map<String, String> data, String key, WeChatConstants.SignType signType) throws Exception {
-        if (!data.containsKey(WeChatConstants.FIELD_SIGN)) {
-            return false;
-        }
-        String sign = data.get(WeChatConstants.FIELD_SIGN);
-        return generateSignature(data, key, signType).equals(sign);
-    }
-
-    /**
-     * 生成签名
-     *
-     * @param data 待签名数据
-     * @param key  API密钥
-     * @return 签名
-     */
-    public static String generateSignature(final Map<String, String> data, String key) throws Exception {
-        return generateSignature(data, key, WeChatConstants.SignType.MD5);
-    }
-
-    /**
-     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
-     *
-     * @param data     待签名数据
-     * @param key      API密钥
-     * @param signType 签名方式
-     * @return 签名
-     */
-    public static String generateSignature(final Map<String, String> data, String key, WeChatConstants.SignType signType) throws Exception {
-        Set<String> keySet = data.keySet();
-        String[] keyArray = keySet.toArray(new String[0]);
-        Arrays.sort(keyArray);
-        StringBuilder sb = new StringBuilder();
-        for (String k : keyArray) {
-            if (k.equals(WeChatConstants.FIELD_SIGN)) {
-                continue;
-            }
-            // 参数值为空，则不参与签名
-            if (!data.get(k).trim().isEmpty()) {
-                sb.append(k).append("=").append(data.get(k).trim()).append("&");
-            }
-        }
-        sb.append("key=").append(key);
-        if (WeChatConstants.SignType.MD5.equals(signType)) {
-            return MD5.create().digestHex(sb.toString()).toUpperCase();
-        } else if (WeChatConstants.SignType.HMACSHA256.equals(signType)) {
-            return HmacSHA256(sb.toString(), key);
-        } else {
-            throw new Exception(String.format("Invalid sign_type: %s", signType));
-        }
-    }
-
-
-    /**
-     * 获取随机字符串 Nonce Str
-     *
-     * @return String 随机字符串
-     */
-    public static String generateNonceStr() {
-        char[] nonceChars = new char[32];
-        for (int index = 0; index < nonceChars.length; ++index) {
-            nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
-        }
-        return new String(nonceChars);
-    }
-
-
-//    /**
-//     * 生成 MD5
-//     *
-//     * @param data 待处理数据
-//     * @return MD5结果
-//     */
-//    public static String MD5(String data) throws Exception {
-//        MessageDigest md = MessageDigest.getInstance("MD5");
-//        byte[] array = md.digest(data.getBytes(StandardCharsets.UTF_8));
-//        StringBuilder sb = new StringBuilder();
-//        for (byte item : array) {
-//            sb.append(Integer.toHexString((item & 0xFF) | 0x100), 1, 3);
-//        }
-//        return sb.toString().toUpperCase();
-//    }
-
-    /**
-     * 生成 HmacSHA256
-     *
-     * @param data 待处理数据
-     * @param key  密钥
-     * @return 加密结果
-     * @throws NoSuchAlgorithmException,InvalidKeyException 系统异常
-     */
-    public static String HmacSHA256(String data, String key) throws NoSuchAlgorithmException, InvalidKeyException {
-        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
-        SecretKeySpec secret_key = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
-        sha256_HMAC.init(secret_key);
-        byte[] array = sha256_HMAC.doFinal(data.getBytes(StandardCharsets.UTF_8));
-        StringBuilder sb = new StringBuilder();
-        for (byte item : array) {
-            sb.append(Integer.toHexString((item & 0xFF) | 0x100), 1, 3);
-        }
-        return sb.toString().toUpperCase();
-    }
-
-    /**
-     * 获取当前时间戳，单位秒
-     */
-    public static long getCurrentTimestamp() {
-        return System.currentTimeMillis() / 1000;
-    }
-
-}

play-admin/src/main/java/com/starry/admin/common/play/wx/WxPlayProperties.java

@@ -1,69 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-import lombok.Data;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "wx.play")
-@PropertySource(value = {"classpath:play.properties"})
-public class WxPlayProperties implements InitializingBean {
-
-    /**
-     * 设置微信公众号或者小程序等的appid
-     */
-    private String appId;
-    /**
-     * 微信支付商户号
-     */
-    private String mchId;
-
-    /**
-     * 证书相对路径
-     */
-    private String privateKeyPath;
-
-    /**
-     * 证书相对路径
-     */
-    private String privateCertPath;
-
-    /**
-     * 下单回调地址
-     */
-    private String returnUrl;
-
-    /**
-     * 退款回调地址
-     */
-    private String refundUrl;
-
-
-    /**
-     * apiV3key
-     */
-    private String apiV3key;
-
-
-    public static String APP_ID = "";
-    public static String MCH_ID = "";
-    public static String PRIVATE_KEY_PATH = "";
-    public static String PRIVATE_CERT_PATH = "";
-    public static String RETURN_URL = "";
-    public static String REFUND_URL = "";
-    public static String API_V3KEY = "";
-
-    @Override
-    public void afterPropertiesSet() {
-        APP_ID = getAppId();
-        MCH_ID = getMchId();
-        PRIVATE_KEY_PATH = getPrivateKeyPath();
-        PRIVATE_CERT_PATH = getPrivateCertPath();
-        RETURN_URL = getReturnUrl();
-        REFUND_URL = getRefundUrl();
-        API_V3KEY = getApiV3key();
-    }
-}

play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java

@@ -11,8 +11,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
 import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl;
 import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
 import com.starry.admin.modules.custom.service.impl.PlayCustomUserInfoServiceImpl;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.service.ISysTenantService;
 import com.starry.admin.modules.system.service.SysUserService;
 import com.starry.admin.modules.weichat.service.WxTokenService;
 import com.starry.admin.utils.SecurityUtils;

play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java

@@ -8,11 +8,10 @@ import com.starry.admin.modules.clerk.service.IPlayClerkWagesDetailsInfoService;
 import com.starry.admin.modules.clerk.service.IPlayClerkWagesInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.service.ISysTenantService;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.utils.IdUtils;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java

@@ -6,8 +6,8 @@ import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.service.ISysTenantService;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.utils.IdUtils;
 import org.springframework.scheduling.annotation.Scheduled;

play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java

@@ -3,7 +3,7 @@ package com.starry.admin.modules.clerk.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
 
 import java.util.List;
 

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkClassificationInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.starry.admin.modules.clerk.service.impl;
 
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.starry.admin.modules.clerk.mapper.PlayClerkClassificationInfoMapper;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoEntity;
 import com.starry.admin.modules.clerk.service.IPlayClerkClassificationInfoService;
+import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.starry.admin.modules.clerk.mapper.PlayClerkLevelInfoMapper;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
 import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
 import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java

@@ -10,7 +10,6 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.starry.admin.common.component.JwtToken;
 import com.starry.admin.common.domain.LoginUser;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
 import com.starry.admin.modules.clerk.mapper.PlayClerkUserInfoMapper;
 import com.starry.admin.modules.clerk.module.entity.*;
 import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
@@ -18,13 +17,14 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQuery
 import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
 import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
-import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
-import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
+import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
+import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
 import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity;
 import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
 import com.starry.admin.modules.personnel.module.entity.PlayPersonnelWaiterInfoEntity;
+import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
 import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService;
 import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
 import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService;

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java

@@ -16,7 +16,6 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo;
 import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserReviewInfoService;
-import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
 import com.starry.admin.modules.weichat.service.WxCustomMpService;
 import com.starry.common.utils.IdUtils;
 import org.springframework.beans.BeanUtils;

play-admin/src/main/java/com/starry/admin/modules/commodity/controller/PlayServiceInfoController.java

@@ -1,79 +0,0 @@
-package com.starry.admin.modules.commodity.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
-import com.starry.admin.modules.commodity.service.IPlayServiceInfoService;
-import com.starry.common.annotation.Log;
-import com.starry.common.enums.BusinessType;
-import com.starry.common.result.R;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 服务项目列表Controller
- *
- * @author admin
- * @since 2024-03-28
- */
-@RestController
-@RequestMapping("/commodity/info")
-public class PlayServiceInfoController {
-    @Resource
-    private IPlayServiceInfoService playServiceInfoService;
-
-
-
-    /**
-     * 查询服务项目列表列表
-     */
-    @GetMapping("/list")
-    public R list(PlayServiceInfoEntity playServiceInfo) {
-        IPage<PlayServiceInfoEntity> list = playServiceInfoService.selectPlayServiceInfoByPage(playServiceInfo);
-        return R.ok(list);
-    }
-
-    /**
-     * 获取服务项目列表详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public R getInfo(@PathVariable("id") String id) {
-        return R.ok(playServiceInfoService.selectPlayServiceInfoById(id));
-    }
-
-    /**
-     * 新增服务项目列表
-     */
-    @Log(title = "服务项目列表", businessType = BusinessType.INSERT)
-    @PostMapping("/create")
-    public R create(@RequestBody PlayServiceInfoEntity playServiceInfo) {
-        boolean success = playServiceInfoService.create(playServiceInfo);
-        if (success) {
-            return R.ok();
-        }
-        return R.error("添加失败");
-    }
-
-    /**
-     * 修改服务项目列表
-     */
-    @Log(title = "服务项目列表", businessType = BusinessType.UPDATE)
-    @PostMapping(value = "/update/{id}")
-    public R update(@PathVariable String id, @RequestBody PlayServiceInfoEntity playServiceInfo) {
-        playServiceInfo.setId(id);
-        boolean success = playServiceInfoService.update(playServiceInfo);
-        if (success) {
-            return R.ok();
-        }
-        return R.error("修改失败");
-    }
-
-    /**
-     * 删除服务项目列表
-     */
-    @Log(title = "服务项目列表", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R remove(@PathVariable String[] ids) {
-        return R.ok(playServiceInfoService.deletePlayServiceInfoByIds(ids));
-    }
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayClerkServiceMapper.java

@@ -1,17 +0,0 @@
-package com.starry.admin.modules.commodity.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.starry.admin.modules.commodity.module.entity.PlayClerkServiceEntity;
-
-
-/**
- * 陪聊引用服务项目Mapper接口
- *
- * @author admin
- * @since 2024-03-28
- */
-public interface PlayClerkServiceMapper extends BaseMapper<PlayClerkServiceEntity> {
-
-
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayServiceInfoMapper.java

@@ -1,17 +0,0 @@
-package com.starry.admin.modules.commodity.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
-
-
-/**
- * 服务项目列表Mapper接口
- *
- * @author admin
- * @since 2024-03-28
- */
-public interface PlayServiceInfoMapper extends BaseMapper<PlayServiceInfoEntity> {
-
-
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayClerkServiceEntity.java

@@ -1,51 +0,0 @@
-package com.starry.admin.modules.commodity.module.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.starry.common.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 陪聊引用服务项目对象 play_clerk_service
- *
- * @author admin
- * @since 2024-03-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("play_clerk_service")
-public class PlayClerkServiceEntity extends BaseEntity<PlayClerkServiceEntity> {
-
-
-    /**
-     * UUID
-     */
-    private String id;
-
-    /**
-     * 租户ID
-     */
-    private String tenantId;
-
-    /**
-     * 店员用户ID
-     */
-    private String playUserId;
-
-    /**
-     * 服务项目ID
-     */
-    private String serviceId;
-
-
-    /**
-     * 项目启用状态
-     * 1:启用
-     * 0:停用
-     *
-     * @since 2024/3/28 11:20
-     **/
-    private String enablingState;
-
-
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayServiceInfoEntity.java

@@ -1,46 +0,0 @@
-package com.starry.admin.modules.commodity.module.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.starry.common.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 服务项目信息对象 play_service_info
- *
- * @author admin
- * @since 2024-03-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("play_service_info")
-public class PlayServiceInfoEntity extends BaseEntity<PlayServiceInfoEntity> {
-
-
-    /**
-     * UUID
-     */
-    private String id;
-
-    /**
-     * 租户ID
-     */
-    private String tenantId;
-
-    /**
-     * 项目名称
-     */
-    private String itemName;
-
-    /**
-     * 服务时长（文字描述信息,不参与订单计算）
-     */
-    private String serviceDuration;
-
-    /**
-     * 服务单价
-     */
-    private String price;
-
-
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayClerkServiceService.java

@@ -1,84 +0,0 @@
-package com.starry.admin.modules.commodity.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.commodity.module.entity.PlayClerkServiceEntity;
-
-/**
- * 陪聊引用服务项目Service接口
- *
- * @author admin
- * @since 2024-03-28
- */
-public interface IPlayClerkServiceService extends IService<PlayClerkServiceEntity> {
-
-
-    /**
-     * 初始化陪聊的服务项目
-     *
-     * @param playUserId 陪聊用户ID
-     * @author admin
-     * @since 2024/3/28 11:13
-     **/
-    void initPlayService(String playUserId);
-
-    /**
-     * 查询陪聊引用服务项目
-     *
-     * @param id 陪聊引用服务项目主键
-     * @return 陪聊引用服务项目
-     */
-    PlayClerkServiceEntity selectPlayClerkServiceById(String id);
-
-    /**
-     * 查询陪聊引用服务项目列表
-     *
-     * @param playClerkService 陪聊引用服务项目
-     * @return 陪聊引用服务项目集合
-     */
-    IPage<PlayClerkServiceEntity> selectPlayClerkServiceByPage(PlayClerkServiceEntity playClerkService);
-
-    /**
-     * 新增陪聊引用服务项目
-     *
-     * @param playClerkService 陪聊引用服务项目
-     * @return 结果
-     */
-    boolean create(PlayClerkServiceEntity playClerkService);
-
-
-    /**
-     * 修改陪聊服务启停状态
-     *
-     * @param playUserId    陪聊用户ID
-     * @param serviceId     服务ID
-     * @param enablingState * 项目启用状态【0:停用，1：启用】
-     * @author admin
-     * @since 2024/3/28 11:35
-     **/
-    void updateServiceEnablingState(String playUserId, String serviceId, String enablingState);
-
-    /**
-     * 修改陪聊引用服务项目
-     *
-     * @param playClerkService 陪聊引用服务项目
-     * @return 结果
-     */
-    boolean update(PlayClerkServiceEntity playClerkService);
-
-    /**
-     * 批量删除陪聊引用服务项目
-     *
-     * @param ids 需要删除的陪聊引用服务项目主键集合
-     * @return 结果
-     */
-    int deletePlayClerkServiceByIds(String[] ids);
-
-    /**
-     * 删除陪聊引用服务项目信息
-     *
-     * @param id 陪聊引用服务项目主键
-     * @return 结果
-     */
-    int deletePlayClerkServiceById(String id);
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayServiceInfoService.java

@@ -1,74 +0,0 @@
-package com.starry.admin.modules.commodity.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
-
-import java.util.List;
-
-
-/**
- * 服务项目列表Service接口
- *
- * @author admin
- * @since 2024-03-28
- */
-public interface IPlayServiceInfoService extends IService<PlayServiceInfoEntity> {
-
-    /**
-     * 查询服务项目列表
-     *
-     * @param id 服务项目列表主键
-     * @return 服务项目列表
-     */
-    PlayServiceInfoEntity selectPlayServiceInfoById(String id);
-
-    /**
-     * 查询所有的服务项目
-     *
-     * @return List<PlayServiceInfoEntity>
-     * @author admin
-     * @since 2024/3/28 11:18
-     **/
-    List<PlayServiceInfoEntity> selectPlayServiceInfoAll();
-
-    /**
-     * 查询服务项目列表列表
-     *
-     * @param playServiceInfo 服务项目列表
-     * @return 服务项目列表集合
-     */
-    IPage<PlayServiceInfoEntity> selectPlayServiceInfoByPage(PlayServiceInfoEntity playServiceInfo);
-
-    /**
-     * 新增服务项目列表
-     *
-     * @param playServiceInfo 服务项目列表
-     * @return 结果
-     */
-    boolean create(PlayServiceInfoEntity playServiceInfo);
-
-    /**
-     * 修改服务项目列表
-     *
-     * @param playServiceInfo 服务项目列表
-     * @return 结果
-     */
-    boolean update(PlayServiceInfoEntity playServiceInfo);
-
-    /**
-     * 批量删除服务项目列表
-     *
-     * @param ids 需要删除的服务项目列表主键集合
-     * @return 结果
-     */
-    int deletePlayServiceInfoByIds(String[] ids);
-
-    /**
-     * 删除服务项目列表信息
-     *
-     * @param id 服务项目列表主键
-     * @return 结果
-     */
-    int deletePlayServiceInfoById(String id);
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayClerkServiceServiceImpl.java

@@ -1,134 +0,0 @@
-package com.starry.admin.modules.commodity.service.impl;
-
-import com.starry.common.utils.IdUtils;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.commodity.mapper.PlayClerkServiceMapper;
-import com.starry.admin.modules.commodity.module.entity.PlayClerkServiceEntity;
-import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
-import com.starry.admin.modules.commodity.service.IPlayClerkServiceService;
-import com.starry.admin.modules.commodity.service.IPlayServiceInfoService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 陪聊引用服务项目Service业务层处理
- *
- * @author admin
- * @since 2024-03-28
- */
-@Service
-public class PlayClerkServiceServiceImpl extends ServiceImpl<PlayClerkServiceMapper, PlayClerkServiceEntity> implements IPlayClerkServiceService {
-    @Resource
-    private PlayClerkServiceMapper playClerkServiceMapper;
-
-
-    @Resource
-    private IPlayServiceInfoService playServiceInfoService;
-
-
-    @Override
-    public void initPlayService(String playUserId) {
-        for (PlayServiceInfoEntity playServiceInfoEntity : playServiceInfoService.selectPlayServiceInfoAll()) {
-            PlayClerkServiceEntity entity = new PlayClerkServiceEntity();
-            entity.setServiceId(playServiceInfoEntity.getId());
-            entity.setTenantId(playServiceInfoEntity.getTenantId());
-            entity.setPlayUserId(playUserId);
-            entity.setEnablingState("0");
-            this.create(entity);
-        }
-    }
-
-    /**
-     * 查询陪聊引用服务项目
-     *
-     * @param id 陪聊引用服务项目主键
-     * @return 陪聊引用服务项目
-     */
-    @Override
-    public PlayClerkServiceEntity selectPlayClerkServiceById(String id) {
-        return this.baseMapper.selectById(id);
-    }
-
-    /**
-     * 查询陪聊引用服务项目列表
-     *
-     * @param playClerkService 陪聊引用服务项目
-     * @return 陪聊引用服务项目
-     */
-    @Override
-    public IPage<PlayClerkServiceEntity> selectPlayClerkServiceByPage(PlayClerkServiceEntity playClerkService) {
-        Page<PlayClerkServiceEntity> page = new Page<>(1, 10);
-        return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
-    }
-
-    /**
-     * 新增陪聊引用服务项目
-     *
-     * @param playClerkService 陪聊引用服务项目
-     * @return 结果
-     */
-    @Override
-    public boolean create(PlayClerkServiceEntity playClerkService) {
-        if (StrUtil.isBlankIfStr(playClerkService.getId())) {
-            playClerkService.setId(IdUtils.getUuid());
-        }
-        return save(playClerkService);
-    }
-
-
-    @Override
-    public void updateServiceEnablingState(String playUserId, String serviceId, String enablingState) {
-        LambdaQueryWrapper<PlayClerkServiceEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PlayClerkServiceEntity::getServiceId, serviceId);
-        lambdaQueryWrapper.eq(PlayClerkServiceEntity::getPlayUserId, playUserId);
-        List<PlayClerkServiceEntity> list = this.baseMapper.selectList(lambdaQueryWrapper);
-        if (list.size() != 1) {
-            throw new CustomException("服务不存在，请查证");
-        }
-        // 更新服务状态
-        PlayClerkServiceEntity item = list.get(0);
-        item.setEnablingState(enablingState);
-        this.update(item);
-    }
-
-    /**
-     * 修改陪聊引用服务项目
-     *
-     * @param playClerkService 陪聊引用服务项目
-     * @return 结果
-     */
-    @Override
-    public boolean update(PlayClerkServiceEntity playClerkService) {
-        return updateById(playClerkService);
-    }
-
-    /**
-     * 批量删除陪聊引用服务项目
-     *
-     * @param ids 需要删除的陪聊引用服务项目主键
-     * @return 结果
-     */
-    @Override
-    public int deletePlayClerkServiceByIds(String[] ids) {
-        return playClerkServiceMapper.deleteBatchIds(Arrays.asList(ids));
-    }
-
-    /**
-     * 删除陪聊引用服务项目信息
-     *
-     * @param id 陪聊引用服务项目主键
-     * @return 结果
-     */
-    @Override
-    public int deletePlayClerkServiceById(String id) {
-        return playClerkServiceMapper.deleteById(id);
-    }
-}

play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayServiceInfoServiceImpl.java

@@ -1,105 +0,0 @@
-package com.starry.admin.modules.commodity.service.impl;
-
-import com.starry.common.utils.IdUtils;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.starry.admin.modules.commodity.mapper.PlayServiceInfoMapper;
-import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
-import com.starry.admin.modules.commodity.service.IPlayServiceInfoService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 服务项目列表Service业务层处理
- *
- * @author admin
- * @since 2024-03-28
- */
-@Service
-public class PlayServiceInfoServiceImpl extends ServiceImpl<PlayServiceInfoMapper, PlayServiceInfoEntity> implements IPlayServiceInfoService {
-    @Resource
-    private PlayServiceInfoMapper playServiceInfoMapper;
-
-
-    /**
-     * 查询服务项目列表
-     *
-     * @param id 服务项目列表主键
-     * @return 服务项目列表
-     */
-    @Override
-    public PlayServiceInfoEntity selectPlayServiceInfoById(String id) {
-        return this.baseMapper.selectById(id);
-    }
-
-
-    @Override
-    public List<PlayServiceInfoEntity> selectPlayServiceInfoAll() {
-        return this.baseMapper.selectList(new LambdaQueryWrapper<>());
-    }
-
-    /**
-     * 查询服务项目列表列表
-     *
-     * @param playServiceInfo 服务项目列表
-     * @return 服务项目列表
-     */
-    @Override
-    public IPage<PlayServiceInfoEntity> selectPlayServiceInfoByPage(PlayServiceInfoEntity playServiceInfo) {
-        Page<PlayServiceInfoEntity> page = new Page<>(1, 10);
-        return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
-    }
-
-    /**
-     * 新增服务项目列表
-     *
-     * @param playServiceInfo 服务项目列表
-     * @return 结果
-     */
-    @Override
-    public boolean create(PlayServiceInfoEntity playServiceInfo) {
-        if (StrUtil.isBlankIfStr(playServiceInfo.getId())) {
-            playServiceInfo.setId(IdUtils.getUuid());
-        }
-        return save(playServiceInfo);
-    }
-
-    /**
-     * 修改服务项目列表
-     *
-     * @param playServiceInfo 服务项目列表
-     * @return 结果
-     */
-    @Override
-    public boolean update(PlayServiceInfoEntity playServiceInfo) {
-        return updateById(playServiceInfo);
-    }
-
-    /**
-     * 批量删除服务项目列表
-     *
-     * @param ids 需要删除的服务项目列表主键
-     * @return 结果
-     */
-    @Override
-    public int deletePlayServiceInfoByIds(String[] ids) {
-        return playServiceInfoMapper.deleteBatchIds(Arrays.asList(ids));
-    }
-
-    /**
-     * 删除服务项目列表信息
-     *
-     * @param id 服务项目列表主键
-     * @return 结果
-     */
-    @Override
-    public int deletePlayServiceInfoById(String id) {
-        return playServiceInfoMapper.deleteById(id);
-    }
-}

play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomFollowInfoController.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.follow.controller;
+package com.starry.admin.modules.custom.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
-import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
+import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
+import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/custom/entity/PlayCustomFollowInfoEntity.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.follow.module.entity;
+package com.starry.admin.modules.custom.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.starry.common.domain.BaseEntity;

play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomFollowInfoMapper.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.follow.mapper;
+package com.starry.admin.modules.custom.mapper;
 
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
+import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
 
 /**
  * 顾客关注陪聊信息Mapper接口

play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomFollowInfoService.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.follow.service;
+package com.starry.admin.modules.custom.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
+import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
 import com.starry.admin.modules.weichat.entity.PlayClerkFollowQueryVo;
 import com.starry.admin.modules.weichat.entity.PlayClerkFollowReturnVo;
 

play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java

@@ -2,7 +2,7 @@ package com.starry.admin.modules.custom.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
 
 import java.util.List;
 

play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomFollowInfoServiceImpl.java

@@ -1,6 +1,5 @@
-package com.starry.admin.modules.follow.service.impl;
+package com.starry.admin.modules.custom.service.impl;
 
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,11 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
-import com.starry.admin.modules.follow.mapper.PlayCustomFollowInfoMapper;
-import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
-import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
+import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
+import com.starry.admin.modules.custom.mapper.PlayCustomFollowInfoMapper;
+import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
 import com.starry.admin.modules.weichat.entity.PlayClerkFollowQueryVo;
 import com.starry.admin.modules.weichat.entity.PlayClerkFollowReturnVo;
+import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLeaveMsgServiceImpl.java

@@ -1,6 +1,5 @@
 package com.starry.admin.modules.custom.service.impl;
 
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +14,7 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
 import com.starry.admin.modules.custom.module.vo.PlayCustomLeaveMsgQueryVo;
 import com.starry.admin.modules.custom.module.vo.PlayCustomLeaveMsgReturnVo;
 import com.starry.admin.modules.custom.service.IPlayCustomLeaveMsgService;
+import com.starry.common.utils.IdUtils;
 import com.starry.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 

play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.starry.admin.modules.custom.mapper.PlayCustomLevelInfoMapper;
 import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
 import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
 import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 

play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
 import com.starry.admin.modules.custom.mapper.PlayCustomUserInfoMapper;
 import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
 import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
@@ -20,6 +19,7 @@ import com.starry.admin.modules.custom.module.vo.PlayCustomUserReturnVo;
 import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.impl.PlayOrderInfoServiceImpl;
+import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
 import com.starry.common.utils.IdUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRandomInfoMapper.java

@@ -1,7 +1,6 @@
 package com.starry.admin.modules.order.mapper;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity;
 

play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderEvaluateInfoService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity;
 import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo;
 import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateReturnVo;
-import com.starry.admin.modules.weichat.entity.evaluate.PlayCustomOrderEvaluateReturnVo;
 
 import java.util.List;
 

play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderRefundInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.starry.admin.modules.order.service.impl;
 
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,6 +11,7 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity;
 import com.starry.admin.modules.order.module.vo.PlayOrderRefundQueryVo;
 import com.starry.admin.modules.order.module.vo.PlayOrderRefundReturnVo;
 import com.starry.admin.modules.order.service.IPlayOrderRefundInfoService;
+import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayBalanceDetailsInfoController.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.balance.controller;
+package com.starry.admin.modules.personnel.controller;
 
-import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
-import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsQueryVo;
-import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
+import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
+import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo;
+import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayBalanceDetailsInfoMapper.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.balance.mapper;
+package com.starry.admin.modules.personnel.mapper;
 
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
+import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
 
 /**
  * 余额明细Mapper接口

play-admin/src/main/java/com/starry/admin/modules/personnel/module/entity/PlayBalanceDetailsInfoEntity.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.balance.module.entity;
+package com.starry.admin.modules.personnel.module.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayBalanceDetailsQueryVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.balance.module.vo;
+package com.starry.admin.modules.personnel.module.vo;
 
 import com.starry.common.domain.BasePageEntity;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayBalanceDetailsReturnVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.balance.module.vo;
+package com.starry.admin.modules.personnel.module.vo;
 
 import lombok.Data;
 

play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayBalanceDetailsInfoService.java

@@ -1,10 +1,10 @@
-package com.starry.admin.modules.balance.service;
+package com.starry.admin.modules.personnel.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
-import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsQueryVo;
-import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsReturnVo;
+import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
+import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo;
+import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsReturnVo;
 
 import java.math.BigDecimal;
 

play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayBalanceDetailsInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.balance.service.impl;
+package com.starry.admin.modules.personnel.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.starry.admin.modules.balance.mapper.PlayBalanceDetailsInfoMapper;
-import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
-import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsQueryVo;
-import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsReturnVo;
-import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
 import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
+import com.starry.admin.modules.personnel.mapper.PlayBalanceDetailsInfoMapper;
+import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
+import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo;
+import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsReturnVo;
+import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
 import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 

play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayClerkGiftInfoController.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.gift.controller;
+package com.starry.admin.modules.shop.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
-import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
+import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
+import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayGiftInfoController.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.gift.controller;
+package com.starry.admin.modules.shop.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
-import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
+import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
+import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayClerkGiftInfoMapper.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.gift.mapper;
+package com.starry.admin.modules.shop.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
+import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
 
 /**
  * 店员和礼物关系Mapper接口

play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayGiftInfoMapper.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.gift.mapper;
+package com.starry.admin.modules.shop.mapper;
 
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
+import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
 
 /**
  * 礼物Mapper接口

play-admin/src/main/java/com/starry/admin/modules/shop/module/constant/GiftConstant.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.gift.module.constant;
+package com.starry.admin.modules.shop.module.constant;
 
 /**
  * 礼物常量

play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayClerkGiftInfoEntity.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.gift.module.entity;
+package com.starry.admin.modules.shop.module.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.starry.common.domain.BaseEntity;

play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayGiftInfoEntity.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.gift.module.entity;
+package com.starry.admin.modules.shop.module.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoReturnVo.java

@@ -1,10 +1,7 @@
 package com.starry.admin.modules.shop.module.vo;
 
-import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author admin
  * @since 2024/8/18 下午7:59

play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java

@@ -1,12 +1,9 @@
 package com.starry.admin.modules.shop.module.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.starry.common.domain.BasePageEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayClerkGiftInfoService.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.gift.service;
+package com.starry.admin.modules.shop.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
+import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
 
 import java.util.List;
 

play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayGiftInfoService.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.gift.service;
+package com.starry.admin.modules.shop.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
+import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
 import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
 
 import java.util.List;

play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayClerkGiftInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.starry.admin.modules.gift.service.impl;
+package com.starry.admin.modules.shop.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.starry.admin.modules.gift.mapper.PlayClerkGiftInfoMapper;
-import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
-import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
+import com.starry.admin.modules.shop.mapper.PlayClerkGiftInfoMapper;
+import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
+import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService;
 import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 

play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayGiftInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.gift.service.impl;
+package com.starry.admin.modules.shop.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,10 +9,10 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.starry.admin.common.exception.CustomException;
 import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity;
 import com.starry.admin.modules.custom.service.impl.PlayCustomGiftInfoServiceImpl;
-import com.starry.admin.modules.gift.mapper.PlayGiftInfoMapper;
-import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
-import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
-import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
+import com.starry.admin.modules.shop.mapper.PlayGiftInfoMapper;
+import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
+import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
+import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
 import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
 import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;

play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java

@@ -1,7 +1,7 @@
-package com.starry.admin.modules.monitor.controller;
+package com.starry.admin.modules.system.controller;
 
 
-import com.starry.admin.modules.monitor.entity.Cache;
+import com.starry.admin.modules.system.entity.Cache;
 import com.starry.common.constant.CacheConstants;
 import com.starry.common.result.R;
 import com.starry.common.utils.StringUtils;

play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java

@@ -1,7 +1,7 @@
-package com.starry.admin.modules.monitor.controller;
+package com.starry.admin.modules.system.controller;
 
 
-import com.starry.admin.modules.monitor.entity.Server;
+import com.starry.admin.modules.system.entity.Server;
 import com.starry.common.result.R;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;

play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java

@@ -1,7 +1,7 @@
 package com.starry.admin.modules.system.controller;
 
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.service.ISysTenantService;
 import com.starry.admin.utils.SmsUtils;
 import com.starry.common.result.R;
 import lombok.extern.slf4j.Slf4j;

play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java

@@ -1,14 +1,14 @@
-package com.starry.admin.modules.platform.controller;
+package com.starry.admin.modules.system.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.ISysTenantService;
-import com.starry.admin.modules.platform.vo.SysTenantAddVo;
-import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
-import com.starry.admin.modules.platform.vo.SysTenantReturnVo;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.service.ISysTenantService;
+import com.starry.admin.modules.system.vo.SysTenantAddVo;
+import com.starry.admin.modules.system.vo.SysTenantQueryVo;
+import com.starry.admin.modules.system.vo.SysTenantReturnVo;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java

@@ -1,9 +1,9 @@
-package com.starry.admin.modules.platform.controller;
+package com.starry.admin.modules.system.controller;
 
-import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
-import com.starry.admin.modules.platform.service.ISysTenantPackageService;
-import com.starry.admin.modules.platform.vo.SimplePackage;
-import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
+import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
+import com.starry.admin.modules.system.service.ISysTenantPackageService;
+import com.starry.admin.modules.system.vo.SimplePackage;
+import com.starry.admin.modules.system.vo.SysTenantPackageVo;
 import com.starry.admin.utils.ExcelUtils;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;

play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java

@@ -1,12 +1,12 @@
-package com.starry.admin.modules.monitor.controller;
+package com.starry.admin.modules.system.controller;
 
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.starry.admin.common.domain.LoginUser;
-import com.starry.admin.modules.monitor.entity.UserOnline;
-import com.starry.admin.modules.monitor.service.UserOnlineService;
+import com.starry.admin.modules.system.entity.UserOnline;
+import com.starry.admin.modules.system.service.UserOnlineService;
 import com.starry.common.annotation.Log;
 import com.starry.common.constant.CacheConstants;
 import com.starry.common.enums.BusinessType;

play-admin/src/main/java/com/starry/admin/modules/system/entity/Cache.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 
 import com.starry.common.utils.StringUtils;

play-admin/src/main/java/com/starry/admin/modules/system/entity/Cpu.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 import com.starry.common.utils.Arith;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/system/entity/Jvm.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 import cn.hutool.core.date.DateUtil;
 import com.starry.common.utils.Arith;

play-admin/src/main/java/com/starry/admin/modules/system/entity/Mem.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 import com.starry.common.utils.Arith;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/system/entity/Server.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 
 import com.starry.common.utils.Arith;

play-admin/src/main/java/com/starry/admin/modules/system/entity/Sys.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 import lombok.Data;
 

play-admin/src/main/java/com/starry/admin/modules/system/entity/SysFile.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 import lombok.Data;
 

play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantEntity.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.entity;
+package com.starry.admin.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantPackageEntity.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.entity;
+package com.starry.admin.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

play-admin/src/main/java/com/starry/admin/modules/system/entity/UserOnline.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.monitor.entity;
+package com.starry.admin.modules.system.entity;
 
 import lombok.Data;
 

play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java

@@ -1,11 +1,11 @@
-package com.starry.admin.modules.platform.mapper;
+package com.starry.admin.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
-import com.starry.admin.modules.platform.vo.TenantResultVo;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.vo.SysTenantQueryVo;
+import com.starry.admin.modules.system.vo.TenantResultVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java

@@ -1,11 +1,11 @@
-package com.starry.admin.modules.platform.mapper;
+package com.starry.admin.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
-import com.starry.admin.modules.platform.vo.SimplePackage;
-import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
+import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
+import com.starry.admin.modules.system.vo.SimplePackage;
+import com.starry.admin.modules.system.vo.SysTenantPackageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java

@@ -1,10 +1,10 @@
-package com.starry.admin.modules.platform.service;
+package com.starry.admin.modules.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
-import com.starry.admin.modules.platform.vo.SimplePackage;
-import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
+import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
+import com.starry.admin.modules.system.vo.SimplePackage;
+import com.starry.admin.modules.system.vo.SysTenantPackageVo;
 
 import java.util.List;
 

play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantService.java

@@ -1,9 +1,9 @@
-package com.starry.admin.modules.platform.service;
+package com.starry.admin.modules.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.vo.SysTenantQueryVo;
 import com.starry.common.result.R;
 
 import java.util.List;

play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java

@@ -1,8 +1,8 @@
-package com.starry.admin.modules.monitor.service;
+package com.starry.admin.modules.system.service;
 
 
 import com.starry.admin.common.domain.LoginUser;
-import com.starry.admin.modules.monitor.entity.UserOnline;
+import com.starry.admin.modules.system.entity.UserOnline;
 
 /**
  * @author admin

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java

@@ -8,13 +8,9 @@ import com.starry.admin.common.exception.ServiceException;
 import com.starry.admin.common.security.entity.JwtUser;
 import com.starry.admin.manager.AsyncManager;
 import com.starry.admin.manager.factory.AsyncFactory;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
 import com.starry.admin.modules.system.entity.SysUserEntity;
-import com.starry.admin.modules.system.service.LoginService;
-import com.starry.admin.modules.system.service.SysMenuService;
-import com.starry.admin.modules.system.service.SysRoleService;
-import com.starry.admin.modules.system.service.SysUserService;
+import com.starry.admin.modules.system.service.*;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.constant.Constants;
 import com.starry.common.constant.UserConstants;

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.starry.admin.modules.system.service.impl;
 
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +10,7 @@ import com.starry.admin.modules.system.mapper.SysAdministrativeAreaDictInfoMappe
 import com.starry.admin.modules.system.service.ISysAdministrativeAreaDictInfoService;
 import com.starry.admin.modules.system.vo.AdministrativeAreaQueryReturnVo;
 import com.starry.common.utils.ConvertUtil;
+import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantPackageServiceImpl.java

@@ -1,17 +1,17 @@
-package com.starry.admin.modules.platform.service.impl;
+package com.starry.admin.modules.system.service.impl;
 
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
-import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper;
-import com.starry.admin.modules.platform.service.ISysTenantPackageService;
-import com.starry.admin.modules.platform.service.ISysTenantService;
-import com.starry.admin.modules.platform.vo.SimplePackage;
-import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
+import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
+import com.starry.admin.modules.system.mapper.SysTenantPackageMapper;
+import com.starry.admin.modules.system.service.ISysTenantPackageService;
+import com.starry.admin.modules.system.service.ISysTenantService;
+import com.starry.admin.modules.system.vo.SimplePackage;
+import com.starry.admin.modules.system.vo.SysTenantPackageVo;
+import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantServiceImpl.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.service.impl;
+package com.starry.admin.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
@@ -13,18 +13,12 @@ import com.starry.admin.common.domain.LoginUser;
 import com.starry.admin.common.exception.CustomException;
 import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService;
 import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
-import com.starry.admin.modules.platform.mapper.SysTenantMapper;
-import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper;
-import com.starry.admin.modules.platform.service.ISysTenantService;
-import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
 import com.starry.admin.modules.shop.service.IPlayCommodityInfoService;
-import com.starry.admin.modules.system.entity.SysRoleEntity;
-import com.starry.admin.modules.system.entity.SysRoleMenuEntity;
-import com.starry.admin.modules.system.entity.SysUserEntity;
+import com.starry.admin.modules.system.entity.*;
 import com.starry.admin.modules.system.mapper.*;
+import com.starry.admin.modules.system.service.ISysTenantService;
 import com.starry.admin.modules.system.service.SysRoleMenuService;
+import com.starry.admin.modules.system.vo.SysTenantQueryVo;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.constant.CacheConstants;
 import com.starry.common.redis.RedisCache;

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/UserOnlineServiceImpl.java

@@ -1,9 +1,9 @@
-package com.starry.admin.modules.monitor.service.impl;
+package com.starry.admin.modules.system.service.impl;
 
 
 import com.starry.admin.common.domain.LoginUser;
-import com.starry.admin.modules.monitor.entity.UserOnline;
-import com.starry.admin.modules.monitor.service.UserOnlineService;
+import com.starry.admin.modules.system.entity.UserOnline;
+import com.starry.admin.modules.system.service.UserOnlineService;
 import com.starry.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 

play-admin/src/main/java/com/starry/admin/modules/system/vo/SimplePackage.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantAddVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import com.starry.common.domain.BaseEntity;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageAddVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import com.starry.common.domain.BaseEntity;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantQueryVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import com.starry.common.domain.BasePageEntity;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantReturnVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import lombok.Data;
 

play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantResultVo.java

@@ -1,4 +1,4 @@
-package com.starry.admin.modules.platform.vo;
+package com.starry.admin.modules.system.vo;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java

@@ -12,8 +12,6 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
 import com.starry.admin.modules.clerk.service.*;
 import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl;
 import com.starry.admin.modules.clerk.service.impl.PlayClerkUserReviewInfoServiceImpl;
-import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
-import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo;
 import com.starry.admin.modules.order.module.vo.PlayOrderStateEditVo;
@@ -21,6 +19,8 @@ import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
 import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
 import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
+import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
+import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
 import com.starry.admin.modules.statistics.service.IPlayClerkPerformanceService;
 import com.starry.admin.modules.weichat.entity.*;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkLevelAndRankingVo;

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java

@@ -1,7 +1,6 @@
 package com.starry.admin.modules.weichat.controller;
 
 import cn.hutool.core.io.FileUtil;
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.starry.admin.common.exception.CustomException;
 import com.starry.admin.common.oss.service.IOssFileService;
@@ -10,6 +9,7 @@ import com.starry.admin.modules.weichat.service.WxAccessTokenService;
 import com.starry.admin.modules.weichat.utils.WxFileUtils;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.result.R;
+import com.starry.common.utils.IdUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.web.bind.annotation.*;

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java

@@ -16,14 +16,10 @@ import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity;
 import com.starry.admin.modules.custom.module.entity.PlayCustomLeaveMsgEntity;
 import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
+import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
 import com.starry.admin.modules.custom.service.IPlayCustomGiftInfoService;
 import com.starry.admin.modules.custom.service.IPlayCustomLeaveMsgService;
 import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
-import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
-import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
-import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
-import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
-import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity;
 import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
@@ -32,10 +28,14 @@ import com.starry.admin.modules.order.service.IPlayOrderComplaintInfoService;
 import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
 import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService;
+import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
 import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity;
+import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
 import com.starry.admin.modules.shop.module.vo.PlayCommodityInfoVo;
+import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService;
 import com.starry.admin.modules.shop.service.IPlayCommodityInfoService;
 import com.starry.admin.modules.shop.service.IPlayCouponInfoService;
+import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
 import com.starry.admin.modules.weichat.entity.*;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
 import com.starry.admin.modules.weichat.entity.costom.PlayCustomHideLevelStateEditVo;

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java

@@ -6,7 +6,7 @@ import com.starry.admin.common.aspect.ClerkUserLogin;
 import com.starry.admin.common.aspect.CustomUserLogin;
 import com.starry.admin.common.conf.ThreadLocalRequestDetail;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
+import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
 import com.starry.admin.modules.weichat.entity.PlayGiftInfoDto;
 import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java

@@ -8,7 +8,10 @@ import com.starry.admin.modules.weichat.entity.PlayGroupWagesReturnVo;
 import com.starry.common.result.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java

@@ -17,8 +17,7 @@ import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
 import com.starry.admin.modules.order.service.impl.PlayOrderInfoServiceImpl;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.impl.SysTenantServiceImpl;
+import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
 import com.starry.admin.modules.weichat.service.WxCustomMpService;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.result.R;

play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoGiftAdd.java

@@ -1,7 +1,7 @@
 package com.starry.admin.modules.weichat.entity;
 
 
-import com.starry.admin.modules.gift.module.constant.GiftConstant;
+import com.starry.admin.modules.shop.module.constant.GiftConstant;
 import lombok.Data;
 
 import javax.validation.constraints.Max;

play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRandomAdd.java

@@ -1,7 +1,7 @@
 package com.starry.admin.modules.weichat.entity;
 
 
-import com.starry.admin.modules.gift.module.constant.GiftConstant;
+import com.starry.admin.modules.shop.module.constant.GiftConstant;
 import lombok.Data;
 
 import javax.validation.constraints.Max;

play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoCommodityAdd.java

@@ -1,7 +1,7 @@
 package com.starry.admin.modules.weichat.entity.order;
 
 
-import com.starry.admin.modules.gift.module.constant.GiftConstant;
+import com.starry.admin.modules.shop.module.constant.GiftConstant;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 

play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java

@@ -7,7 +7,6 @@ import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.common.play.wx.WeChatConstants;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
@@ -16,8 +15,8 @@ import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity;
 import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService;
-import com.starry.admin.modules.platform.entity.SysTenantEntity;
-import com.starry.admin.modules.platform.service.impl.SysTenantServiceImpl;
+import com.starry.admin.modules.system.entity.SysTenantEntity;
+import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
 import com.starry.admin.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -54,6 +53,12 @@ public class WxCustomMpService {
     private IPlayClerkUserInfoService clerkUserInfoService;
 
 
+    /**
+     * 支付成功回调地址
+     */
+    public static String NOTIFY_URL = "https://july.hucs.top/api/wx/pay/jsCallback";
+
+
     public WxMpService proxyWxMpService() {
         String tenantId = SecurityUtils.getTenantId();
         if (StrUtil.isBlankIfStr(tenantId)) {
@@ -87,7 +92,7 @@ public class WxCustomMpService {
         payConfig.setMchId(StringUtils.trimToNull(entity.getMchId()));
         payConfig.setMchKey(StringUtils.trimToNull(entity.getMchKey()));
 
-        payConfig.setNotifyUrl(StringUtils.trimToNull(WeChatConstants.NOTIFY_URL));
+        payConfig.setNotifyUrl(StringUtils.trimToNull(NOTIFY_URL));
         payConfig.setTradeType("JSAPI");
         payConfig.setSignType("MD5");
         // 可以指定是否使用沙箱环境