fix:merge

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/dto/StudentWrapper.java

@@ -32,6 +32,9 @@ public class StudentWrapper {
         private Integer gender;
 
         private Boolean tokenCheck;
+
+
+        private Integer lockFlag;
     }
 
     @Data

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -937,7 +937,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
         // 1.查询酷乐秀学生账户
         HttpResponseResult<StudentWrapper.UnionStudentResp> unionStudent = adminFeignService.unionStudent(
-            StudentWrapper.UnionStudent.builder().tokenCheck(false).mobile(order.getMobile()).build());
+            StudentWrapper.UnionStudent.builder().tokenCheck(false).lockFlag(1).mobile(order.getMobile()).build());
 
         Long userId = unionStudent.getData().getUserId();
         UmsMember umsMember = memberService.getById(userId);