zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/支付优化测试' into 支付优化测试

Browse Source
This commit is contained in:
qjq
2024-11-21 15:20:35 +08:00
parent 68c0aa6fe9 6f9672baa8
commit fdbad9fc1a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java
View File

@ -90,8 +90,8 @@ public class StoreOrderController {
MemberUserDO user = userService.getUser(storeOrder.getUserId());
storeOrderDetailVO.setNickName(user.getNickname());
storeOrderDetailVO.setMobile(user.getMobile());
String storeName = cashregisterinfoApi.getStoreName(storeOrder.getEquipmentCode());
storeOrderDetailVO.setStoresName(storeName);
// String storeName = cashregisterinfoApi.getStoreName(storeOrder.getEquipmentCode());
// storeOrderDetailVO.setStoresName(storeName);
List<AppStoreOrderDetailVo> listByOrderNo = orderDetailService.getListByOrderNo(storeOrder.getOrderId());
storeOrderDetailVO.setDetailDOS(listByOrderNo);
return success(storeOrderDetailVO);

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderDetailVO.java
View File

@ -39,7 +39,7 @@ public class StoreOrderDetailVO {
private String mobile;
@Schema(description = "门店", example = "1722")
private String storesName;
private Long carteenId;
@Schema(description = "订单详情")
private List<AppStoreOrderDetailVo> detailDOS;