This commit is contained in:
cun-nan 2024-01-22 13:29:42 +08:00
parent 179f49c58f
commit 8e893ae4d4

View File

@ -457,8 +457,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
activeFuletVOList.addAll(activeFuletVOLists);
//优惠券
//<<<<<<< HEAD
//paymentActiveDTO.setUserId(userId);
paymentActiveDTO.setUserId(117);
paymentActiveDTO.setUserId(userId);
// paymentActiveDTO.setUserId(117);
//=======
if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
userId = paymentActiveDTO.getUserId();