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/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
index 3d45b28..c4d0efa 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
@@ -523,27 +523,26 @@ public class MemberService {
                 || !map.containsKey("shopId") || ObjectUtil.isEmpty(map.get("shopId"))
                 || !map.containsKey("memberId") || ObjectUtil.isEmpty(map.get("memberId"))
                 || !map.containsKey("amount") || ObjectUtil.isEmpty(map.get("amount"))
-//                ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd"))
+                ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd"))
         ) {
             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(map.get("pwd").toString().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(map.get("pwd").toString().concat(account.getAccount()).concat(account.getId().toString())))){
+            return Result.fail(CodeEnum.PWDERROE);
+        }
 
 
         String memberId = String.valueOf(map.get("memberId"));