Merge remote-tracking branch 'origin/master'

src/main/java/com/bsd/say/controller/AwardListController.java

@@ -4,16 +4,14 @@ import com.bsd.say.beans.AjaxRequest;
 import com.bsd.say.beans.AjaxResult;
 import com.bsd.say.entities.AwardList;
 import com.bsd.say.service.AwardListService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("award-list")
+@CrossOrigin
 public class AwardListController extends BaseController<AwardListService, AwardList>{
     @Resource
     private AwardListService awardListService;
@@ -38,7 +36,7 @@ public class AwardListController extends BaseController<AwardListService, AwardL
     }
 
     /**
-     * 看有没有领取过奖品
+     * 是否有资格进行抽奖
      */
     @RequestMapping(value = "/is-valid-lottery")
     @ResponseBody

src/main/java/com/bsd/say/controller/CouponController.java

@@ -23,14 +23,14 @@ public class CouponController  extends BaseController<CouponService, Coupon>{
 
 
     /**
-     * 看有没有领取过优惠券
+     * 是否有资格领取优惠券
      */
-    @RequestMapping(value = "/is-receive-coupon")
+    @RequestMapping(value = "/is-valid-get-coupon")
     @ResponseBody
-    public AjaxResult isReceiveCoupon(@RequestBody AjaxRequest ajaxRequest){
+    public AjaxResult isValidGetCoupon(@RequestBody AjaxRequest ajaxRequest){
         AjaxResult ajaxResult = new AjaxResult();
         try {
-            ajaxResult = couponService.isReceiveCoupon(ajaxRequest);
+            ajaxResult = couponService.isValidGetCoupon(ajaxRequest);
         } catch (Exception e) {
             e.printStackTrace();
             String errMsg = e.getMessage() != null ? e.getMessage() : "操作失败";

src/main/java/com/bsd/say/controller/LoveLetterController.java

@@ -4,16 +4,14 @@ import com.bsd.say.beans.AjaxRequest;
 import com.bsd.say.beans.AjaxResult;
 import com.bsd.say.entities.LoveLetter;
 import com.bsd.say.service.LoveLetterService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("love-letter")
+@CrossOrigin
 public class LoveLetterController extends BaseController<LoveLetterService, LoveLetter>{
 
     @Resource

src/main/java/com/bsd/say/controller/LoveTypeController.java

@@ -4,6 +4,7 @@ import com.bsd.say.beans.AjaxRequest;
 import com.bsd.say.beans.AjaxResult;
 import com.bsd.say.entities.LoveType;
 import com.bsd.say.service.LoveTypeService;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("love-type")
+@CrossOrigin
 public class LoveTypeController extends BaseController<LoveTypeService, LoveType>{
     @Resource
     private LoveTypeService loveTypeService;

src/main/java/com/bsd/say/service/CouponService.java

@@ -7,5 +7,5 @@ import com.bsd.say.entities.Coupon;
 public interface CouponService extends BaseService<Coupon> {
     AjaxResult receiveCoupon(AjaxRequest ajaxRequest);
 
-    AjaxResult isReceiveCoupon(AjaxRequest ajaxRequest);
+    AjaxResult isValidGetCoupon(AjaxRequest ajaxRequest);
 }

src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java

@@ -132,7 +132,7 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
      * @return
      */
     @Override
-    public AjaxResult isReceiveCoupon(AjaxRequest ajaxRequest) {
+    public AjaxResult isValidGetCoupon(AjaxRequest ajaxRequest) {
         AjaxResult ajaxResult = new AjaxResult();
         JSONObject data = ajaxRequest.getData();
         if (data == null){