xiugai

YijiaRestful/src/main/java/com/platform/yijia/controller/CouponController.java

@@ -219,7 +219,7 @@ public class CouponController {
     @RequestMapping(value = "/addUserCoupon", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
-    @ApiOperation(value = "用户领取优惠券", httpMethod = "POST", notes = "用户领取优惠券")
+    //@ApiOperation(value = "用户领取优惠券", httpMethod = "POST", notes = "用户领取优惠券")
     public String addUserCoupon(@ApiParam(value = "用户unionId", required = true) @RequestParam String unionId,
                                 @ApiParam(value = "优惠券IDS", required = true) @RequestParam String couponIds,
                                 @ApiParam(value = "领取方式ID", required = true) @RequestParam String couponIssueId,
@@ -248,7 +248,7 @@ public class CouponController {
                     //获取领取方式信息
                     CouponIssue couponIssue = new CouponIssue();
                     couponIssue.setStationId(stationId);
-                    if(stationInfos.getCouponFlag().equals("1")){
+                    if(stationInfos.getCouponFlag() !=null && stationInfos.getCouponFlag().equals("1")){
                         couponIssue.setStationId(stationInfos.getGroupId());
                     }
                     couponIssue.setCouponIssueId(couponIssueId);