diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
index 2640e75..f689f67 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
@@ -215,10 +215,11 @@ public class PayController {
     public Result returnOrder(@RequestHeader("token") String token,
                               @RequestHeader("loginName") String loginName,
                               @RequestHeader("clientType") String clientType,
-                              @RequestBody List<TbOrderDetail> list,
-                              @RequestParam("pwd") String pwd
+                              @RequestBody List<TbOrderDetail> list
                               ){
-        return payService.returnOrder(list,token,pwd);
+
+
+        return payService.returnOrder(list,token,null);
     }
 
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
index 3259528..715822b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
@@ -167,7 +167,7 @@ public class ConsMsgConsumer {
                                 JSONObject resObj = JSONObject.parseObject(response);
                                 if (ObjectUtil.isNotEmpty(resObj) && ObjectUtil.isNotNull(resObj) && "0".equals(String.valueOf(resObj.get("errcode")))) {
                                     log.info("写入redis:{}",key);
-                                    redisUtil.saveMessage(key, object1.toString(), 10 * 60 * 1000);
+                                    redisUtil.saveMessage(key, object1.toString(), 10 * 60);
                                 }
                             }
                         });
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
index d0dd3b9..c4d0efa 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
@@ -528,7 +528,6 @@ public class MemberService {
             return Result.fail(CodeEnum.PARAM);
         }
 
-
         String accountId= TokenUtil.parseParamFromToken(token).getString("accountId");
 
         TbmerchantAccount account=  tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId));
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 0e55f03..12f6e38 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -726,24 +726,22 @@ public class PayService {
         if (ObjectUtil.isEmpty(list) || list.size() <= 0) {
             return Result.fail(CodeEnum.PARAM);
         }
-
-
-
-        String accountId= TokenUtil.parseParamFromToken(token).getString("accountId");
-
-        TbmerchantAccount account=  tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId));
-        if(Objects.isNull(account)){
-            return Result.fail(CodeEnum.ACCOUNTEIXST);
-        }
-
-
-        if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){
-            return Result.fail(CodeEnum.PWDNOSET);
-        }
-
-        if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){
-            return Result.fail(CodeEnum.PWDERROE);
-        }
+//
+//        String accountId= TokenUtil.parseParamFromToken(token).getString("accountId");
+//
+//        TbmerchantAccount account=  tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId));
+//        if(Objects.isNull(account)){
+//            return Result.fail(CodeEnum.ACCOUNTEIXST);
+//        }
+//
+//
+//        if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){
+//            return Result.fail(CodeEnum.PWDNOSET);
+//        }
+//
+//        if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){
+//            return Result.fail(CodeEnum.PWDERROE);
+//        }
 
 
         Integer orderId = list.get(0).getOrderId();
@@ -755,11 +753,6 @@ public class PayService {
             return Result.fail(CodeEnum.ORDERSTATUSERROR);
         }
 
-
-
-
-
-
         List<TbOrderDetail> orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString());