diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
index abc775c..c67e28e 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
@@ -211,4 +211,17 @@ public class AdminGoodsController extends BaseController {
         jsonObject.put("data",gsmap);
         return jsonObject;
     }
+
+    /**
+     * 手动下架委托数
+     * @param goodsIsli
+     * @return
+     */
+    @RequestMapping("/whetherOff")
+    public JSONObject whetherOff(String goodsIsli){
+        Map mp =goodsService.whetherOff(goodsIsli);
+        jsonObject.put("code",mp.get("code"));
+        jsonObject.put("msg",mp.get("msg"));
+        return jsonObject;
+    }
 }
diff --git a/src/main/java/cn/chjyj/szwh/service/GoodsService.java b/src/main/java/cn/chjyj/szwh/service/GoodsService.java
index f99003e..16b495f 100644
--- a/src/main/java/cn/chjyj/szwh/service/GoodsService.java
+++ b/src/main/java/cn/chjyj/szwh/service/GoodsService.java
@@ -49,4 +49,11 @@ public interface GoodsService {
      * @return
      */
     Map<String,Object> getGoodsDetail(String islicode);
+
+    /**
+     * 下架操作
+     * @param goodsIsli
+     * @return
+     */
+    Map<String,Object> whetherOff(String goodsIsli);
 }
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 5b08371..01feeb2 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -157,7 +157,24 @@ public class GoodsServiceImpl implements GoodsService {
 
         List nglist= new ArrayList();
         List<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(gmap,orderkey,"DESC",limit,start);
-        retmap.put("data",goodsListVoList);
+        for(GoodsListVo gl:goodsListVoList){
+            Map glmap = new HashMap();
+            glmap.put("id",gl.getId());
+            glmap.put("createtime",gl.getCreatetime());
+            glmap.put("goods_islicode",gl.getGoods_islicode());
+            glmap.put("goods_name",gl.getGoods_name());
+            glmap.put("username",gl.getUsername());
+            glmap.put("user_islicode",gl.getUser_islicode());
+            glmap.put("goods_type",gl.getGoods_type());
+            glmap.put("goods_status",gl.getGoods_status());
+            glmap.put("goods_detail_id",gl.getGoods_detail_id());
+            glmap.put("is_recommend",gl.getIs_recommend());
+            glmap.put("entrust_status",gl.getEntrust_status());
+            //处理其他操作
+            glmap.put("key",gl.getGoods_islicode());
+            nglist.add(glmap);
+        }
+        retmap.put("data",nglist);
         // 总的记录
         int total = goodsMapper.countGoodsListVo(gmap);
         retmap.put("total",total);
@@ -232,4 +249,30 @@ public class GoodsServiceImpl implements GoodsService {
 
         return retmap;
     }
+
+    /**
+     * 下架操作
+     * @param goodsIsli
+     * @return
+     */
+    @Override
+    public Map<String, Object> whetherOff(String goodsIsli) {
+        Map retmap = new HashMap();
+        String msg="没有该条委托数据";
+        int code=400;
+        Goods goods = goodsMapper.getGoodsByIsli(goodsIsli);
+        // 非在售状态
+        if(goods.getGoodsStatus()!=1 && goods.getGoodsStatus()!=5){
+            msg="暂时只支持对已发布/暂停中文化数据进行撤销！";
+        }
+        //
+        if(goods.getApplyOut()==1){
+            msg="请勿重复提交撤销委托申请！";
+        }
+
+        retmap.put("msg",msg);
+        retmap.put("code",code);
+
+        return retmap;
+    }
 }
diff --git a/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java b/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
index a3e6a71..64bcfae 100644
--- a/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
+++ b/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
@@ -16,6 +16,8 @@ public class GoodsListVo {
     private Integer goods_detail_id; //商品明细ID |goods
     private Integer is_recommend; //是否推荐；0：否；1：是  \goods
     private Integer entrust_status; //商品委托类型；1：转让；2：许可 \goods_detail
+    //处理其他操作
+    private String key;
 
     public Integer getId() {
         return id;
@@ -104,4 +106,12 @@ public class GoodsListVo {
     public void setEntrust_status(Integer entrust_status) {
         this.entrust_status = entrust_status;
     }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }