|
@@ -706,22 +706,24 @@ public class XiaoJuServiceImpl implements XiaoJuService {
|
|
|
}
|
|
|
|
|
|
XiaoJuQueryUserPromotionListModel xiaoJuQueryUserPromotionListModel = new XiaoJuQueryUserPromotionListModel();
|
|
|
- xiaoJuQueryUserPromotionListModel.setPageIndex(0);
|
|
|
+ xiaoJuQueryUserPromotionListModel.setPageIndex(1);
|
|
|
xiaoJuQueryUserPromotionListModel.setPageSize(20);
|
|
|
xiaoJuQueryUserPromotionListModel.setStatus(5);
|
|
|
|
|
|
ResultContent<QueryUserPromotionListResponse> queryUserPromotionListResponseResultContent = queryUserPromotionList(xiaoJuQueryUserPromotionListModel);
|
|
|
QueryUserPromotionListResponse queryUserPromotionListResponse = queryUserPromotionListResponseResultContent.getContent();
|
|
|
|
|
|
- if (queryUserPromotionListResponse != null) {
|
|
|
+ if (queryUserPromotionListResponse.getTotalSize() != 0) {
|
|
|
return ResultContent.build(ResultState.Fail, "有未消费的优惠券,请先使用");
|
|
|
}
|
|
|
|
|
|
+ String tradeNo = snowflake.nextIdStr();
|
|
|
|
|
|
QueryGetPromotionRequest queryGetPromotionRequest = new QueryGetPromotionRequest();
|
|
|
queryGetPromotionRequest.setActivityId(activityId);
|
|
|
queryGetPromotionRequest.setOutUserId(currentUser.getUserId());
|
|
|
queryGetPromotionRequest.setMobile(currentUser.getPhone());
|
|
|
+ queryGetPromotionRequest.setTradeNo(tradeNo);
|
|
|
|
|
|
|
|
|
QueryClient queryClient = QueryClientFactory.create(oilConfig);
|
|
@@ -732,6 +734,11 @@ public class XiaoJuServiceImpl implements XiaoJuService {
|
|
|
apiLog.setSystem("xiaoju");
|
|
|
try {
|
|
|
List<GenPromotionInfo> response = queryClient.promotion().getPromotion(queryGetPromotionRequest);
|
|
|
+ XiaoJuActivityReceiver xiaoJuActivityReceiver = new XiaoJuActivityReceiver();
|
|
|
+ xiaoJuActivityReceiver.setActivityId(activityId);
|
|
|
+ xiaoJuActivityReceiver.setUserId(currentUser.getUserId());
|
|
|
+ xiaoJuActivityReceiver.setTradeNo(tradeNo);
|
|
|
+ xiaoJuActivityReceiverDao.save(xiaoJuActivityReceiver);
|
|
|
apiLog.setResponse(JSONUtil.toJsonStr(response));
|
|
|
apiLogDao.save(apiLog);
|
|
|
return ResultContent.buildContent(response);
|