Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyCouponRelateAdminServiceImpl.java

@@ -41,14 +41,13 @@ public class CandyCouponRelateAdminServiceImpl extends ServiceImpl<CandyCouponRe
     @Override
     public AjaxResult relate(CandyMgtCouponRelateParam couponRelateParam) {
         String couponId = couponRelateParam.getCouponId();
-
         LambdaQueryWrapper<CandyCoupon> couponLambdaQueryWrapper = Wrappers.lambdaQuery();
         couponLambdaQueryWrapper.eq(CandyCoupon::getCouponId, couponId);
         couponLambdaQueryWrapper.eq(CandyCoupon::getState, 1);
         CandyCoupon coupon = candyCouponAdminService.getOne(couponLambdaQueryWrapper);
-        if (coupon.getCouType() != 101) {
-            return AjaxResult.warn("当前操作只支持优先券类型");
-        }
+        if (null == coupon) return AjaxResult.warn("券不存在");
+        if (coupon.getCouType() != 101) return AjaxResult.warn("当前操作只支持优先券类型");
+
         String key;
         Integer scope = couponRelateParam.getScope();
         switch (scope) {