支付报接入

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/vo/OrderPayVo.java

@@ -64,5 +64,10 @@ public class OrderPayVo{
     @ApiModelProperty(value = "买家第三方付款账号")
     private String buyerAccount;
 
+    //第三方支付请求订单号
+    @ApiModelProperty(value = "第三方支付请求订单号")
+    private String tradeNo;
+
+
 
 }

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

@@ -80,6 +80,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "订单不能为空");
     }
     String trade_no =  OrderUtil.GetOrderNumber("");
+        orderPayVo.setTradeNo(trade_no);
     String order_no=orderPayVo.getOrderNo();
     Integer amount=orderPayVo.getAmount();
         log.error("---下单---order_no====="+order_no+"--支付订单号--trade_no===="+trade_no+"--金额---amount===="+amount);
@@ -114,7 +115,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
             try {
                 OrderPay orderPay= new OrderPay();
                 BeanUtils.copyProperties(orderPay,orderPayVo);
-                orderPay.setTradeNo(trade_no);
                 orderPay.setSellerAccount(sellerAccount);
                 insertSelective(orderPay);
                 log.error("---下单---order_no====="+order_no+"----成功");
@@ -257,6 +257,10 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
 //			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_order_no");
+            String operationId = params.get("operation_id");
+            notice(tradeNo,operationId);
             return ObjectRestResponse.succ().getMessage();
         } catch (AlipayApiException e) {
             log.error("", e);
@@ -325,8 +329,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         AlipayFundAuthOrderAppFreezeModel model = new AlipayFundAuthOrderAppFreezeModel();
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
         model.setOrderTitle(orderPayVo.getSubject());
-        model.setOutOrderNo(orderPayVo.getOrderNo());//替换为实际订单号
-        model.setOutRequestNo(orderPayVo.getOrderNo());//替换为实际请求单号，保证每次请求都是唯一的
+        model.setOutOrderNo(orderPayVo.getTradeNo());//替换为实际订单号
+        model.setOutRequestNo(orderPayVo.getTradeNo());//替换为实际请求单号，保证每次请求都是唯一的
         model.setPayeeUserId(SystemConfig.APP_ID);//payee_user_id,Payee_logon_id不能同时为空
         model.setProductCode("PRE_AUTH_ONLINE");//PRE_AUTH_ONLINE为固定值，不要替换
         model.setAmount(realAmount.toString());