修改支付商户

pom.xml

@@ -226,29 +226,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
\ No newline at end of file

soss-admin/src/main/resources/apiclient_cert.pem

 -----BEGIN CERTIFICATE-----
-MIID6TCCAtGgAwIBAgIUY1A0gVLJqFAXYGiYwe6SS717wxMwDQYJKoZIhvcNAQEL
+MIID6TCCAtGgAwIBAgIUaGmhkcyIbVybvLR8joPoRCP03swwDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjIwNTA3MDY1NDAzWhcNMjcwNTA2MDY1NDAzWjB7MRMwEQYDVQQDDAox
-NjI1NTExMjU3MRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM
-HuWMl+S6rOWlvemlruenkeaKgOaciemZkOWFrOWPuDELMAkGA1UEBgwCQ04xETAP
+Q0EwHhcNMjIxMjEyMDcxOTAzWhcNMjcxMjExMDcxOTAzWjB7MRMwEQYDVQQDDAox
+NjM1NDcyNDE2MRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM
+Hua3seWcs+WlvemlruenkeaKgOaciemZkOWFrOWPuDELMAkGA1UEBgwCQ04xETAP
 BgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-7pKD1B7URk6wzW06tWdtKynjuDF8GB+Q6DWUygziXONpjLyN9xkGeowC3dQvBQvH
-4zhI5sYv2xUvBGhkgAUffimcsmVwZ/VP5o3ZThC0lYLkmqc4xl37cHMX8PbFUtmA
-tlVg2UntiqP7K5qQev8+cULeWT0R5i48eIXv+vptzUbak/3s7mn/Bjlrl6n5l0kY
-07XG8ycEbNp8dsD1dGQEfIx/RuMyHdWFSxBIXsTU4rjnVBkVbkb6mgqeNlWLHKp6
-2zW9mh92vWXIRJNbaihn5KQq7JJODZUh5ba6PZFzxcySxGN5bpfcR7vNB32BvwQZ
-xryP5oPRhcRoy6mwUY0g5wIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1
+xeU5Y7VfwbTFSX2PxhUfm2gF0UXLfz8WY0UWdreRUlSg3DSEX+4YfJKHHIMjXlVJ
+Bog0Vk41KsYb7+tAOCQTnAR0h2YpfSKvK8OtRadNvTRy9a+FR9GFbHFQDmjtixep
+YMlSQsLcLROfbyJX06TbV2IpQu1i/IoE2lqM67kG36MVVzOdR2+Bd68J+cITZVVl
+TgXlbxa7VVJLxzapmlxvwVzy2nBOLs9Lfx1nHYWjmSpPNhfSZmF9+NhNwJa7DGmY
+IrFDHJKU36k8peiETeZFWRuEywTd7UrJDrR9+LMUmeBKozd28xjrFafv7NomT6yf
+R3fpmjeiBvU4QWLOmm6KewIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC
+A/gwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1
 YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw
-MUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQCx7nNyOMU5pk8ks5L1d8tBl7Sb
-b7avp5W3fR6LEtY7/JYJpH1SIyMGmFv0Qoq+sbnVzTzc3HMnE3yswKoT4J58MFuV
-glvYTPuGIN7GUQ6xvGel1MG9zT6PfDJG5+yc8HeE6Z9kkYKSdbZD8vqeIgsJUO0u
-LpFBx5FseR9wfe0x2xDk+mdrge+HR+VMUTHO5H8Awpi4IDNmLqU7RgNyLTSePV49
-GvI1qk+g8iex+NftC8U/lj8AUEBoBGh+7e+zNHUirBJzbcVvHu8h9HBqwGPF2Zji
-IU4S4joAZPpZVyqkg7yviAAOCsvRoAvEJxB1u8QGhJL0mvwrDk4eR5gpeDOc
+MUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQAC4hxw8PK0iLW2pOjhpEIj8jzj
+VfUxRYZr3jSQCDUF1qAR9HaF8PkceMAlHbyE58JXcRkpDeIjW/Qzqci+zWE3Yc7e
+B7MNK05xsetqMMxHPqBZZ3zELBIFEbOw+I2l+R0Z6FP6Tpxtwhr6ADWgQtuVzYad
+HKflY0sWWkAiY7DPJtnY3ENeW6PxmOOfiLyQIY5b4tAX4y8gcvW9ajDRs55NkBUp
+K7pB9vgtZy7ZncnHRNz+wgyLF1yWE+xEaV+b44i6XwFk9aFNytkRFo0Ez+5Hmvp1
+/WcCgbgCewALdboWJFLw2AQxAFTlGX6677vq07NqGoFXo9byC33nidnE/l4j
 -----END CERTIFICATE-----

