jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
c5665e07 1 parent efb9ed0b

fix

Inline Side-by-side
Showing 3 changed files with 20 additions and 4 deletions
...@@ -70,6 +70,7 @@ public class LoginInterceptor implements HandlerInterceptor { ...@@ -70,6 +70,7 @@ public class LoginInterceptor implements HandlerInterceptor {
70 StpUtil.checkLogin(); 70 StpUtil.checkLogin();
71 final var enterpriseId = Convert.toInt(StpUtil.getExtra(CommonConstants.ENTERPRISE_ID)); 71 final var enterpriseId = Convert.toInt(StpUtil.getExtra(CommonConstants.ENTERPRISE_ID));
72 final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE)); 72 final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE));
73 + final var userId = StpUtil.getExtra(CommonConstants.USER_ID);
73 if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) { 74 if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) {
74 final var openId = Convert.toStr(StpUtil.getExtra(CommonConstants.OPEN_ID)); 75 final var openId = Convert.toStr(StpUtil.getExtra(CommonConstants.OPEN_ID));
75 final var loginId = StpUtil.getLoginIdAsInt(); 76 final var loginId = StpUtil.getLoginIdAsInt();
...@@ -115,8 +116,7 @@ public class LoginInterceptor implements HandlerInterceptor { ...@@ -115,8 +116,7 @@ public class LoginInterceptor implements HandlerInterceptor {
115 builder.id(loginId).enterpriseId(enterpriseId).name(operator.getName()).loginSource(LoginSourceEnum.KDS); 116 builder.id(loginId).enterpriseId(enterpriseId).name(operator.getName()).loginSource(LoginSourceEnum.KDS);
116 return true; 117 return true;
117 } else { 118 } else {
118 - final var loginId = StpUtil.getLoginIdAsString(); 119 + builder.id(userId == null ? null : Convert.toInt(userId)).openId(StpUtil.getLoginIdAsString()).enterpriseId(enterpriseId).loginSource(LoginSourceEnum.MINI_PROGRAM);
119 - builder.openId(loginId).enterpriseId(enterpriseId).loginSource(LoginSourceEnum.MINI_PROGRAM);
120 return true; 120 return true;
121 } 121 }
122 } 122 }
......
...@@ -123,6 +123,9 @@ public class MealOrderServiceRpcClient { ...@@ -123,6 +123,9 @@ public class MealOrderServiceRpcClient {
123 } 123 }
124 124
125 public List<SingleDinerRpcResponse> getDinersByIds(int enterpriseId, List<Integer> dinerIds) { 125 public List<SingleDinerRpcResponse> getDinersByIds(int enterpriseId, List<Integer> dinerIds) {
126 + if (CollectionUtils.isEmpty(dinerIds)) {
127 + return Collections.emptyList();
128 + }
126 return mealOrderServiceRpcBlockingStub.getDinersByIds(GetDinersByIdsRpcRequest.newBuilder() 129 return mealOrderServiceRpcBlockingStub.getDinersByIds(GetDinersByIdsRpcRequest.newBuilder()
127 .setEnterpriseId(enterpriseId) 130 .setEnterpriseId(enterpriseId)
128 .addAllIds(dinerIds) 131 .addAllIds(dinerIds)
...@@ -148,6 +151,9 @@ public class MealOrderServiceRpcClient { ...@@ -148,6 +151,9 @@ public class MealOrderServiceRpcClient {
148 } 151 }
149 152
150 public List<SingleGradeClassRpcResponse> getGradeClassesByIds(int enterpriseId, List<Integer> gradeClassIds) { 153 public List<SingleGradeClassRpcResponse> getGradeClassesByIds(int enterpriseId, List<Integer> gradeClassIds) {
154 + if (CollectionUtils.isEmpty(gradeClassIds)) {
155 + return Collections.emptyList();
156 + }
151 return mealOrderServiceRpcBlockingStub.getGradeClassesByIds(GetGradeClassesByIdsRpcRequest.newBuilder() 157 return mealOrderServiceRpcBlockingStub.getGradeClassesByIds(GetGradeClassesByIdsRpcRequest.newBuilder()
152 .setEnterpriseId(enterpriseId) 158 .setEnterpriseId(enterpriseId)
153 .addAllIds(gradeClassIds) 159 .addAllIds(gradeClassIds)
...@@ -167,6 +173,9 @@ public class MealOrderServiceRpcClient { ...@@ -167,6 +173,9 @@ public class MealOrderServiceRpcClient {
167 } 173 }
168 174
169 public List<SingleMealOrderRpcResponse> queryReserveMealOrdersByDinerIds(int enterpriseId, List<Integer> dinerIds) { 175 public List<SingleMealOrderRpcResponse> queryReserveMealOrdersByDinerIds(int enterpriseId, List<Integer> dinerIds) {
176 + if (CollectionUtils.isEmpty(dinerIds)) {
177 + return Collections.emptyList();
178 + }
170 return mealOrderServiceRpcBlockingStub.queryReserveMealOrdersByDinerIds(QueryReserveMealOrdersByDinerIdsRpcRequest.newBuilder() 179 return mealOrderServiceRpcBlockingStub.queryReserveMealOrdersByDinerIds(QueryReserveMealOrdersByDinerIdsRpcRequest.newBuilder()
171 .setEnterpriseId(enterpriseId) 180 .setEnterpriseId(enterpriseId)
172 .addAllDinerIds(dinerIds) 181 .addAllDinerIds(dinerIds)
...@@ -201,6 +210,9 @@ public class MealOrderServiceRpcClient { ...@@ -201,6 +210,9 @@ public class MealOrderServiceRpcClient {
201 } 210 }
202 211
203 public boolean deleteMpAccountDinerRefsByIds(int enterpriseId, List<Integer> ids) { 212 public boolean deleteMpAccountDinerRefsByIds(int enterpriseId, List<Integer> ids) {
213 + if (CollectionUtils.isEmpty(ids)) {
214 + return false;
215 + }
204 return mealOrderServiceRpcBlockingStub.deleteMpAccountDinerRefsByIds(DeleteMpAccountDinerRefsByIdsRpcRequest.newBuilder() 216 return mealOrderServiceRpcBlockingStub.deleteMpAccountDinerRefsByIds(DeleteMpAccountDinerRefsByIdsRpcRequest.newBuilder()
205 .setEnterpriseId(enterpriseId) 217 .setEnterpriseId(enterpriseId)
206 .addAllIds(ids) 218 .addAllIds(ids)
...@@ -215,6 +227,9 @@ public class MealOrderServiceRpcClient { ...@@ -215,6 +227,9 @@ public class MealOrderServiceRpcClient {
215 } 227 }
216 228
217 public List<SingleMealMenuRecordRpcResponse> queryLatestMealMenuRecordsByClientIds(int enterpriseId, List<Integer> ids) { 229 public List<SingleMealMenuRecordRpcResponse> queryLatestMealMenuRecordsByClientIds(int enterpriseId, List<Integer> ids) {
230 + if (CollectionUtils.isEmpty(ids)) {
231 + return Collections.emptyList();
232 + }
218 return mealOrderServiceRpcBlockingStub.queryLatestMealMenuRecordsByClientIds(QueryLatestMealMenuRecordsByClientIdsRpcRequest.newBuilder() 233 return mealOrderServiceRpcBlockingStub.queryLatestMealMenuRecordsByClientIds(QueryLatestMealMenuRecordsByClientIdsRpcRequest.newBuilder()
219 .setEnterpriseId(enterpriseId) 234 .setEnterpriseId(enterpriseId)
220 .addAllClientId(ids) 235 .addAllClientId(ids)
......
...@@ -66,9 +66,10 @@ public class LoginServiceImpl implements LoginService { ...@@ -66,9 +66,10 @@ public class LoginServiceImpl implements LoginService {
66 } else { 66 } else {
67 mpAccountId = mpAccountByOpenId.getId(); 67 mpAccountId = mpAccountByOpenId.getId();
68 } 68 }
69 - Assert.isTrue(mpAccountId == 0, "创建小程序账号失败"); 69 + Assert.isTrue(mpAccountId != 0, "创建小程序账号失败");
70 - StpUtil.login(mpAccountId, SaLoginModel.create() 70 + StpUtil.login(loginDto.getOpenId(), SaLoginModel.create()
71 .setExtra(CommonConstants.ENTERPRISE_ID, loginDto.getEnterpriseId()) 71 .setExtra(CommonConstants.ENTERPRISE_ID, loginDto.getEnterpriseId())
72 + .setExtra(CommonConstants.USER_ID, mpAccountId)
72 .setExtra(CommonConstants.LOGIN_SOURCE, loginDto.getLoginSourceEnum().getValue()) 73 .setExtra(CommonConstants.LOGIN_SOURCE, loginDto.getLoginSourceEnum().getValue())
73 .build()); 74 .build());
74 return StpUtil.getTokenInfo(); 75 return StpUtil.getTokenInfo();
......