|
@@ -208,9 +208,12 @@ public class PayOrderController {
|
|
|
//设置了扫码后支付成功后的领取
|
|
|
String couponIssueId = ""; //领取方式ID
|
|
|
resultMap.put("couponIssueId", couponIssueId);
|
|
|
- couponIssueId = this.getCouponIssue(stationId).get(0).getCouponIssueId();
|
|
|
- if(StringUtils.isNotBlank(couponIssueId)){
|
|
|
- resultMap.put("couponIssueId", couponIssueId);
|
|
|
+ List<CouponIssue> couponIssueList = this.getCouponIssue(stationId);
|
|
|
+ if(couponIssueList !=null && couponIssueList.size()>0){
|
|
|
+ couponIssueId = this.getCouponIssue(stationId).get(0).getCouponIssueId();
|
|
|
+ if(StringUtils.isNotBlank(couponIssueId)){
|
|
|
+ resultMap.put("couponIssueId", couponIssueId);
|
|
|
+ }
|
|
|
}
|
|
|
List<UserCoupon> userCouponsList = new ArrayList<>(); //用户的优惠券
|
|
|
resultMap.put("userCouponsList", userCouponsList);
|