edit

app/card/database/type.php

@@ -121,7 +121,7 @@ return array
             'match'     => 'option',
             'update'    => 'image',
             'key'       => '1',
-            'place'     => '375*910',
+            'place'     => '672*386',
         ),
 
         'icon'     => array

app/shop/lib/Refund.php

@@ -377,6 +377,10 @@ class Refund
         $refund_cash = $info['cash'];
         $refund_order_id = $info['id'];
         # 退款到原支付账户 待处理
+        if (strstr($data['order_num'], '_')) {
+            $temp = explode('_', $data['order_num']);
+            $data['order_num'] = $temp[0];
+        }
         $param = array
         (
             'project_id' => 1,
@@ -391,7 +395,7 @@ class Refund
 
         if (!$result) {
             # 退款失败，抛出错误
-            throw new \Exception('退款失败');
+            //throw new \Exception('退款失败');
             Dever::alert('退款失败');
         }
         if (isset($data['uid']) && $data['uid'] > 0) {

app/shop/src/Yspay.php

@@ -13,7 +13,7 @@ class Yspay
 		$class = new Chinaums();
 
 		# 查看当前余额
-		$cash = $class->query();
+		$cash = $class->query('89810007372107A');
 
 		echo $cash;die;
 		return $cash;
@@ -77,35 +77,35 @@ class Chinaums
 	protected $host = 'https://managefree.chinaums.com/';
 
     //系统编号（sysId）
-    protected $sys_id = '10003';
+    protected $sys_id = '10119';
 
     //商户号
-    protected $mch_id = '898460159921026';
+    protected $mch_id = '89810007372106N';
 
     //外部平台私钥
-    protected $private_key = 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAAbXA7tnnMuWV6WO1bKEKGyKZRFcRCGDW+UfGFZdx0MEm6+fKTNGTsalEFwFPK36YtQFXcN0FciGmQp1wGts4IqLaEzk9az5UcxIfR00JxpNsTYSZb82ZMpj52WF0FHtyj7qE+K3k/FcKCcEHQ3Soa9LL/GQpyVO0yhxeV5tiRfnHoJxxCRHp3jM//VnlCd6koTwPNPFKsf8Vf+dtGA3/BZPFoHvFP0+vfLmEi2TIHO1f1CZDg67TiC/Kkusl0XBiUAXhjAz1SleNQzKHtUVPbVluBtG8ydk8kcLpqDDST6WPnHg5NgHt9qXp0vOLO7ABkQz+dGCXKm+tWXHnRjj1AgMBAAECggEAMm7AjMKwHZgy0aOR+w9jZUInXlai/+hRd2XWwmLdepm4gj6ojWyMB908dpQMVf04rWetyIfupgWKbR9GNzH2rtH6MImoGUfYAVqQQgL6azzrcCEUWTESsdCmecntXQ4cNsUl2tNu6ZyWSB6zwvKm664Wmlna/VbSU8RamzUrrS362gxNFdcEyvCstlnNx1aC5VCRFHm6uBO2uFSYR4dh4e0KpEmYsPT41k93Z4KQHFTCwcvuQu+or5WKL44hKYHyXoZbWiZhfvBRXBVDT7TLmObkeQXAr/Uu1SO5AkblYqG0dyYVy1ea2xANjt8Mw+OP4kRu8IFikALwWp4iYdyAaQKBgQD5mrsx6KrRHbtpBZzHBcEL+/tttA8YAskH2NlkEcGDPcwwULdEYRUUEvX5J+9sTwZHLnE6O9YKI0UtbEBLmDGDfoHy9OM0NCHEaxmZJvmizzfGGc4u/+EtrNCZh1nXUvz1cPip6tywpuHuIgcdAczm0kD9vMWcKHWJSZv+gdClpwKBgQDE7StEIc/c4/fYjIzUaMh6NHqGGB/SpqpfyKHdNZG1xhacN3zY44fO4X8U93uV+thhY3a66TjvvfC2kQAidWWwn4DzmOgWCSPPtuYuI5vouqW/HL8rLKf3hV2rGCC6fz9PDgjy1tl6ZxI10YsA0VjWuHQ9OcQjBl/ypoGfTCJ4AwKBgQCvMhwSe+zpuqTAol/YkgFeGA/ygF/XypywFVUBGDVrmQSpJP590GarIGPl7lHvA8i0TbTL2xPxKbB0oXa/mKOoWDN+BMU07yKEa2gcR28RB8FuGs7NzmyPUq1YFdjJekZzQEhJe8BLfdc2/ktf4NOhcBKOBuHtKbjWFASaLyP0IQKBgHjRSYozdGQBOT4SfRSUdOsE52b9xghnWIALh8M/6nWrYpPVNzOZ5Oh4UI98hsYtcDPP4jgqflQYJGbd70c0337NXUAWv81FLkNx4ybLkgvm92mZKXBDpYmmuSEPXIUPLLhD1Bmo1yTRt8ptFOsbhXW3FRm7JyqV7qfgoAYrn7ohAoGAT2YHHABe8UHfo8ZnLKjjC3FfUcrGd87LTB8EbADVb+Vuak7/8/FTGRDGxygeH3/haB86Dv1nRQJ2Jp1fS9HrWfX/cart1H6Ef/FKT6Td3aCZAwM6kTLWkDepX+2qWW3pnKytrnp1rHFu9XIR+iFlG2hFOg+ppzUKfX3L3A57xDU=';
+    protected $private_key = 'MIIEowIBAAKCAQEApzpOtvWGclmdw+/aEzAxwyTgUwnC9qjQEhL+qfMWDBIbFR8N4q6GQ8fRKZ9Zyvm0voFhgpH44Y6sh2U7rF9HQOuw2puywvU8kk5JAUxpxykbH7QqW/ijH1gBG3Ck/Ip/5I4co+q9K/CjQRmId5nSJ8ffnaiAOogNZycrP+AgEEU8vL1eNtnagVxT3EC1LEh0wBwecT9Tkyi0tMD0sMeIUl9POrnh7YADJtUzGf+TTNrqK6DhoT9mE3Plw0pqxKSk4/tHNx1ZIXf4I/UeYSEAreXHWVfLQ/if1C9HRYhEGB57mmqn0JdmsSRD7DX7eU7Oja+RqtWfQ/KH+2fnjq9uSwIDAQABAoIBABACUvrM8nwL/EB/u77OhFUMOLV6X8HBU3oHe33Fmby6FwGkoW2sC4p9nJaBfNUjppv+Qtl/I/Zj9DxaAqZz0Jx0c8/Zy/lCBPR0riSDrjS0yLX2R3/ag7NCd4iq9gB/OdMlj7RZipakSNy4lwnsHeRVDCFJukzgLXhMlaVdzXQBJTdERP3G8A9vwxuvbOE3q3kHCTWepVYd3KdEQ5rDPrYh/HwfVB2tWSne7Z/NurutW5qLA6aiJGcDoF7H41Fit8zw1QDnwJNvsUeR/POFFD0zog7+ZpMX3OiJwFKBZfTNvzJtH3mkqnN62JJwpJNqTTMWdfSziFlQNJ6GrCqhaxECgYEA1STJz0GAC7tho/l6O13BYlnyjS15bSCrr23XXUY3Sa7s6JiNFAUkIFq57XzEEdZhqOmgQlJQmGKJmmRVSshnSH7HohRdjisnjAbK1O0qABe3tP3IIuKCrPY+q1zb+PpYkFMiWUr3+1JYKU8o5tQCWQhRLVPN8Gbl6K0ffr3sJzcCgYEAyNoS4oWNeKnAJyK7rkDq7iMkf4eDMEUl1VPunZOTsZDkycf3bIKJJK+KW/HNpCt5M+DdhgZPtbuvpPVZFsscbM/q2q4vIBxp2riS94o+Aoijc8U5FzkhE+a5+qTJpykMBOVXaHENVvZzeh9TysoRROiI3c4IibKsP2NdwxnRU40CgYACozjoGqxl+MSljdHIaEmbWPeabaSiCBR30Eko+1R10fdWjYS5abLfv5+rY67ddaSxvWphR7l9mUKQqYswqLg2enMn+06JEtmjbvYVmnW5mJGKaNWQMPNjBo0R+80xEJAGATFcn4PgFU3H/RXJfXgl9+dhQzc6MVvI/FN2cw04EwKBgQCp3uaB9vpDxy3g65tYMUeAyPAhe/cUaCcrWaVCWIJdd3JIxnsYpv5erKiUQtnts2b63X/9znCz/1z6YxdKE9aioOa8tPzeZ6mPdvO1sJHpiq7TR0aVwZecQVOiDKUQX8LukRlwF810c1QPQVeY93XLle/LyGmoLBlKMzwlujw0MQKBgDZT/egpnQM3x4TR9ERrk0o5GOLHNFiNkSfkzzZ3D2nRGT+6GRlmb40LtPzBy5+vAgLqBlfEEfToaMGZ+Vrl2CePBBoR/j/q8nlziqZ3H5b8plqHSbX85zONT6tF+YZ2nRMxpI2gQtecRzoozm+ilELCNSd6V7pAzpl14KRU2V5l';
 
     //外部平台PKCS1私钥（银联商务提供的PKCS8格式需转为PKCS1格式）
-    protected $private_key_pkcs1 = 'MIIEowIBAAKCAQEAwAG1wO7Z5zLlleljtWyhChsimURXEQhg1vlHxhWXcdDBJuvnykzRk7GpRBcBTyt+mLUBV3DdBXIhpkKdcBrbOCKi2hM5PWs+VHMSH0dNCcaTbE2EmW/NmTKY+dlhdBR7co+6hPit5PxXCgnBB0N0qGvSy/xkKclTtMocXlebYkX5x6CccQkR6d4zP/1Z5QnepKE8DzTxSrH/FX/nbRgN/wWTxaB7xT9Pr3y5hItkyBztX9QmQ4Ou04gvypLrJdFwYlAF4YwM9UpXjUMyh7VFT21ZbgbRvMnZPJHC6agw0k+lj5x4OTYB7fal6dLzizuwAZEM/nRglypvrVlx50Y49QIDAQABAoIBADJuwIzCsB2YMtGjkfsPY2VCJ15Wov/oUXdl1sJi3XqZuII+qI1sjAfdPHaUDFX9OK1nrciH7qYFim0fRjcx9q7R+jCJqBlH2AFakEIC+ms863AhFFkxErHQpnnJ7V0OHDbFJdrTbumclkges8LypuuuFppZ2v1W0lPEWps1K60t+toMTRXXBMrwrLZZzcdWguVQkRR5urgTtrhUmEeHYeHtCqRJmLD0+NZPd2eCkBxUwsHL7kLvqK+Vii+OISmB8l6GW1omYX7wUVwVQ0+0y5jm5HkFwK/1LtUjuQJG5WKhtHcmFctXmtsQDY7fDMPjj+JEbvCBYpAC8FqeImHcgGkCgYEA+Zq7Meiq0R27aQWcxwXBC/v7bbQPGALJB9jZZBHBgz3MMFC3RGEVFBL1+SfvbE8GRy5xOjvWCiNFLWxAS5gxg36B8vTjNDQhxGsZmSb5os83xhnOLv/hLazQmYdZ11L89XD4qercsKbh7iIHHQHM5tJA/bzFnCh1iUmb/oHQpacCgYEAxO0rRCHP3OP32IyM1GjIejR6hhgf0qaqX8ih3TWRtcYWnDd82OOHzuF/FPd7lfrYYWN2uuk4773wtpEAInVlsJ+A85joFgkjz7bmLiOb6Lqlvxy/Kyyn94Vdqxggun8/Tw4I8tbZemcSNdGLANFY1rh0PTnEIwZf8qaBn0wieAMCgYEArzIcEnvs6bqkwKJf2JIBXhgP8oBf18qcsBVVARg1a5kEqST+fdBmqyBj5e5R7wPItE20y9sT8SmwdKF2v5ijqFgzfgTFNO8ihGtoHEdvEQfBbhrOzc5sj1KtWBXYyXpGc0BISXvAS33XNv5LX+DToXASjgbh7Sm41hQEmi8j9CECgYB40UmKM3RkATk+En0UlHTrBOdm/cYIZ1iAC4fDP+p1q2KT1TczmeToeFCPfIbGLXAzz+I4Kn5UGCRm3e9HNN9+zV1AFr/NRS5DceMmy5IL5vdpmSlwQ6WJprkhD1yFDyy4Q9QZqNck0bfKbRTrG4V1txUZuycqle6n4KAGK5+6IQKBgE9mBxwAXvFB36PGZyyo4wtxX1HKxnfOy0wfBGwA1W/lbmpO//PxUxkQxscoHh9/4WgfOg79Z0UCdiadX0vR61n1/3Gq7dR+hH/xSk+k3d2gmQMDOpEy1pA3qV/tqllt6Zysra56daxxbvVyEfohZRtoRToPqac1Cn19y9wOe8Q1';
+    protected $private_key_pkcs1 = 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnOk629YZyWZ3D79oTMDHDJOBTCcL2qNASEv6p8xYMEhsVHw3iroZDx9Epn1nK+bS+gWGCkfjhjqyHZTusX0dA67Dam7LC9TySTkkBTGnHKRsftCpb+KMfWAEbcKT8in/kjhyj6r0r8KNBGYh3mdInx9+dqIA6iA1nJys/4CAQRTy8vV422dqBXFPcQLUsSHTAHB5xP1OTKLS0wPSwx4hSX086ueHtgAMm1TMZ/5NM2uoroOGhP2YTc+XDSmrEpKTj+0c3HVkhd/gj9R5hIQCt5cdZV8tD+J/UL0dFiEQYHnuaaqfQl2axJEPsNft5Ts6Nr5Gq1Z9D8of7Z+eOr25LAgMBAAECggEAEAJS+szyfAv8QH+7vs6EVQw4tXpfwcFTegd7fcWZvLoXAaShbawLin2cloF81SOmm/5C2X8j9mP0PFoCpnPQnHRzz9nL+UIE9HSuJIOuNLTItfZHf9qDs0J3iKr2AH850yWPtFmKlqRI3LiXCewd5FUMIUm6TOAteEyVpV3NdAElN0RE/cbwD2/DG69s4TereQcJNZ6lVh3cp0RDmsM+tiH8fB9UHa1ZKd7tn826u61bmosDpqIkZwOgXsfjUWK3zPDVAOfAk2+xR5H884UUPTOiDv5mkxfc6InAUoFl9M2/Mm0feaSqc3rYknCkk2pNMxZ19LOIWVA0noasKqFrEQKBgQDVJMnPQYALu2Gj+Xo7XcFiWfKNLXltIKuvbdddRjdJruzomI0UBSQgWrntfMQR1mGo6aBCUlCYYomaZFVKyGdIfseiFF2OKyeMBsrU7SoAF7e0/cgi4oKs9j6rXNv4+liQUyJZSvf7UlgpTyjm1AJZCFEtU83wZuXorR9+vewnNwKBgQDI2hLihY14qcAnIruuQOruIyR/h4MwRSXVU+6dk5OxkOTJx/dsgokkr4pb8c2kK3kz4N2GBk+1u6+k9VkWyxxsz+rari8gHGnauJL3ij4CiKNzxTkXOSET5rn6pMmnKQwE5VdocQ1W9nN6H1PKyhFE6IjdzgiJsqw/Y13DGdFTjQKBgAKjOOgarGX4xKWN0choSZtY95ptpKIIFHfQSSj7VHXR91aNhLlpst+/n6tjrt11pLG9amFHuX2ZQpCpizCouDZ6cyf7TokS2aNu9hWadbmYkYpo1ZAw82MGjRH7zTEQkAYBMVyfg+AVTcf9Fcl9eCX352FDNzoxW8j8U3ZzDTgTAoGBAKne5oH2+kPHLeDrm1gxR4DI8CF79xRoJytZpUJYgl13ckjGexim/l6sqJRC2e2zZvrdf/3OcLP/XPpjF0oT1qKg5ry0/N5nqY9287WwkemKrtNHRpXBl5xBU6IMpRBfwu6RGXAXzXRzVA9BV5j3dcuV78vIaagsGUozPCW6PDQxAoGANlP96CmdAzfHhNH0RGuTSjkY4sc0WI2RJ+TPNncPadEZP7oZGWZvjQu0/MHLn68CAuoGV8QR9OhowZn5WuXYJ48EGhH+P+ryeXOKpncflvymWodJtfznM41Pq0X5hnadEzGkjaBC15xHOijOb6KUQsI1J3pXukDOmXXgpFTZXmU=';
 
     //银商系统公钥
-    protected $public_key = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu13Ykr8Q4ACqnYMfLL5kgV2JsUC7TQEeWR70Zpulqq6JeujD6dCupnYnGhnMmePasgBZT0rIKGvoUEe5tMS1sfYo6dMqaAwcVfe4XOQaPSQs10XDSMB689+ImZmhECEBJkbKs7K+BBJXBOZGkgHBZsd4pn3vlF4E2yPTrfrcn9OEXZAKrUb/jZm6suzHoXSljqtHWwT7OwQoIX+Q/27gYA6PuGpFFmr4Xtc4a/AqIHeCC4TinbgboD8HqfL0ZoC4NG6Xm2KJ9wK66MbS7sYRiK+7pctZkZLxIJ47Ro5Psuxs4owTdtY7b1aHun9GoUT6Wm4mRO0asvBv0XKn05qn9wIDAQAB';
+    protected $public_key = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhTzN8wxdXYr+/+t8iX0mlol8wFy+0pGtxnyB6PjyrIRjGHrZJA7grZPvy7MOK6PqihqTZh6SO7tX9StxVmTQo+PuibAY/p2i08UxkIBUcucHVvHN8gkM3GBFBqD0uJgUc03cerEI7gNeaKYfCVs0/hMo6CKbdXVKqaE987kXYK209uFcte+Y8YofQ2AYamImpzSf7pXomAu+8D98HIOs5bKITHTk30vPdNhrQdpDRO1TuX0x8bwhCykcwAEdB/Z9YGXkLU5S3QJY2qvCZJY08YdNqIpbDqifSRvOg0sqeKFXPfI2M0GsOh6PArTEmh0QHxDht9xjPPt11aVgh8kgkQIDAQAB';
 
     private function host()
     {
-    	return $this->test_host;
+    	return $this->host;
     }
 
     # 查询余额
-    public function query()
+    public function query($mid)
     {
     	$url = $this->host() . 'uisouterfront/qrywithdrawbalance/process';
 
-
+        $mid = $mid ? $mid : $this->mch_id;
     	//整理内容信息
         $content = [
             'sysId' => $this->sys_id,
-            'mchntNo' => $this->mch_id,
+            'mchntNo' => $mid,
             'timestamp' => date('YmdHis'),
         ];
         //设置签名并加密
@@ -113,6 +113,8 @@ class Chinaums
 
         $result = Dever::curl($url, $body, 'post');
 
+        print_r($result);die;
+
         $decryptData = $this->privateDecrypt($result);
 
         if (isset($decryptData['tzWithdrawAmtPublic'])) {