Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -782,6 +782,7 @@ public class OrderPayController {
             orderPayBeforeService.payOrderCheck(order);
 
             JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order);
+            thirdPreOrder.put("thirdUserCode", order.getMemPhone());
             order.setPayChannel(3);
             order.setPayChannelOrderNo(thirdPreOrder.getString("preOrderNo"));
             order.setProfitSharingStatus(false);
@@ -814,6 +815,7 @@ public class OrderPayController {
             }
 
             JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order);
+            thirdPreOrder.put("thirdUserCode", order.getMemPhone());
             order.setPayChannel(3);
             order.setPayChannelOrderNo(thirdPreOrder.getString("preOrderNo"));
             order.setProfitSharingStatus(false);