goods

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

      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taGoods",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taGoods",method= RequestMethod.GET)
     public ResponseBean taGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value = "goodsName",required = false) String goodsName){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like("goods_name",goodsName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taGoods/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taGoods/{id}",method= RequestMethod.GET)
     public ResponseBean taGoodsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @RequestParam("buildingId") Integer buildingId){
+                                    @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                    @RequestParam(value = "orgId",required = false) Integer orgId){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-            queryWrapper.eq("building_id", buildingId);
+            if (null != buildingId){
+                queryWrapper.eq("building_id", buildingId);
+            }
+            if (null != orgId){
+                queryWrapper.eq("org_id", orgId);
+            }
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             

src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java

 		taPerson.setPoints(remainingPoints);
 		taPersonMapper.updateById(taPerson);
 		//商品数减少
-		taGoods.setTotalNum(taGoods.getTotalNum() -1);
+		taGoods.setInventory(taGoods.getInventory() -1);
 		taGoodsMapper.updateById(taGoods);
 		return CommConstant.SUCCESS;
 	}