java/mx_charging_pile.git

			@@ -180,5 +180,8 @@
			@ApiModelProperty(value = "取消人")
			@TableField(exist = false)
			private String cancellationName;
			@ApiModelProperty(value = "订单id")
			@TableField(exist = false)
			private String uid;

			}

			@@ -86,7 +86,7 @@
			}
			@Resource
			private SysUserClient sysUserClient;
			@PostMapping("/getShoppingOrderInfoById")
			@GetMapping("/getShoppingOrderInfoById")
			@ApiOperation(value = "根据订单id查看订单详情", tags = {"管理后台-购物订单"})
			public AjaxResult<TShoppingOrder> getShoppingOrderList(String id) {
			TShoppingOrder byId = shoppingOrderService.getById(id);

			@@ -507,6 +507,7 @@
			PageInfo<TShoppingOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
			List<TShoppingOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2);
			for (TShoppingOrder tShoppingOrder : list) {
			tShoppingOrder.setUid(tShoppingOrder.getId().toString());
			switch (tShoppingOrder.getOrderType()){
			case 1:
			TGoods data = goodsClient.getGoodsById(tShoppingOrder.getGoodsId()).getData();

	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史