blame | history | patch | commit | commitdiff | ignore whitespace
xiaoyong931011
2021-03-17 5041501b2eb692573e4f30e7cc4459149c117da6 
 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java


@@ -15,11 +15,9 @@


import com.matrix.system.fenxiao.service.FenXiaoSettingService;


import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;


import com.matrix.system.hive.action.util.QueryUtil;


import com.matrix.system.hive.bean.ShoppingGoods;


import com.matrix.system.hive.dao.ShoppingGoodsDao;


import com.matrix.system.shopXcx.bean.ShopProduct;


import com.matrix.system.shopXcx.dao.ShopProductDao;




import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.*;


@@ -96,10 +94,14 @@


                         idsList.add(parseInt);


                      }


                   }


                   List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);


                   result.putInMap("order", list);


                   //List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);


                       List<ShopProduct> shopProducts = shopProductDao.selectByIds(idsList);


                       result.putInMap("order", shopProducts);


                }


             }


             }else{


                   List<ShopProduct> shopProducts = new ArrayList<>();


                   result.putInMap("order", shopProducts);


               }


          }


       }


       return result;