beauty-erp.git - Gitblit

			@@ -204,7 +204,10 @@

			@ApiOperation(value = "列表显示搜索项目绑定的产品信息", notes = "列表显示搜索项目绑定的产品信息")
			@PostMapping(value = "/showList")
			public AjaxResult showList(@RequestBody ShoppingGoods shoppingGoods, PaginationVO pageVo) {
			public AjaxResult showList(@RequestBody ShoppingGoods shoppingGoods,@RequestBody PaginationVO pageVo) {

			int offset = (pageVo.getOffset() - 1) * pageVo.getLimit();
			pageVo.setOffset(offset);
			QueryUtil.setQueryLimit(shoppingGoods);
			if(StringUtils.isBlank(pageVo.getSort())){
			pageVo.setOrder("desc");

			@@ -24,7 +24,6 @@
			import com.matrix.system.hive.service.*;
			import com.matrix.system.padApi.dto.PadOrderListDto;
			import com.matrix.system.padApi.vo.PadOrderDetailVo;
			import org.assertj.core.util.Arrays;
			import org.junit.Test;
			import org.junit.runner.RunWith;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -108,7 +107,7 @@
			// SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
			SysOrder order = orderService.findById(id);
			order.setItems(orderItemDao.selectByOrderId(id));
			System.out.println(Arrays.asList(order));
			System.out.println(order);
			}
			@Test
			public void testFrist(){

	zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java	5 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java	3 ●●●●● patch \| view \| raw \| blame \| history