Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -449,7 +449,8 @@ public class DankuanController {
                                  HttpServletRequest request, HttpServletResponse response) throws Exception {
         log.info("----------首先发送支付请求接口----------");
         //查询订单信息
-        OrderView orderView = orderViewMapper.selectById(orderId);
+        Order order = orderMapper.selectById(orderId);
+        OrderView orderView = orderViewMapper.selectById(order.getKdOrderId());
         String uuid = UUID.randomUUID().toString();
         String id = uuid.split("-")[0] + uuid.split("-")[1];
         //修改支付方式

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -434,7 +434,8 @@ public class RongHeController {
         try{
             log.info("----------首先发送支付请求接口----------");
             //查询订单信息
-            OrderView orderView = orderViewMapper.selectById(orderId);
+            Order order = orderMapper.selectById(orderId);
+            OrderView orderView = orderViewMapper.selectById(order.getKdOrderId());
             String uuid = UUID.randomUUID().toString();
             String id = uuid.split("-")[0] + uuid.split("-")[1];
             //修改支付方式