Merge branch 'master-alipay-change' into base-modify

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

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

@@ -228,22 +228,10 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> implements In
                 valueStr = (i == values.length - 1) ? valueStr + values[i]
                         : valueStr + values[i] + ",";
             }
-            log.info(valueStr);
-            //乱码解决，这段代码在出现乱码时使用。
-            //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
             params.put(name, valueStr);
         }
         String msg = JSONObject.toJSONString(params);
         log.info("alipay notify message={}", msg);
-        //添加回调记录
-//		PaymentCallbackLog callbackLog = new PaymentCallbackLog();
-//		callbackLog.setPayCode(rstradeNo);
-//		callbackLog.setPayType(SystemConstant.PayType.ALIPAY);
-//		callbackLog.setOrderCode(rsOrderCode);
-//		callbackLog.setMessage(msg);
-//		paymentCallbackLogRepository.save(callbackLog);
-//        切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
-//        boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
         //支付宝回调验签
         try {
             boolean flag = AlipaySignature.rsaCheckV1(params, SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.CHARSET_UTF8, AlipayConstants.SIGN_TYPE_RSA2);
@@ -252,36 +240,26 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> implements In
                 return ObjectRestResponse.createDefaultFail().getMessage();
             }
             String rsTradeStatus = params.get("trade_status");
-            if (!SystemConfig.ALIPAY_TRADE_FINISHED.equals(rsTradeStatus) && !SystemConfig.ALIPAY_TRADE_SUCCESS.equals(rsTradeStatus)) {
+            if (StringUtils.isBlank(rsTradeStatus)) { //订单预授权支付回调
+				String status = params.get("status");
+				if (!status.equals("SUCCESS")) {
+					log.info("alipay order trade_status has problem, result={}", msg);
+					return ObjectRestResponse.createDefaultFail().getMessage();
+				}
+			//订单APP支付回调
+			} else if (!SystemConfig.ALIPAY_TRADE_FINISHED.equals(rsTradeStatus) && !SystemConfig.ALIPAY_TRADE_SUCCESS.equals(rsTradeStatus)) {
                 log.info("alipay order trade_status has problem, result={}", msg);
                 return ObjectRestResponse.createDefaultFail().getMessage();
             }
-            //String rsSellerId = params.get("seller_id");
-//
-//			PaymentRecord paymentRecord = paymentRecordRepository.findOneByOrderCode(rsOrderCode);
-//			//验证付款信息
-//			if (paymentRecord == null || !paymentRecord.getAmount().toString().equals(rsAmount)
-//					|| !aliPayConfig.getAppId().equals(rsAppId)) {
-//				log.info("alipay order notify fail, result={}", msg);
-//				return Response.FAILURE.getHeader().getMessage();
-//			}
-
-//			//重复回调
-//			if (paymentRecord.getStatus().intValue() != 1) {
-//				log.info("alipay order repeat notify, result={}", msg);
-//				return Response.SUCCESS().getHeader().getMessage();
-//			}
-//
-//			paymentRecord.setPayCode(rstradeNo);
-//			paymentRecord.setStatus(2);
-//			paymentRecordRepository.save(paymentRecord);
-
-//			Map<String, Object> sendMap =  DataUtils.objectToMap(paymentRecord);
-//			sendMap.put("amount", new BigDecimal(rsAmount).multiply(new BigDecimal(100)).intValue());
-//			sendMsgToOrder(JSONObject.toJSONString(sendMap));
 
             String tradeNo = params.get("out_trade_no");
+			if (StringUtils.isBlank(tradeNo)) {
+				tradeNo = params.get("out_request_no");
+			}
             String operationId = params.get("trade_no");
+            if (StringUtils.isBlank(operationId)) {
+            	operationId = params.get("auth_no");
+			}
             notice(tradeNo, operationId);
             return ObjectRestResponse.succ().getMessage();
         } catch (AlipayApiException e) {
@@ -662,25 +640,22 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> implements In
         }
         return false;
     }
-
-    public static void main(String[] args) {
-        OrderPayBiz orderPayBiz = new OrderPayBiz();
-        FundPayVo fundPayVo = new FundPayVo();
-        fundPayVo.setRemark("转账");
-        fundPayVo.setOutBizNo("12345678");
-        fundPayVo.setAmount("0.1");
-        fundPayVo.setPayeeAccount("2088212169302286");
-        AlipayClient alipayClient = orderPayBiz.getAlipayClient();
-        try {
-            System.out.println(orderPayBiz.alipayfundTrans(alipayClient, fundPayVo));
-        } catch (AlipayApiException e) {
-            e.printStackTrace();
-        }
-    }
-
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		wxNeedPayErrorCodes = EnumSet.allOf(WxNeedPayErrorEnum.class).stream().map(WxNeedPayErrorEnum::name).collect(Collectors.toList());
 		aliNeedPayErrorCodes = EnumSet.allOf(AliNeedPayErrorEnum.class).stream().map(AliNeedPayErrorEnum::name).collect(Collectors.toList());
 	}
+    public static void main(String[] args) throws AlipayApiException {
+        OrderPayBiz orderPayBiz = new OrderPayBiz();
+        OrderPayVo orderPayVo = new OrderPayVo();
+        orderPayVo.setOrderNo("20191024121000010004");
+        orderPayVo.setTradeNo("2019102410002001530572255591");
+        orderPayVo.setAmount(2);
+        orderPayVo.setBody("扣除租车订单费用");
+        orderPayVo.setSubject("租车订单交易费用");
+        orderPayBiz.fundAuthOrderUnFreeze(orderPayVo, "");
+        //orderPayBiz.alipayOrderRefund("20190806134440000001","2019080622001421530542309594", 3, "xxxx", "");
+        //orderPayBiz.tradePay(orderPayVo, "");
+        //orderPayBiz.fundAuthCancel(orderPayVo, "");
+    }
 }