记得上下班打卡 | git大法好,push需谨慎

Commit 5805a62c authored by zhangguobing's avatar zhangguobing

Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 20240123_COUPON_SPU

parents 0b77cce6 ad62a2a8
...@@ -324,16 +324,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -324,16 +324,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
//判断新商品券 //判断新商品券
CandyUserCouponAssocDto couponAssocDto = dataUtils.getGoblinPlatformCoupon(payOrderParam.getVoucherCode()); if(payOrderParam.getVoucherCode()!=null) {
if(couponAssocDto!=null){ CandyUserCouponAssocDto couponAssocDto = dataUtils.getGoblinPlatformCoupon(payOrderParam.getVoucherCode());
boolean goblinPlatformCouponseCanUse = false; if (couponAssocDto != null) {
for (AdamEntersVo adamEnters : entersVoList) { boolean goblinPlatformCouponseCanUse = false;
if(couponAssocDto.getIdNo().equals(adamEnters.getIdCard())){ for (AdamEntersVo adamEnters : entersVoList) {
goblinPlatformCouponseCanUse = true; if (couponAssocDto.getIdNo().equals(adamEnters.getIdCard())) {
goblinPlatformCouponseCanUse = true;
}
}
if (!goblinPlatformCouponseCanUse) {
return ResponseDto.failure("实名券与入场人信息不一致");
} }
}
if(!goblinPlatformCouponseCanUse){
return ResponseDto.failure("实名券与入场人信息不一致");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment