浏览代码

更改支付宝私钥格式
下单时,MaxDivi需要满足活动条件才赋值

lcl 1 年之前
父节点
当前提交
74ca7381c9
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      AppStart/Alipay/AlipayFunction.cs
  2. 1 1
      Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

+ 1 - 1
AppStart/Alipay/AlipayFunction.cs

@@ -18,7 +18,7 @@ namespace MySystem
     {
         private HttpContext _context;
         private string AppId = "2021004100667901";
-        private string PrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHDYLsDKk39xIE1lTUtTa2Hnx/O8uWGV+DuNnPfE0lDCkgK1IXqFdcHaoKF5wRm/tkbKK65qZOf9z5kAokCXcRnx8wSBOt0r0zz7cNfoUjNbLAK4+S2yfEsiROPgu38uM8jc/fJksRK5bMchD5MafASCb8XHkRJauJsU510tGc2kg2TfrL6C1pWhelDvjZa3piDWXgVmvMIA4eMt9V5PIDOZdebxMZ3N6nzd/IKpIGn6t2lvUIZC6QdikJqnKTnaEzjCqwBV2d0Co7mqhGLkF+7KJWzYFHo577yIXisPkUn9aTpCC56ZZfwL/iNOe42zViwW4JMepjCvyTwnp6QR2DAgMBAAECggEAShv8+wFbno1jAuqGdI7Ybgm+sacjacOUqVi3lWcVgj3xF2kOTFMhVTgmBhG8n+Eji5Edn0hQfIUnwn7rQak8AJx75ee3fMxG7PaP8cS61H50D4YX7DN82DAVQiZEEfYkAiejqUV/LfXoc1oovEYmUpqFYjhwaxtrzUxRzNAaHGLThcP15Vk116hGm315dMS6iONkhAHgkiYdcjqNjGOGjA/zoP+FDWXPvyYL2Z+VIXQwLmAe2N1HQxJwgqx7BsmVFak7D9Q24tdSgSNxcDhhczUI9bi5Iqk+byPdLR41Pq8Tz4MZWIusfm7ljGIs6UUx2ROx3Kir215ANCXx4JbqyQKBgQDFzyFuS0EOcwvISL7okLMwNNDlLXp+FHx+NqFc/kP7aBllw1K7hf9nn9YRZIfAfxg4YJd5cS6Nd7xsTLV0nwHxzcoMODbFT02zED03UHgEeS9r/c/OHNAaNJPU4hjAtkDAwMmVDG2ZQ1PkBvnmLwAAQ7l7CLhGr5jc8o15DRruBwKBgQCuyD6cVr7x6RmyIWSX8gB7kSwmGX80+s+Fc8eyOnbLUIrdmDZjWE5iMEuciLogPqX7q5jBUqh79Q6mGcgG7D1aR92iOssCYMKB7d6JdOthOPlecoxlmiffEMee4QHl1MxkbaFbcEl9hQN01iSNaZSgoP7UuYPO2kMGIsLpRt/1pQKBgA5y0btPreHTT3ICtkcggqYrxXJn/wGEl49UiDbVr7uGYAyJ1toxsHUuPKGqmSvbXLaJf6b0OHVG4LF8bOim0KqL4I1B8eY5o7BHqGEI9KtG+srFkE861YyEeKPdG/e/mD08F71WWg8O1uraA5jnp/Vc/Qham7M2ElFZOjI0XdozAoGAe7f2yceFhctQiwykHgIJYW5TZ+yoZKIc/wQDmR9VM3mhslWqOgwp/8rb2sPVrDlsWIcQq9eMt6GxatXZBz11+E/ijJE9XkOLq1jrKzV93+XqbnZ69vh1vKouA0KWi09kFrqbexQykQz0c2GZohfYQxNzDrT6nhNVWiSE/4dRxJkCgYEAmSQnW4+4oSrv3N6o0R8McVkdb7hjNPjEOWrS+blhiGmFzKvzRnSMvMaCahEcpN8PAEdgXlNd1SxaAkQbH2O5w+LSMWQrocMB6tSobhYlzyK773enJhh88izNYcTDPES62OlSdTYelcsyGBRdCvBJatCkdOS48xjxkJDApnhMExU=";
+        private string PrivateKey = "MIIEowIBAAKCAQEAhw2C7AypN/cSBNZU1LU2th58fzvLlhlfg7jZz3xNJQwpICtSF6hXXB2qChecEZv7ZGyiuuamTn/c+ZAKJAl3EZ8fMEgTrdK9M8+3DX6FIzWywCuPktsnxLIkTj4Lt/LjPI3P3yZLESuWzHIQ+TGnwEgm/Fx5ESWribFOddLRnNpINk36y+gtaVoXpQ742Wt6Yg1l4FZrzCAOHjLfVeTyAzmXXm8TGdzep83fyCqSBp+rdpb1CGQukHYpCapyk52hM4wqsAVdndAqO5qoRi5BfuyiVs2BR6Oe+8iF4rD5FJ/Wk6QguemWX8C/4jTnuNs1YsFuCTHqYwr8k8J6ekEdgwIDAQABAoIBAEob/PsBW56NYwLqhnSO2G4JvrGnI2nDlKlYt5VnFYI98RdpDkxTIVU4JgYRvJ/hI4uRHZ9IUHyFJ8J+60GpPACce+Xnt3zMRuz2j/HEutR+dA+GF+wzfNgwFUImRBH2JAIno6lFfy316HNaKLxGJlKahWI4cGsba81MUczQGhxi04XD9eVZNdeoRpt9eXTEuojjZIQB4JImHXI6jYxjhowP86D/hQ1lz78mC9mflSF0MC5gHtjdR0MScIKsewbJlRWpOw/UNuLXUoEjcXA4YXM1CPW4uSKpPm8j3S0eNT6vE8+DGViLrH5u5YxiLOlFMdkTsdyoq9teQDQl8eCW6skCgYEAxc8hbktBDnMLyEi+6JCzMDTQ5S16fhR8fjahXP5D+2gZZcNSu4X/Z5/WEWSHwH8YOGCXeXEujXe8bEy1dJ8B8c3KDDg2xU9NsxA9N1B4BHkva/3PzhzQGjST1OIYwLZAwMDJlQxtmUNT5Ab55i8AAEO5ewi4Rq+Y3PKNeQ0a7gcCgYEArsg+nFa+8ekZsiFkl/IAe5EsJhl/NPrPhXPHsjp2y1CK3Zg2Y1hOYjBLnIi6ID6l+6uYwVKoe/UOphnIBuw9WkfdojrLAmDCge3eiXTrYTj5XnKMZZon3xDHnuEB5dTMZG2hW3BJfYUDdNYkjWmUoKD+1LmDztpDBiLC6Ubf9aUCgYAOctG7T63h009yArZHIIKmK8VyZ/8BhJePVIg21a+7hmAMidbaMbB1Ljyhqpkr21y2iX+m9Dh1RuCxfGzoptCqi+CNQfHmOaOwR6hhCPSrRvrKxZBPOtWMhHij3Rv3v5g9PBe9VloPDtbq2gOY56f1XP0IWpuzNhJRWToyNF3aMwKBgHu39snHhYXLUIsMpB4CCWFuU2fsqGSiHP8EA5kfVTN5obJVqjoMKf/K29rD1aw5bFiHEKvXjLehsWrV2Qc9dfhP4oyRPV5Di6tY6ys1fd/l6m52evb4dbyqLgNClotPZBa6m3sUMpEM9HNhmaIX2EMTcw60+p4TVVokhP+HUcSZAoGBAJkkJ1uPuKEq79zeqNEfDHFZHW+4YzT4xDlq0vm5YYhphcyr80Z0jLzGgmoRHKTfDwBHYF5TXdUsWgJEGx9jucPi0jFkK6HDAerUqG4WJc8iu+93pyYYfPIszWHEwzxEutjpUnU2HpXLMhgUXQrwSWrQpHTkuPMY8ZCQwKZ4TBMV";
         private string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhw2C7AypN/cSBNZU1LU2th58fzvLlhlfg7jZz3xNJQwpICtSF6hXXB2qChecEZv7ZGyiuuamTn/c+ZAKJAl3EZ8fMEgTrdK9M8+3DX6FIzWywCuPktsnxLIkTj4Lt/LjPI3P3yZLESuWzHIQ+TGnwEgm/Fx5ESWribFOddLRnNpINk36y+gtaVoXpQ742Wt6Yg1l4FZrzCAOHjLfVeTyAzmXXm8TGdzep83fyCqSBp+rdpb1CGQukHYpCapyk52hM4wqsAVdndAqO5qoRi5BfuyiVs2BR6Oe+8iF4rD5FJ/Wk6QguemWX8C/4jTnuNs1YsFuCTHqYwr8k8J6ekEdgwIDAQAB";
         public string AlipayPublicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
         public AlipayFunction(HttpContext context)

+ 1 - 1
Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -282,7 +282,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 PayMoney = PayMoney, //支付金额
                 SnNo = SnNo, //SN号
                 OrderNo = OrderNo,
-                MaxDivi = PayMoney * merchantset.DiviPercent / 100,
+                MaxDivi = ActFlag ? PayMoney * merchantset.DiviPercent / 100 : 0,
                 IsAct = ActFlag ? 1u : 0u,
                 SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
             }).Entity;