Merge branch 'dev-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into dev-tiande

ace-common/src/main/resources/properties/systemconfig.properties

@@ -53,7 +53,7 @@ APICLIENT_CERT=D:\\cert\\1514583081_20181017_cert.p12
 ALIPAY_APPID=2021002100680357
 ALIPAY_PID=2088931793790291
 #\u652F\u4ED8\u5B9D\u516C\u94A5
-ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk3ZGI8jwnmbzUvRpBJk4TaNL7LsJjlfJ5xxgc8zYOuyOvhlDsSGs/+ghpqtRrs3tH0/i4st28rlGFgY3BJwXMXNfIH+I6vqiRXrjvn5V0M3xn6Zju0jFrepWED5frp+JBQ82c3SG+zgMDFvFiTcRftHlzEy2gGD0mhBYevGXSdqI0h6jveo3a7dv9iFFeaXv7JfSJe84Be6ZtOYXfvt7A/apO1JD/cQJ+AWomnxjOT2eP3jihnXU0bjKR5H20bU41B19ld7sylVQycxrX5f0F6Nm94WK/r5BRsTMpj8zqrGlm133VlywbANzw1gQQrFH70pNz0S2o45ImEyEjAvTJwIDAQAB
+ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg1YMtj0xpw0Xu6cJ1ymtdIGG5atDkOn0L3juI/8q+ppr3BavSip+S7/RJrrGZHUkbcWtL6kaPVXUxVxe3tBcDzmd+l7RikQUNsUAvKVa7cZlTGC3RWGfgPn2Uc/vYOcEO3PK2l3OBUJPJlkqu0Xno7cRt5JUAGrSwhRaz7jVAX2vGi+6DUgMWqXY2yukgmuCyBrZ9etYp2fAKwEWs2QCYQJVOjiKo4Yc9MebAbhcm84w1esUO+EwktUAzE/w95LF3nZals+rZSQ9dPk3DZgFcE8Id/474byU9eXCmEDFug2VTOME543cYBRPJLuAQlzXLejp4AvPuF/SNmlI+gr0AQIDAQAB
 ALIPAY_ACOUNT=2304409945@qq.com
 ALIPAY_PRIVATE_KEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCTdkYjyPCeZvNS9GkEmThNo0vsuwmOV8nnHGBzzNg67I6+GUOxIaz/6CGmq1Guze0fT+Liy3byuUYWBjcEnBcxc18gf4jq+qJFeuO+flXQzfGfpmO7SMWt6lYQPl+un4kFDzZzdIb7OAwMW8WJNxF+0eXMTLaAYPSaEFh68ZdJ2ojSHqO96jdrt2/2IUV5pe/sl9Il7zgF7pm05hd++3sD9qk7UkP9xAn4BaiafGM5PZ4/eOKGddTRuMpHkfbRtTjUHX2V3uzKVVDJzGtfl/QXo2b3hYr+vkFGxMymPzOqsaWbXfdWXLBsA3PDWBBCsUfvSk3PRLajjkiYTISMC9MnAgMBAAECggEAc0wk51HzoUbJtfDYM/pBJaMqeDx96kgF26g6WhCueNQBf+1tGhBEngq4VQLa6Ryl7LefpMiFhp8Kh6nwVrBdChM1K8nMGj5BpqXBcG6DVrHP3I5SqFrsBWGWTTkXwweGMOiGIJvZ9o8KDJesye6+xTQEw0qv34zvc46YP/ip29nNDP1upuX7FOn6mwne1NTp5GLHddiZ90e8goOzVCVTtWf4A1d9CeG04l4TJmQI5wGSfF9NbORePUp7Mb1oJRkhYQCqM3gRmOUHUY2DDsGsjoGKacxgRANc1SbTTGGBHBJO7H4/njzM9Y7TXFFmWvZMDbkdSx2LX9YlISCNatwIYQKBgQDDzrKReToP3qG7Y7PG0qCHFYnLNbeqVe2FnJQWAweKxpBWyvlUPeD7bd/i1wgsR9F3AXijjBem/dZvwJC0AwCO3wW2SIW09WGPND+vgtnkexxkezDvtgs6DoL2YMBBnYrmj8CVP8zf63/+vYDuD7FWTJxUrocR23SDHrk673NDCQKBgQDAyvnd6Nw6eyoH9V/JYKuMtEKOBj+l1AvPjMsyeYqlQfeyGAW5Dr0QavA4BwXJ6tNUyPzuA3EElU1LIP7fncT89WmTTdtTduBPon62WG/y0GygcwtOb2EkIirA8WQPY7F6PODlsBBStBKBU7ZycQut3vbbuIrF4Km1XyspBXkArwKBgQCdrALk265iew7XG3j3gEIdpL1Zsj7cXecu8R/Z/cSD/lLaYQWWzWEudZKUUj1VkttcLgYcBEJDiSG0yWZ8XfKEGZi66Pkp93IA47zossCMmIoLa5vDW178+BSDGvOVoqvn7xfP1xk9sqBV2/lHOcG+UWCNXCCNw561uvbDO3AgKQKBgAhRue6FedtcLTgisntyHHT54lVWl7CEMe5G2Q3YiM8Qxat9teGCbU4kDzGbu/g2ld/2vFNY+quD9c3kIptrp3By9pdQqMI1QwCstmMP9eS4cbeKv1YnID3663Vf9T1kw+fOcLX4nvuyoYnLHvhZQHPER0q77+ESDMCy1p3yioIpAoGASRu4s3ncp1M3pKMmKb/jnOWRvbUy4rL/hOhKo685wJiGpbmjY/rUiUyY3DAdg19mt9/tVOp455+wTPQ2FaRzS3SuiyoujxVdLlyrFm3nkqlb3RSVBl+AA18KmqbUyjULotwL6nnt9BNd/OoF6q1xAzVAGHZvnw6AlYqCaRUodD0=
 #

xx-order/xx-order-server/src/main/resources/mapper/OrderRentVehicleDetailMapper.xml

@@ -73,7 +73,7 @@
                 </foreach>
             </if>
             <if test="multiStatus != null">
-                and bo.status not in
+                and bo.status in
                 <foreach collection="multiStatus.split(',')"  item="status" open="(" separator="," close=")">
                     #{status}
                 </foreach>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -116,7 +116,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
             jsParam = WXPay.apppay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), 0);
         } else if (type == 1 && payWay == 2) {
             sellerAccount = SystemConfig.ALIPAY_PID;
-            orderPayVo.setPayType(2);
+            //支付宝支付类型：1、APP支付，2、预授权支付
+            //预授权支付
+            //orderPayVo.setPayType(2);
+            //普通支付
+            orderPayVo.setPayType(1);
             jsParam = generateAliPayment(orderPayVo, notifyUrl);
         } else if (type == 3 && payWay == 1) {
             sellerAccount = SystemConfig.APP_PARTNER;
@@ -271,6 +275,10 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         AlipayClient alipayClient = getAlipayClient();
         //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
         try {
+            //预授权冻结
+            //return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
+
+            //普通支付
             return appOrderPay(alipayClient, orderPayVo, notifyUrl);
         } catch (Exception e) {
             log.error(e.getMessage(), e);;