soss-admin/src/main/resources/apiclient_key.pem

 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDukoPUHtRGTrDN
-bTq1Z20rKeO4MXwYH5DoNZTKDOJc42mMvI33GQZ6jALd1C8FC8fjOEjmxi/bFS8E
-aGSABR9+KZyyZXBn9U/mjdlOELSVguSapzjGXftwcxfw9sVS2YC2VWDZSe2Ko/sr
-mpB6/z5xQt5ZPRHmLjx4he/6+m3NRtqT/ezuaf8GOWuXqfmXSRjTtcbzJwRs2nx2
-wPV0ZAR8jH9G4zId1YVLEEhexNTiuOdUGRVuRvqaCp42VYscqnrbNb2aH3a9ZchE
-k1tqKGfkpCrskk4NlSHltro9kXPFzJLEY3lul9xHu80HfYG/BBnGvI/mg9GFxGjL
-qbBRjSDnAgMBAAECggEALiMDf4gewSICqxeOnPpNcGV/dmWLfBbOrTl/drubIx+P
-j/n+8mRSjmx5OXEJTs6Cb3y5DHgTVSj5mL6fgOp8tqdReGaJoHEebJXOCnzMj4Vq
-tEXWgvY14/8+CAmRC36ol5pXSm4zk/Y2Yq5XdpHZ/4lQ+q0Gwx757szoJf88MNA9
-Yv5YEkW4glGlZLeP1sJD0UXZJrkC0FidQas0VhD7LuPbvmn49+gSU8PqpOg8IHSq
-LaVlesP/sMdBE0zVI3Q2Qa2Ilzre5GdTEWDHtWPD0i+9oHT/B4MfCl4cNfkKrPrr
-3mv2knhQyQbPVvStU5s8s4cguvlQ3m12JHO9ljBEQQKBgQD9kxzEJnWbnbd2evk4
-liZYViF37rM22ZoUdjMt7663mqr3xKmQmJyVe31wBk5a3LkJKE4yn90GYIJwrDuP
-JeIBlXq0Az0gFQ4WbVYEdaAyRy02Blnjg6v7XTZgqN4KzPGoYsX4FiKpLAjb8uU+
-QXXnWIcHqQSOki4aUoMmxHj9MQKBgQDw2qs09/3dsPABqx0CKM3dYlupnimFZcZ+
-f3lWinVdsLyDI+b9YxsUAqv21EOOAZ7cOcdZP71oB3XMxp56zo9lzY1C8EuIFB6A
-lPM6eK73fAY15ShO0M48CPusHJLBcUnpQ3EMOVVr9gQiNXAP7/NEB0eBAcnWuznI
-zJL2v1YZlwKBgAiBJJfXil47vel1WmJxdrvDt7+j+9K9HZPOGw1RWpTB1TYWHHHD
-DI1e5Oga7gnSGUqbVXQRNIKAPh+1RxIX/Sp8bu8WpLgsvJo39IiVwVeuV2/WarFc
-uynlCGvZfgjysrApD+awJ11xIqLt1I5v95pYt76kBokZkf5EAi4MrNohAoGAA7RZ
-TcdCsFY4Ws429AGMqQsKPeGg4dxe4TM0upAGnhpJy/qRYvRTRkuEOZeqMlT0DI8W
-8dh5IVB8D1o+tcTXj8lJku3/O2iTz4Z69ztD9aqCrfGIXS34/hNlS5Bk8XS8nknb
-Q0Tee3qdNal8v8IBC9rQzrsoT5UxnlUHLaRjvqECgYB576KkTxeFv1CpDWYx0xdh
-fmT8dasjt0x2g4nbjtF7gYjsxyFpcsqp5BPb5CibveV0DRe4aiwow9vsF73GY+tB
-EHcbEHtL/G05TRZU2Jlcl+Kp7G2Vw79XXHTOjaFG4c7kanQNEphiN/TxqcgsoBMs
-c1aZ1izfTzyR4a2AWL5xeQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDF5TljtV/BtMVJ
+fY/GFR+baAXRRct/PxZjRRZ2t5FSVKDcNIRf7hh8koccgyNeVUkGiDRWTjUqxhvv
+60A4JBOcBHSHZil9Iq8rw61Fp029NHL1r4VH0YVscVAOaO2LF6lgyVJCwtwtE59v
+IlfTpNtXYilC7WL8igTaWozruQbfoxVXM51Hb4F3rwn5whNlVWVOBeVvFrtVUkvH
+NqmaXG/BXPLacE4uz0t/HWcdhaOZKk82F9JmYX342E3AlrsMaZgisUMckpTfqTyl
+6IRN5kVZG4TLBN3tSskOtH34sxSZ4EqjN3bzGOsVp+/s2iZPrJ9Hd+maN6IG9ThB
+Ys6abop7AgMBAAECggEBAIrz7f0OAKOhy5lTmd1LPbtAKj2MVVwOryia/S/0qwx1
+MdIM6hn1s6nctRQXHIGDPthgUOd82KYlHr6yn5AL/Nzi3/Omj2E3NmpzZjnvRI2i
+w0mxqdMI0jeXxM+pa4nr3lmAYstPyYu5KIy/P43zRrQvz6sXxhZuzwOG60Yk0Ce8
+PeDDf1/edA6+kHalwt44uLltK8fQLkjPthRki3szDVD9waqW7FhmYV9rFjhlFA77
+/yxO5hq5HYjuFju0D5LlVZJCr3lCCOWtyhPCppELijVG3j2j2pZ5OibSyGGOuOI/
+NEPRw/UC6vJzlKmkpky5jh2E4gCZU5peTcOJY6HostECgYEA6J1YV+PE1b28K1XU
+ouCE/UW5lEYGsYHDQN8va6Y0RCOAVpCtOK+YOyQIe8yf65ACssVrfPMifBVttW97
+8kPMHBOMp8uR3NucZ45S4EcO+yUgs7t6GdDrULi3p3GduqXOFCfsEkrDYkm9OBqk
+cPIlHTafTJRxHuvvAJ+uLCKNkUMCgYEA2cpVIDKSnyWeyAZgpOg9vrvEKytuyiOt
+73lNHEaZmbHWsuI+ucDHSkT4nag7U+6QAMDcNUOKcUHMKpcWamp+GDsAZFpKW4Y3
+/iUr2Y6hr/iSAPkwUaQy0+kqwVSDgU1Dy1+6l0W+lXHzuWOBt99L43iFb4Y7iaTb
+kcLmb2Qn0mkCgYAYlThW4X1V0V1nfwSfyfaEBbBdGSFv9PS7kFqkl8YCRXY0r8l+
+qh/+cApteuyTqn5+ghqf89n7HxCfEg8ZRUz20qIUwZDCtHrM/t+HUDsnE39nPzLi
+M5AK0dqm2Xz/0rH6s1VhgYEwi/ZxTW9/eDev5KvlHfLuf6ScfkOb6nLnnQKBgQCZ
+JeuoYYezO9wk4j8xl1Jb/mOay8bzhBV6sXzk5kx6xJCqZ+gd7Q73DfsZukRF6BsB
+PJ1dIyqGK/Oq+2W63TngRhUnfEqPg5l6MJ9eNCtEt/HLl28/6cwIMg1rt8dltHR4
+3c8zMssrAd+WPP/p0a7mvUhvvR++0dvI6xnpuK88CQKBgBuQvTO6IdbZuP2meu6R
+gVs55z4IHv2OCbsrnutrOvn7k3yRXzWrUdLIXMFT2So9lEQt3W45lPRL3lPO4PFy
+Kbevr23OjFYYnWS+Qac5O6Nu48y46b9WBiEX3zMFEqxG9DHuBBeF6hABIYanO7i8
+v0eamA1hA3wVfjd+axYKtPx2
 -----END PRIVATE KEY-----

