Merge remote-tracking branch 'origin/master'

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

@@ -424,19 +424,19 @@ public class DankuanController {
      * @throws Exception
      */
     @PostMapping(value = "orderPay")
-    public ResponseData<Object> toPaymentPlatformPage(@RequestParam("orderId") String orderId, @RequestParam("ipay") String ipay, @RequestParam("userId") String userId, HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public ResponseData<Object> toPaymentPlatformPage(@RequestParam("orderSeq") String orderSeq, @RequestParam("ipay") String ipay, @RequestParam("userId") String userId, HttpServletRequest request, HttpServletResponse response) {
         String uuid = UUID.randomUUID().toString();
         try {
-            boolean boo1 = redisLockUtil.redisLock(orderId,uuid,10);
+            boolean boo1 = redisLockUtil.redisLock(orderSeq,uuid,10);
             if(!boo1){
                 return ResponseData.error("已在支付中");
             }
-            String result = JsoupMethodZhifu(orderId, ipay, userId, request, response);
+            String result = JsoupMethodZhifu(orderSeq, ipay, userId, request, response);
             return ResponseData.success(result);
         }catch (Exception e){
             e.getMessage();
         }finally {
-            redisLockUtil.deleteLock(orderId);
+            redisLockUtil.deleteLock(orderSeq);
         }
         return ResponseData.error("订单异常");
     }