~

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinCouponController.java

@@ -17,6 +17,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -76,12 +77,14 @@ public class GoblinCouponController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeCouponId", value = "平台券id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "UID"),
 //            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "number", value = "数量"),
     })
-    public ResponseDto<Boolean> receive(@RequestParam("storeCouponId") @Valid String storeCouponId) {
+    public ResponseDto<Boolean> receive(@NotBlank(message = "平台券ID不能为空") @RequestParam("storeCouponId") @Valid String storeCouponId,
+                                        @NotBlank(message = "UID不能为空") @RequestParam("storeCouponId") @Valid String uid) {
 //    public ResponseDto<Boolean> checkOrderResult(@RequestParam("storeCouponId") @Valid String storeCouponId,
 //                                                 @RequestParam("number") @Valid Integer number) {
-        String currentUid = CurrentUtil.getCurrentUid();
+        String currentUid = uid;
         GoblinStoreCouponVo storeCouponVo = goblinRedisUtils.getStoreCouponVo(storeCouponId);
         if (null == storeCouponVo) {
             log.warn("商城:用户领取优惠券:优惠券不存在:[uid={},storeCouponId={}]", currentUid, storeCouponId);