修改

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

@@ -175,7 +175,7 @@ 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"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "uid", value = "用户id"),
     })
     public ResponseDto<List<GoblinUserCouponVo>> getList(@RequestParam("type") @Valid String type,@RequestParam(value = "uid",required = false) String uid) {
         if(uid==null || uid.equals("")){

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

 package com.liquidnet.service.goblin.controller.Inner;
 
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.erp.config.ErpWdtClient;
-import com.liquidnet.service.erp.constant.ErpEnum;
-import com.liquidnet.service.erp.param.TradeListParam;
-import com.liquidnet.service.erp.vo.TradePushVo;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiCommonParam;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.IGoblinConsumerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinInnerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinZhengzaiService;
-import com.liquidnet.service.goblin.util.GoblinOrderUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 正在下单活动管理
@@ -142,31 +131,4 @@ public class GoblinInnerZhengzaiController {
     public ResponseDto<Boolean> consumerType34(String finalSkuId, Integer finalType, String xlsPath, String oXlsPath, String listId) {
         return goblinConsumerService.consumerType34(finalSkuId, finalType, xlsPath, oXlsPath, listId);
     }
-
-
-//    @Autowired
-//    GoblinOrderUtils goblinOrderUtils;
-//    @Autowired
-//    private ErpWdtClient erpWdtClient;
-//
-//    @PostMapping("test112233")
-//    @ApiOperation("测试11")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "orderId"),
-//    })
-//    public ResponseDto<TradePushVo> test112233(String orderId) {
-////        List<TradeListParam> aa = goblinOrderUtils.getErpOrder(orderId);
-////        log.info("data = " + JSON.toJSONString(aa));
-////        return ResponseDto.success();
-//
-//
-//        Map<String, String> param = CollectionUtil.linkMapStringString();
-//        param.put("shop_no", "mdtk2-test");
-////        List<HashMap<String, Object>> tradeList = new ArrayList<>();
-////        tradeList.add(TradeListParam.getNew().test(num));
-//        param.put("trade_list", JSON.toJSONString(goblinOrderUtils.getErpOrder(orderId)));
-//        String json = erpWdtClient.execute(ErpEnum.WdtAPI.TRADE_PUSH.getUri(), param);
-//        TradePushVo data = JsonUtils.fromJson(json, TradePushVo.class);
-//        return ResponseDto.success(data);
-//    }
 }