|
@@ -711,7 +711,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
|
|
|
}
|
|
|
|
|
|
// 券发放
|
|
|
- public ResultContent<List<GenPromotionInfo>> getPromotion(String activityId) {
|
|
|
+ public ResultContent getPromotion(String activityId) {
|
|
|
AuthDetails currentUser = authHelper.getCurrentUser();
|
|
|
// XiaoJuActivity byActivityId = xiaoJuActivityDao.findByActivityId(activityId);
|
|
|
// if (byActivityId == null) {
|
|
@@ -783,7 +783,8 @@ public class XiaoJuServiceImpl implements XiaoJuService {
|
|
|
e.printStackTrace();
|
|
|
apiLog.setResponse(e.getCause().getCause().getMessage());
|
|
|
apiLogDao.save(apiLog);
|
|
|
- return ResultContent.build(ResultState.Fail, e.getCause().getCause().getMessage().split("详细")[0]);
|
|
|
+ return ResultContent.builder().state(ResultState.Fail).msg(e.getCause().getCause().getMessage().split("详细")[0]).build();
|
|
|
+// return ResultContent.build(ResultState.Fail, e.getCause().getCause().getMessage().split("详细")[0]);
|
|
|
|
|
|
}
|
|
|
}
|