soss-admin/src/main/resources/application.yml

@@ -80,8 +80,8 @@ oss:
 weixin:
   appid: wx71aa3662dfd3227d
   secret: da8a0b08436dd3ce560be429f14e768a
-  mchid: 1625511257
-  key: WcCsQZXavaPXQEKuTGJlGOkzzTPxTPsr
+  mchid: 1635472416
+  key: GlW0vXx44Z1P9ZwEjJ7i0aMSRbAreaQa
   notify-url: https://hooloo-dev-api.gdatac.com/weixin/native/notify
   trade-type: JSAPI
   url: https://api.mch.weixin.qq.com/pay/unifiedorder

soss-admin/src/main/resources/wxpay.properties

-
-wxpay.mch-id=1625511257
-wxpay.mch-serial-no=da8a0b08436dd3ce560be429f14e768a
-wxpay.private-key-path=apiclient_key.pem
-wxpay.api-v3-key=xRu8KoCwVWbKZ8tlca3JfAZkMSV2p7tY
-wxpay.appid=wx71aa3662dfd3227d
-wxpay.domain=https://api.mch.weixin.qq.com
-wxpay.notify-domain=https://500c-219-143-130-12.ngrok.io
-wxpay.partnerKey: T6m9iK73b0kn9g5v426MKfHQH7X8rKwb
-
-
-appid: wx71aa3662dfd3227d
-secret: da8a0b08436dd3ce560be429f14e768a
-mchid: 1625511257
-#??????
-key: WcCsQZXavaPXQEKuTGJlGOkzzTPxTPsr
-#??????
-notify-url: http://127.0.0.1/weixin/wxNotify
-#????
-trade-type: JSAPI
-url: https://api.mch.weixin.qq.com/pay/unifiedorder
-query-url: https://api.mch.weixin.qq.com/pay/orderquery
-cert-path: zzz
\ No newline at end of file

