From e30e69f8b8dbfa49a4aa9dd97b2333023fa6c739 Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Sun, 25 Jan 2026 19:07:24 +0800 Subject: [PATCH] change alipay --- app/main/api/desc/admin/admin_complaint.api | 1 - app/main/api/etc/main.yaml | 8 +- .../etc/merchant/alipayCertPublicKey_RSA2.crt | 26 +++--- .../appCertPublicKey_2021006129617228.crt | 23 +++++ .../merchant/bak/alipayCertPublicKey_RSA2.crt | 43 +++++++++ .../api/etc/merchant/bak/alipayRootCert.crt | 88 +++++++++++++++++++ .../appCertPublicKey_2021006115614672.crt | 0 .../admingetcomplaintdetaillogic.go | 5 +- .../service/alipayComplaintService.go | 2 - app/main/api/internal/types/types.go | 1 - app/main/model/complaintAlipayModel_gen.go | 15 ++-- deploy/script/gen_models.ps1 | 4 +- deploy/sql/complaint_system_migration.sql | 1 - 13 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 app/main/api/etc/merchant/appCertPublicKey_2021006129617228.crt create mode 100644 app/main/api/etc/merchant/bak/alipayCertPublicKey_RSA2.crt create mode 100644 app/main/api/etc/merchant/bak/alipayRootCert.crt rename app/main/api/etc/merchant/{ => bak}/appCertPublicKey_2021006115614672.crt (100%) diff --git a/app/main/api/desc/admin/admin_complaint.api b/app/main/api/desc/admin/admin_complaint.api index a8ee082..8d65dd5 100644 --- a/app/main/api/desc/admin/admin_complaint.api +++ b/app/main/api/desc/admin/admin_complaint.api @@ -113,7 +113,6 @@ type ( ComplainAmount string `json:"complain_amount"` // 投诉单涉及交易总金额 GmtComplain string `json:"gmt_complain"` // 投诉时间 GmtProcess string `json:"gmt_process"` // 处理时间 - GmtOverdue string `json:"gmt_overdue"` // 过期时间 ComplainContent string `json:"complain_content"` // 用户投诉内容 TradeNo string `json:"trade_no"` // 投诉交易单号 Status string `json:"status"` // 投诉状态 diff --git a/app/main/api/etc/main.yaml b/app/main/api/etc/main.yaml index f118151..1635562 100644 --- a/app/main/api/etc/main.yaml +++ b/app/main/api/etc/main.yaml @@ -22,10 +22,10 @@ VerifyCode: Encrypt: SecretKey: "ff83609b2b24fc73196aac3d3dfb874f" Alipay: - AppID: "2021006115614672" - PrivateKey: "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJzOKCuHfM2/VYSroIm2TcO/Eoych6wF1FUtPeAoTva+YgHMrEDXt/OvqfNMylvtZYZya4hocZ9KTDA0FwHmFT9RP0tu0hXzNcKLx2U31iwi6Y29f0EwSYHvLIDjLw0XbxownR7iHvoCaXLtHz2S4tcJNB5sew3asOEAMTAKq1z679R/3WETVRPsNl211vhkxUpcL4Ct97s/lVL/cwRFFEi2LajfCVZLqzrlkaQJucGcFQBdbzDd3gDrGtpmQvtmDWoAasg0/Kt7UJ6FPZKbbb9fc0yZAMSkD00jyVfYwq56TGXAP4P+NGhGGd0gbTGHPPA4Dr9zxSuQNAqiYn/mEPAgMBAAECggEBAIfpeOkHqpAL2LsFYTQozI5TxMFu3Zpm8qqc9VrCIZxK9GvOWHYginuPUnpliitbU2uo1XhUCqvdjBZXm/wSSgTMvAsGJMFkJ+g6+2tKIdmg5NdIwbJ+GIsH1QYOIhr1SIHIB/YexzZni3YpL3hnXmV2O4eYEgg501oeSKPEwDTAHy+rbj45ddmvbI/UQcAtl+TdbIt5JtCkCBe0emDT9xIuHYynfb2nuDm+x39k7RvOhLdm2JfR99nl20yFjTB6j7NoP77KXk6mw75PH/Mv2swyxUueRjUrXJUM1kU+PIUtIDklivdaseumL8nueiS2Eblg8zwE9UyvhiN/yDFcs0kCgYEA+QKrOw4kVnkRzqWp4KctWPtMm9fpuvzvIdnTWvRxRppP9wuoDrS9JXGldUnX9exQNExWay9CQlGzg+kkP28eFgY0Aj5muyrTT7IiMu31oOgeNnYiCTtGx2Li+Yo06h6MyRyrlbdgUQCZ5Geq3pE0N1uOPBSOGlFGxKCS6m/BkZ0CgYEAz3b5o+wCBycRyzvgWY66yzYZxQQDdQt67gt8JkHI3onufkyq7iYytHhYNpI/zTtOGoUTq+tEFBPzquQ+/pVRWmYHlIt4SZGIA29c3BEbTxA8UFXdcu0ZV3/RuKot9fhHIWMeK05lDzG81fvGnMONTilDKooNEGNDDVx4fLNR45sCgYEA8Myz6Zfza+wIXF23uZfxMmtR2iMh08FlPsb2rK5WHIB9c9nB2vbNMriD2LhgL2Em7mwj5eL9oESB5L5AX1eFMKcvBDxz++ueDSOmDrovHjtZfDEhGOxJtebat5X/Naf1XUZsZ4u9iJecOlRF2JVyeVYAZfk6shiG5v6hFDSea8ECgYAWPdkRm9Gz1ppvwWGR+F1KP+iPWJjOSYbKUmzi5RaV1Q++dpW0pl+1PVmnsBIq/HqpGS88tSI9TM5IueOPA48PM/UIFdO1f2anh57a8PKOjV0J98qf8Y9P9CIVvBjlT9LAX5Hybpsi/+AQyMdIMybJBF9xBg/Ue+/KVOmN5OOYlQKBgQCKS73P9EXgEjUfI5YxOvr1zEw/go6hFnt6G2i4lEtGUg9FKvNCz082TL6fYVADyoTL4LR8VuOHTNd4XsRTlQEYwWWUNAQxapLtTqRCQDsQhQh9aMJc9a/FAl9k6Zn9fInAy0BLstJBMRLVvTvLXT2EsAfYZVuTuwi0aEQSxkiFjA==" - AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB" - AppCertPath: "etc/merchant/appCertPublicKey_2021006115614672.crt" + AppID: "2021006129617228" + PrivateKey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQChnB4yOExQu8YF1cIdzIKMVE+sSwH7QFq73H1Tam0W6dvO4g3sXsOP/ddQHoIYz8rbwcgtGYZtIl0huJ2/jCRl60ZY6mv2B3NHl9C9HYqzx9xXxOhUwlaIQEV5ZregQ4KfCGHgpUA7SG/kXj9oUkSOD7AWwbJi2AVmN4YlD2TILzN8MwaYhNvpdfJvno7Z+HXMAO23SkHifjLZFLSxQQLXXOsK5DKsmQUrd24aNKyuyT4oH9eB+/MIbpLZrPPcdNmL/Wefs8Mb9/DXgZ3jd7GGVIubxSU5O4KLbJ/thFukfQGgbv8LML6ksKmLunXk5qPv3LA2rCedFF8fn4BkT63lAgMBAAECggEANBXe3Yyre/Go1sSX9YauJJAfxYW/M70AAUAE3FeWpSXmA/1zQ1Ufbk7/kADlKR3/YWhJHc/2NUI4BeA8ZznBmV+Eoq+a8AZirxZM3kahJ2Qordj2kCq6PNuKCKCEWhCoDp1i/kYEN5cXCOEfSn4JPkfsFsmCtryssM8AWv1lG+cnNWo8bwoE8WBYUG2MjqemVyn9IKTPmlGORMALHddOoFupwotEVsoFQRt/NMEN2rzJT9BuBl7RedKjP921bIB8OprD9Vz4Htp3C6lz/MNsE69IajjWaTiIkDrvsqSPMMn9r8u/Ooi9V7NE7EGdS/jLwCCM5p8ycL63mF9wNX8eAQKBgQDYCOLfL7775uSSj6En1hhr8DBkbDtBJvPVNeJ404za3936gL+ntuqzAvLmE03HLlks0rgScJveAtV/GtWt/4dGbq5T0Nso0gSDk1g3oMEW3bZsS2hSa5CuwRVtJ7/tYrYchp0S31c6JXhoRpqtfbmGoEQbDuif0m9IACIzzG2pJQKBgQC/gb4iHAXxIYHEgrcqtAaReOkvWsqLtjfFxPV9XUAKTQknx8Xf2RK/TENF68xe03oHoVpRh5vDX5Nwv6191LYzi/P55MviBH7uE6azcESFGISSb7CdKMZFDiV1XYHkwCaQoGh3L11o252en99oDbRtH1rCAnUA9/vwRvCaORy1wQKBgQCxFNeiyqhqI6FI4aLf3Ia4M3H3XyBTD3LfWgQBtqbG4qo6JD71YuKPSeOA5GHk2wEN1Mw9kUCygvAt9/kfX02rVh5fZdu/YieBEs5FCug7rhFSQ52HsdQu6uZ9Sw/vrfJI/67RQXFmoEBKeVVg0KW6zLQG2fmkyAGfqzxd6TwaYQKBgBFYfxA32ZHtpwNVk6GajL3AZd6UKqRc7NBM9q9UMui78YhY3+NWlgwdrDo5EVnFbdgjFTstPT6E+aXMtroe+iHRG1gXESB3p8eIoCDAmnQztE5PL4AMoWi/z0TCI3HEtbmDzfJ9p8hHnA8yC9ow45a+sEnCTza3P2qUAlb1tVQBAoGATNlojr8dMziX7N2K792IgcMA8bu46plFX6PKsT3tq5jVcGlewU+9tqJk5yoPB5cJwyUm6rq6EividXx6vbfxR3VTU3wTtkLxwHqg8x2qFncHm9ElFzpYLOzI2Hbp0nBaSUdRK9FQxn+hqXz9M9pBDPIAu/W97Pz6vyFdqRxUIl4=" + AlipayPublicKey: "" + AppCertPath: "etc/merchant/appCertPublicKey_2021006129617228.crt" AlipayCertPath: "etc/merchant/alipayCertPublicKey_RSA2.crt" AlipayRootCertPath: "etc/merchant/alipayRootCert.crt" IsProduction: true diff --git a/app/main/api/etc/merchant/alipayCertPublicKey_RSA2.crt b/app/main/api/etc/merchant/alipayCertPublicKey_RSA2.crt index a2d6e52..1fda6af 100644 --- a/app/main/api/etc/merchant/alipayCertPublicKey_RSA2.crt +++ b/app/main/api/etc/merchant/alipayCertPublicKey_RSA2.crt @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU diff --git a/app/main/api/etc/merchant/appCertPublicKey_2021006129617228.crt b/app/main/api/etc/merchant/appCertPublicKey_2021006129617228.crt new file mode 100644 index 0000000..f98a4fa --- /dev/null +++ b/app/main/api/etc/merchant/appCertPublicKey_2021006129617228.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEnjCCA4agAwIBAgIQICYBJUC8w9JR1ono3J6eXTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDEgUjEwHhcNMjYwMTI1MTA1NzMwWhcNMzEwMTI0MTA1NzMwWjBlMQswCQYDVQQGEwJDTjEq +MCgGA1UECgwh5rW35Y2X5rW35a6H5aSn5pWw5o2u5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZBbGlw +YXkxGTAXBgNVBAMMEDIwODgyNTE5MTM0MDQyNTgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQChnB4yOExQu8YF1cIdzIKMVE+sSwH7QFq73H1Tam0W6dvO4g3sXsOP/ddQHoIYz8rbwcgt +GYZtIl0huJ2/jCRl60ZY6mv2B3NHl9C9HYqzx9xXxOhUwlaIQEV5ZregQ4KfCGHgpUA7SG/kXj9o +UkSOD7AWwbJi2AVmN4YlD2TILzN8MwaYhNvpdfJvno7Z+HXMAO23SkHifjLZFLSxQQLXXOsK5DKs +mQUrd24aNKyuyT4oH9eB+/MIbpLZrPPcdNmL/Wefs8Mb9/DXgZ3jd7GGVIubxSU5O4KLbJ/thFuk +fQGgbv8LML6ksKmLunXk5qPv3LA2rCedFF8fn4BkT63lAgMBAAGjggEqMIIBJjAfBgNVHSMEGDAW +gBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQU3DI06nLE+mBhs3ZvNofQ86FekdwwQAYD +VR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2Nw +cy5wZGYwDgYDVR0PAQH/BAQDAgbAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly9jYS5hbGlwYXku +Y29tL2NybDEwOS5jcmwwYAYIKwYBBQUHAQEEVDBSMCgGCCsGAQUFBzAChhxodHRwOi8vY2EuYWxp +cGF5LmNvbS9jYTYuY2VyMCYGCCsGAQUFBzABhhpodHRwOi8vY2EuYWxpcGF5LmNvbTo4MzQwLzAN +BgkqhkiG9w0BAQsFAAOCAQEAJGeEwijmgFt3Nk9WFljjpQ9pUwGYrvaIam9eiBLVe7LbAMLXIeai +9ej7lBp3WJ4CkWqvnJKEFWN3u+jiyA3iIg208Wsj+DZCqnuqo5Yg+OzAPj9J8YPNptN76VQ2ZOsH +MaZAp/HH0hmAznJ5VBGHeqf8E7du/kS8pe0MNg2HgAPyXbrFoNWl40KPNNRm+dO2yPn9kMxhE4BE +Qos7E2WhZ/UwX1zv8jJLOuXJtwCbhbBZ9cDg60Rj5VxEnDoAE23d6l9e13jizDol+hsQIFYQHLng +xiARUyLcb9G3wfmAl6prXCK61LxZWzP07s54kykLgF5lQeM7yaCgo93fZ/fztg== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/app/main/api/etc/merchant/bak/alipayCertPublicKey_RSA2.crt b/app/main/api/etc/merchant/bak/alipayCertPublicKey_RSA2.crt new file mode 100644 index 0000000..a2d6e52 --- /dev/null +++ b/app/main/api/etc/merchant/bak/alipayCertPublicKey_RSA2.crt @@ -0,0 +1,43 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQICUSBOVPmqSb4NzESDUfmDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDIgUjEwHhcNMjUxMjA0MDg0MzU1WhcNMzAxMjAzMDg0MzU1WjCBjzELMAkGA1UEBhMCQ04x +KjAoBgNVBAoMIea1t+WNl+a1t+Wuh+Wkp+aVsOaNruaciemZkOWFrOWPuDEPMA0GA1UECwwGQWxp +cGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWPuC0y +MDg4OTQxNTA3NzkwNjA0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiuKilHTo/kPL +cD8ez6HtudB5BrrHz2H+hxbb+5kwPjaE14HCws9fbgtIxxaDWyKKOpUGqo5RGmMFpPaQfci0meBD +G0XyBafGyzDvivrkBCa2gQSzKzuxoFyNkBAubih91gYz6ZyfMDLmfeCR7ItapUtCRtt+xg1O64s+ +cZOSL94o8UnrUBJRW6auhhE8kDibxPpekSOqaWmlt6G8R1xMmf4CxdrErxLajCC3wmSEOyA5yu1M +yU/8Ve8g70zXgGAgQHXxgMblp9BE+dL11VIeyB0HEa68YVwtlUzbhtk+NPy+TI8wNMASjlr9oeoo +X0nm+oqXOBUwPW+txB1yeQ8tKQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcNAQEL +BQADggEBAHIbaJsjcPXKgpWxSFkr+ScYwQiqry+hh5kqgQLAhGYlcHQurbCP0kvlUWMZhGJR2no/ +b70xe+HZbxf5c4iVv6vss7o3nBGghMFYhpGfOCYDYeGkANEkczpDL5oBpgSbp/nN5zI9RQsYomD6 +Vp5QWvXZEM1/nz0o5nM3MfcF3/xC9/rO0ZqnE0TLJ2khmJmz5OIeqF0WdMXx5Q4/T70fFzpA+q/l +BfiGYtcNNu1N7Db2y495C9nmax+AHoaHQpWXtgwOaq5TlAs6FDl/Nj7o0uTK0NsVgIEKzF4xszrn +tOeb3KiVXE+wwaD5DXhsqO7uYTrVDsOy6HfKZST/LNS/E+M= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU +BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw +LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy +MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu +YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp +bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA +NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ +fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN +G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R +iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf +BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy +oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB +AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt +a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw +7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B +L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+ +14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ +EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64 +fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6 +OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD +aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr +-----END CERTIFICATE----- diff --git a/app/main/api/etc/merchant/bak/alipayRootCert.crt b/app/main/api/etc/merchant/bak/alipayRootCert.crt new file mode 100644 index 0000000..76417c5 --- /dev/null +++ b/app/main/api/etc/merchant/bak/alipayRootCert.crt @@ -0,0 +1,88 @@ +-----BEGIN CERTIFICATE----- +MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG +EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw +MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO +UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE +MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT +V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti +W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ +MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b +53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI +pDoiVhsLwg== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0 +MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV +BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j +aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk +rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2 +xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp +dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6 +vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl +YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1 +Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H +DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98 +SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG +PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe +9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC +AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90 +tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy +nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf +tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq +JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3 +IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW +05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41 +T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI +kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop +PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N +1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y +jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02 +77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi +kT9qhqn+lw== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG +EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0 +WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE +CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp +YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU +WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt +rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ +4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2 +zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg +wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH +Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA== +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF +BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM +E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg +MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq +MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp +bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv +b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV +nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5 +4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg +wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw +WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN +z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g +KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA +uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF +MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp +emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3 +U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I +UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn +DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU +1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX +Yf4Zr0fJsGuv +-----END CERTIFICATE----- \ No newline at end of file diff --git a/app/main/api/etc/merchant/appCertPublicKey_2021006115614672.crt b/app/main/api/etc/merchant/bak/appCertPublicKey_2021006115614672.crt similarity index 100% rename from app/main/api/etc/merchant/appCertPublicKey_2021006115614672.crt rename to app/main/api/etc/merchant/bak/appCertPublicKey_2021006115614672.crt diff --git a/app/main/api/internal/logic/admin_complaint/admingetcomplaintdetaillogic.go b/app/main/api/internal/logic/admin_complaint/admingetcomplaintdetaillogic.go index 726bdd6..0678349 100644 --- a/app/main/api/internal/logic/admin_complaint/admingetcomplaintdetaillogic.go +++ b/app/main/api/internal/logic/admin_complaint/admingetcomplaintdetaillogic.go @@ -91,9 +91,6 @@ func (l *AdminGetComplaintDetailLogic) AdminGetComplaintDetail(req *types.AdminG if alipayComplaint.GmtProcess.Valid { alipayDetail.GmtProcess = alipayComplaint.GmtProcess.Time.Format("2006-01-02 15:04:05") } - if alipayComplaint.GmtOverdue.Valid { - alipayDetail.GmtOverdue = alipayComplaint.GmtOverdue.Time.Format("2006-01-02 15:04:05") - } if alipayComplaint.GmtRiskFinishTime.Valid { alipayDetail.GmtRiskFinishTime = alipayComplaint.GmtRiskFinishTime.Time.Format("2006-01-02 15:04:05") } @@ -114,7 +111,7 @@ func (l *AdminGetComplaintDetailLogic) AdminGetComplaintDetail(req *types.AdminG // 获取交易信息列表 tradeBuilder := l.svcCtx.ComplaintAlipayTradeModel.SelectBuilder(). - Where("complaint_alipay_id = ?", alipayComplaint.Id) + Where("complaint_id = ?", alipayComplaint.Id) trades, err := l.svcCtx.ComplaintAlipayTradeModel.FindAll(l.ctx, tradeBuilder, "") if err != nil && !errors.Is(err, model.ErrNotFound) { return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintDetail, 查询交易信息失败 err: %v", err) diff --git a/app/main/api/internal/service/alipayComplaintService.go b/app/main/api/internal/service/alipayComplaintService.go index 2136119..2129487 100644 --- a/app/main/api/internal/service/alipayComplaintService.go +++ b/app/main/api/internal/service/alipayComplaintService.go @@ -192,7 +192,6 @@ func (s *AlipayComplaintService) UpdateComplaintFromDetail(ctx context.Context, } complaint.GmtComplain = s.parseTime(detail.GmtComplain) complaint.GmtProcess = s.parseTime(detail.GmtProcess) - complaint.GmtOverdue = s.parseTime(detail.GmtOverdue) complaint.ComplainContent = lzUtils.StringToNullString(detail.ComplainContent) complaint.TradeNo = lzUtils.StringToNullString(detail.TradeNo) complaint.Status = lzUtils.StringToNullString(detail.Status) @@ -386,7 +385,6 @@ func (s *AlipayComplaintService) SaveComplaint(ctx context.Context, complaintInf } complaintRecord.GmtComplain = s.parseTime(complaintInfo.GmtComplain) complaintRecord.GmtProcess = s.parseTime(complaintInfo.GmtProcess) - complaintRecord.GmtOverdue = s.parseTime(complaintInfo.GmtOverdue) complaintRecord.ComplainContent = lzUtils.StringToNullString(complaintInfo.ComplainContent) complaintRecord.TradeNo = lzUtils.StringToNullString(complaintInfo.TradeNo) complaintRecord.Status = lzUtils.StringToNullString(complaintInfo.Status) diff --git a/app/main/api/internal/types/types.go b/app/main/api/internal/types/types.go index f90058b..f6c25d7 100644 --- a/app/main/api/internal/types/types.go +++ b/app/main/api/internal/types/types.go @@ -226,7 +226,6 @@ type AlipayComplaintDetail struct { ComplainAmount string `json:"complain_amount"` // 投诉单涉及交易总金额 GmtComplain string `json:"gmt_complain"` // 投诉时间 GmtProcess string `json:"gmt_process"` // 处理时间 - GmtOverdue string `json:"gmt_overdue"` // 过期时间 ComplainContent string `json:"complain_content"` // 用户投诉内容 TradeNo string `json:"trade_no"` // 投诉交易单号 Status string `json:"status"` // 投诉状态 diff --git a/app/main/model/complaintAlipayModel_gen.go b/app/main/model/complaintAlipayModel_gen.go index 5eb05c9..9d28617 100644 --- a/app/main/model/complaintAlipayModel_gen.go +++ b/app/main/model/complaintAlipayModel_gen.go @@ -74,7 +74,6 @@ type ( ComplainAmount sql.NullFloat64 `db:"complain_amount"` // 投诉单涉及交易总金额（单位：人民币元） GmtComplain sql.NullTime `db:"gmt_complain"` // 投诉时间 GmtProcess sql.NullTime `db:"gmt_process"` // 处理时间 - GmtOverdue sql.NullTime `db:"gmt_overdue"` // 过期时间 ComplainContent sql.NullString `db:"complain_content"` // 用户投诉内容 TradeNo sql.NullString `db:"trade_no"` // 投诉交易单号 Status sql.NullString `db:"status"` // 投诉状态（支付宝返回的状态） @@ -103,11 +102,11 @@ func (m *defaultComplaintAlipayModel) Insert(ctx context.Context, session sqlx.S yccComplaintAlipayIdKey := fmt.Sprintf("%s%v", cacheYccComplaintAlipayIdPrefix, data.Id) yccComplaintAlipayTaskIdKey := fmt.Sprintf("%s%v", cacheYccComplaintAlipayTaskIdPrefix, data.TaskId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, complaintAlipayRowsExpectAutoSet) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, complaintAlipayRowsExpectAutoSet) if session != nil { - return session.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.ComplaintId, data.AlipayId, data.TaskId, data.OppositePid, data.OppositeName, data.ComplainAmount, data.GmtComplain, data.GmtProcess, data.GmtOverdue, data.ComplainContent, data.TradeNo, data.Status, data.StatusDescription, data.ProcessCode, data.ProcessMessage, data.ProcessRemark, data.ProcessImgUrlList, data.GmtRiskFinishTime, data.ComplainUrl, data.CertifyInfo) + return session.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.ComplaintId, data.AlipayId, data.TaskId, data.OppositePid, data.OppositeName, data.ComplainAmount, data.GmtComplain, data.GmtProcess, data.ComplainContent, data.TradeNo, data.Status, data.StatusDescription, data.ProcessCode, data.ProcessMessage, data.ProcessRemark, data.ProcessImgUrlList, data.GmtRiskFinishTime, data.ComplainUrl, data.CertifyInfo) } - return conn.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.ComplaintId, data.AlipayId, data.TaskId, data.OppositePid, data.OppositeName, data.ComplainAmount, data.GmtComplain, data.GmtProcess, data.GmtOverdue, data.ComplainContent, data.TradeNo, data.Status, data.StatusDescription, data.ProcessCode, data.ProcessMessage, data.ProcessRemark, data.ProcessImgUrlList, data.GmtRiskFinishTime, data.ComplainUrl, data.CertifyInfo) + return conn.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.ComplaintId, data.AlipayId, data.TaskId, data.OppositePid, data.OppositeName, data.ComplainAmount, data.GmtComplain, data.GmtProcess, data.ComplainContent, data.TradeNo, data.Status, data.StatusDescription, data.ProcessCode, data.ProcessMessage, data.ProcessRemark, data.ProcessImgUrlList, data.GmtRiskFinishTime, data.ComplainUrl, data.CertifyInfo) }, yccComplaintAlipayAlipayIdKey, yccComplaintAlipayIdKey, yccComplaintAlipayTaskIdKey) } func (m *defaultComplaintAlipayModel) insertUUID(data *ComplaintAlipay) { @@ -195,9 +194,9 @@ func (m *defaultComplaintAlipayModel) Update(ctx context.Context, session sqlx.S return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, complaintAlipayRowsWithPlaceHolder) if session != nil { - return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.GmtOverdue, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id) + return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id) } - return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.GmtOverdue, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id) + return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id) }, yccComplaintAlipayAlipayIdKey, yccComplaintAlipayIdKey, yccComplaintAlipayTaskIdKey) } @@ -219,9 +218,9 @@ func (m *defaultComplaintAlipayModel) UpdateWithVersion(ctx context.Context, ses sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, complaintAlipayRowsWithPlaceHolder) if session != nil { - return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.GmtOverdue, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id, oldVersion) + return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id, oldVersion) } - return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.GmtOverdue, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id, oldVersion) + return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ComplaintId, newData.AlipayId, newData.TaskId, newData.OppositePid, newData.OppositeName, newData.ComplainAmount, newData.GmtComplain, newData.GmtProcess, newData.ComplainContent, newData.TradeNo, newData.Status, newData.StatusDescription, newData.ProcessCode, newData.ProcessMessage, newData.ProcessRemark, newData.ProcessImgUrlList, newData.GmtRiskFinishTime, newData.ComplainUrl, newData.CertifyInfo, newData.Id, oldVersion) }, yccComplaintAlipayAlipayIdKey, yccComplaintAlipayIdKey, yccComplaintAlipayTaskIdKey) if err != nil { return err diff --git a/deploy/script/gen_models.ps1 b/deploy/script/gen_models.ps1 index 7a807c0..22d6e76 100644 --- a/deploy/script/gen_models.ps1 +++ b/deploy/script/gen_models.ps1 @@ -45,7 +45,7 @@ $tables = @( # "agent_withdrawal_tax", # "authorization_document", # "example", - "feature" + # "feature" # "alipay_from_callback" # "global_notifications", # "order", @@ -62,7 +62,7 @@ $tables = @( # "whitelist_order_item", # "user_feature_whitelist" # "complaint_main", - # "complaint_alipay", + "complaint_alipay" # "complaint_alipay_trade", # "complaint_manual" # "tianyuanapi_call_log" diff --git a/deploy/sql/complaint_system_migration.sql b/deploy/sql/complaint_system_migration.sql index d386e7a..7feeaff 100644 --- a/deploy/sql/complaint_system_migration.sql +++ b/deploy/sql/complaint_system_migration.sql @@ -62,7 +62,6 @@ CREATE TABLE `complaint_alipay` ( `complain_amount` decimal(10,2) DEFAULT NULL COMMENT '投诉单涉及交易总金额（单位：人民币元）', `gmt_complain` datetime DEFAULT NULL COMMENT '投诉时间', `gmt_process` datetime DEFAULT NULL COMMENT '处理时间', - `gmt_overdue` datetime DEFAULT NULL COMMENT '过期时间', `complain_content` text DEFAULT NULL COMMENT '用户投诉内容', `trade_no` varchar(100) DEFAULT NULL COMMENT '投诉交易单号', `status` varchar(50) DEFAULT NULL COMMENT '投诉状态（支付宝返回的状态）',