From e0786b57f356db59efc6a4a3dd5e23908775286a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 19:42:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 3d96cac..9394121 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -1186,8 +1186,10 @@
}else {
detailsVo.setUseType(1);
detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
- StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
- detailsVo.setWriteOffName(courseOfStore.getStoreName());
+ if (byId.getStoreId()!=null) {
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
+ detailsVo.setWriteOffName(courseOfStore.getStoreName());
+ }
}
switch (pmdsServiceById.getUseScope()){
case 1:
--
Gitblit v1.7.1