soss-system/src/main/java/com/soss/system/config/WeChatPayConfig.java

@@ -14,9 +14,6 @@ public class WeChatPayConfig {
 
     @Value("${weixin.appid}")
     private String appid;
-
-    @Value("${weixin.secret}")
-    private String secret;
     @Value("${weixin.mchid}")
     private String mchId;
     @Value("${weixin.key}")

soss-system/src/main/resources/mapper/system/CustomerMapper.xml

@@ -107,46 +107,46 @@
             #{id}
         </foreach>
     </delete>
+
     <select id="selectCustomerByQuery" resultType="com.soss.system.domain.vo.customer.CustomerResultVo">
-        select * from (select
-        c.id ,
-        c.user_name as userName,
-        c.phone as phoneNumber,
-        (select count(*) from `order` o where o.user_id = c.id) as orderCount,
-        (select sum(o.amount) from `order` o where o.user_id = c.id) as amount,
-        (select count(*) from `order` o where o.user_id = c.id and o.state in ('8','9','10','11')) as cancelCount,
-        (select sum(o.amount) from `order` o where o.user_id = c.id and o.state in ('8','9','10','11')) as cancelAmount,
-        (select count(*) from `order` o where o.user_id = c.id and o.state in ('12','14','15')) as refundCount,
-        (select sum(o.amount) from `order` o where o.user_id = c.id and o.state in ('12','14','15')) as refundAmount,
-        (select o.created_at  from `order` o where o.user_id = c.id order by o.created_at desc limit 1) as lastOrderDate,
-        c.create_time as createDate,
-        c.soucre as source
-        from
-        customer c ) a
+        SELECT
+        c.id,
+        c.user_name AS userName,
+        c.phone AS phoneNumber,
+        count( o.id ) orderCount,
+        sum( o.paid_amount ) amount,
+        count( CASE WHEN o.state IN ( '8', '9', '10', '11' ) THEN 1 END ) cancelCount,
+        sum( CASE WHEN o.state IN ( '8', '9', '10', '11' ) THEN o.paid_amount END ) cancelAmount,
+        count( CASE WHEN o.state IN ( '12', '14', '15' ) THEN 1 END ) refundCount,
+        sum( CASE WHEN o.state IN ( '12', '14', '15' ) THEN o.paid_amount END ) refundAmount,
+        max( o.created_at ) lastOrderDate,
+        c.create_time AS createDate,
+        c.soucre AS source
+        FROM
+        customer c
+        LEFT JOIN `order` o ON c.id = o.user_id
         <where>
             <if test="userInfo != null and userInfo != ''">
-                and ((a.userName like concat('%', #{userInfo}, '%')) or (a.phoneNumber like concat('%', #{userInfo}, '%') ))
+                and (c.user_name like concat('%', #{userInfo}, '%') or c.phone like concat('%', #{userInfo}, '%') )
+            </if>
+            <if test="createAtStart != '' and createAtStart != null">
+                and c.create_time &gt;= #{createAtStart}
+            </if>
+            <if test="createAtEnd != '' and createAtEnd != null">
+                and c.create_time &lt;= #{createAtEnd}
             </if>
+        </where>
+        GROUP BY c.id
         <if test="buyRecords != null and buyRecords != ''">
-                and
             <if test='buyRecords == "1"'>
-                    a.orderCount >0
+                HAVING count(o.id) > 0
             </if>
             <if test='buyRecords == "2"'>
-                    a.orderCount =0
+                HAVING count(o.id) = 0
             </if>
             <if test='buyRecords == "3"'>
-                    a.orderCount >1
+                HAVING count(o.id) > 1
             </if>
         </if>
-            <if test="createAtStart !='' and createAtStart!=null">
-                and createDate &gt;=#{createAtStart}
-
-            </if>
-            <if test="createAtEnd !='' and createAtEnd!=null">
-                and createDate &lt;=#{createAtEnd}
-
-            </if>
-        </where>
     </select>
 </mapper>
\ No newline at end of file