Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

@@ -75,7 +75,7 @@ public class TaGoodsController extends BaseController {
      * @param taGoods 实体对象
      * @return
      */
-    @RequestMapping(value="/taGoods",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
     public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -116,15 +116,40 @@ public class TaGoodsController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
      * @param taGoods 实体对象
      * @return
      */
-    @RequestMapping(value="/taGoods/{id}",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@PathVariable Integer id,
-                                        @RequestBody TaGoods taGoods){
+    @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaGoodsService.updateById(taGoods)){
+                responseBean.addSuccess(taGoods);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 修改对象
+     * @param taGoods 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
         ResponseBean responseBean = new ResponseBean();
         try {
+            if(taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taGoods.setStatus(CommConstant.STATUS_UNACCALIMED);
+            }else if(taGoods.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+                taGoods.setStatus(CommConstant.STATUS_NORMAL);
+            }
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {