java/qijisheng.git

			@@ -853,14 +853,12 @@
			orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
			}
			for (int i = 0; i < objects.size(); i++) {
			Long id = objects.getJSONObject(i).getLong("id");
			if(myShoppingCartVo.getId().equals(id)){
			Integer id = objects.getJSONObject(i).getInteger("id");
			Integer num1 = objects.getJSONObject(i).getInteger("num");
			orderGood.setNum(num1);
			Goods goods1 = goodsClient.getGoodsById(myShoppingCartVo.getGoodsId()).getData();
			Goods goods1 = goodsClient.getGoodsById(id).getData();
			orderGood.setGoodJson(JSON.toJSONString(goods1));
			break;
			}
			}
			orderGood.setDelFlag(0);
			orderGood.setCreateTime(LocalDateTime.now());

			@@ -107,7 +107,7 @@
			*/
			@GetMapping("/technicianListByShopId")
			@ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
			public R<TableDataInfo> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
			public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
			startPage();
			return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId)));
			}

	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史