ufo / yohoufo-fore · Commits

Go to a project

Authored by 马力
Commit 1c88e93fecfacb274647b3b65d8156c71e1f6543 2 parents 16d165b1 8e936091

Merge branch 'test6.9.21' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.21

Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
@@ -3,15 +3,12 @@ package com.yohoufo.promotion.controller; @@ -3,15 +3,12 @@ package com.yohoufo.promotion.controller;
3 import com.yoho.core.rest.annotation.ServiceDesc; 3 import com.yoho.core.rest.annotation.ServiceDesc;
4 import com.yohobuy.ufo.model.promotion.CouponSimpleBo; 4 import com.yohobuy.ufo.model.promotion.CouponSimpleBo;
5 import com.yohobuy.ufo.model.promotion.request.CouponListReq; 5 import com.yohobuy.ufo.model.promotion.request.CouponListReq;
6 -import com.yohobuy.ufo.model.promotion.response.CouponInfo;  
7 -import com.yohobuy.ufo.model.promotion.response.CouponInfoListBo;  
8 import com.yohobuy.ufo.model.promotion.response.CouponListBo; 6 import com.yohobuy.ufo.model.promotion.response.CouponListBo;
9 import com.yohoufo.common.ApiResponse; 7 import com.yohoufo.common.ApiResponse;
10 import com.yohoufo.promotion.service.impl.CollectiveCouponService; 8 import com.yohoufo.promotion.service.impl.CollectiveCouponService;
11 import org.slf4j.Logger; 9 import org.slf4j.Logger;
12 import org.slf4j.LoggerFactory; 10 import org.slf4j.LoggerFactory;
13 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
14 -import org.springframework.stereotype.Service;  
15 import org.springframework.web.bind.annotation.RequestMapping; 12 import org.springframework.web.bind.annotation.RequestMapping;
16 import org.springframework.web.bind.annotation.RequestParam; 13 import org.springframework.web.bind.annotation.RequestParam;
17 import org.springframework.web.bind.annotation.ResponseBody; 14 import org.springframework.web.bind.annotation.ResponseBody;
1 package com.yohoufo.promotion.controller; 1 package com.yohoufo.promotion.controller;
2 2
  3 +import com.yoho.core.rest.annotation.ServiceDesc;
3 import com.yohobuy.ufo.model.promotion.CouponDisplayBo; 4 import com.yohobuy.ufo.model.promotion.CouponDisplayBo;
4 import com.yohobuy.ufo.model.promotion.CouponSimpleBo; 5 import com.yohobuy.ufo.model.promotion.CouponSimpleBo;
5 import com.yohobuy.ufo.model.promotion.response.CouponSendBo; 6 import com.yohobuy.ufo.model.promotion.response.CouponSendBo;
6 import com.yohoufo.common.ApiResponse; 7 import com.yohoufo.common.ApiResponse;
7 import com.yohoufo.common.annotation.IgnoreSession; 8 import com.yohoufo.common.annotation.IgnoreSession;
  9 +import com.yohoufo.common.annotation.IgnoreSignature;
  10 +import com.yohoufo.common.annotation.InnerApi;
8 import com.yohoufo.promotion.service.ICouponCacheService; 11 import com.yohoufo.promotion.service.ICouponCacheService;
9 import com.yohoufo.promotion.service.ICouponService; 12 import com.yohoufo.promotion.service.ICouponService;
10 import com.yohoufo.promotion.service.impl.CouponDisplayService; 13 import com.yohoufo.promotion.service.impl.CouponDisplayService;
@@ -17,6 +20,7 @@ import java.util.List; @@ -17,6 +20,7 @@ import java.util.List;
17 20
18 @RestController 21 @RestController
19 @RequestMapping("/erp") 22 @RequestMapping("/erp")
  23 +@ServiceDesc("coupon")
20 public class ErpGWCouponController { 24 public class ErpGWCouponController {
21 25
22 private final Logger logger = LoggerFactory.getLogger(getClass()); 26 private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -90,6 +94,8 @@ public class ErpGWCouponController { @@ -90,6 +94,8 @@ public class ErpGWCouponController {
90 94
91 @RequestMapping("/coupon/addOrUpdateDisplay") 95 @RequestMapping("/coupon/addOrUpdateDisplay")
92 @IgnoreSession 96 @IgnoreSession
  97 + @IgnoreSignature
  98 + @InnerApi
93 public int addOrUpdateDisplay(@RequestBody CouponDisplayBo req){ 99 public int addOrUpdateDisplay(@RequestBody CouponDisplayBo req){
94 return couponDisplayService.addOrUpdate(req); 100 return couponDisplayService.addOrUpdate(req);
95 } 101 }