Merge remote-tracking branch 'origin/dev_gjy_now_order_detals_paycode' into...

Merge remote-tracking branch 'origin/dev_gjy_now_order_detals_paycode' into dev_gjy_now_order_detals_paycode

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/GoblinCouponService.java

@@ -20,7 +20,7 @@ public interface GoblinCouponService {
     Boolean receiveCoupon(String uid, List<GoblinUserCouponVo> userCouponVoList, GoblinStoreCouponVo storeCouponVo);
 
     //我的券列表 [类型 1可用 2过期/已使用]
-    List<GoblinUserCouponVo> getList(String type);
+    List<GoblinUserCouponVo> getList(String type,String uid);
 
     //是否可用券 [价格] [spuId逗号隔开] [uid]
     GoblinUserCouponVo canUse(BigDecimal totalPrice, String spuId, String uid,String storeId);

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

@@ -175,9 +175,13 @@ public class GoblinCouponController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "类型 1可用 2过期/已使用"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"),
     })
-    public ResponseDto<List<GoblinUserCouponVo>> getList(@RequestParam("type") @Valid String type) {
-        return ResponseDto.success(goblinCouponService.getList(type));
+    public ResponseDto<List<GoblinUserCouponVo>> getList(@RequestParam("type") @Valid String type,@RequestParam("uid") @Valid String uid) {
+        if(uid==null || uid.equals("")){
+            uid = CurrentUtil.getCurrentUid();
+        }
+        return ResponseDto.success(goblinCouponService.getList(type,uid));
     }
 
     @PostMapping("can/use")

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

@@ -112,8 +112,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
     }
 
     @Override
-    public List<GoblinUserCouponVo> getList(String type) {
-        String uid = CurrentUtil.getCurrentUid();
+    public List<GoblinUserCouponVo> getList(String type,String uid) {
         List<GoblinUserCouponVo> voList = goblinRedisUtils.getUserCouponVos(uid);
         List<GoblinUserCouponVo> returnList = ObjectUtil.getGoblinUserCouponVo();
 //        HashMap<String, String> storeIdNameMap = CollectionUtil.mapStringString();