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

大屏与收银机

Browse Source
This commit is contained in:
seesaw
2024-10-25 09:27:52 +08:00
parent 3467180f8f
commit 620981d836
18 changed files with 517 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.controller.admin.storeorder.vo;
import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderDetailVo;
import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrderDetailDO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@ -50,8 +51,7 @@ public class StoreOrderRespVO {
@ExcelProperty("用户")
private Long userId;
@Schema(description = "用户ID")
@ExcelProperty("用户")
private List<StoreOrderDetailDO> detailDOS;
@Schema(description = "订单详情")
private List<AppStoreOrderDetailVo> detailDOS;
}

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java
View File

@ -9,7 +9,10 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.member.controller.admin.storeorder.vo.StoreOrderPageReqVO;
import cn.iocoder.yudao.module.member.controller.admin.storeorder.vo.StoreOrderRespVO;
import cn.iocoder.yudao.module.member.controller.admin.storeorder.vo.StoreOrderSaveReqVO;
import cn.iocoder.yudao.module.member.controller.admin.storeorderdetail.vo.StoreOrderDetailRespVO;
import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderDetailVo;
import cn.iocoder.yudao.module.member.dal.dataobject.storeorder.StoreOrderDO;
import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrderDetailDO;
import cn.iocoder.yudao.module.member.service.storeorder.StoreOrderService;
import cn.iocoder.yudao.module.member.service.storeorderdetail.StoreOrderDetailService;
import io.swagger.v3.oas.annotations.Operation;
@ -47,7 +50,8 @@ public class AppStoreOrderController {
PageResult<StoreOrderRespVO> bean = BeanUtils.toBean(pageResult, StoreOrderRespVO.class);
//处理订单详情
for (StoreOrderRespVO vo: bean.getList()) {
vo.setDetailDOS(orderDetailService.getListByOrderNo(vo.getOrderId()));
List<AppStoreOrderDetailVo> listByOrderNo = orderDetailService.getListByOrderNo(vo.getOrderId());
vo.setDetailDOS(listByOrderNo);
}
return success(bean);
}

12
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/vo/AppStoreOrderDetailVo.java Normal file
View File

@ -0,0 +1,12 @@
package cn.iocoder.yudao.module.member.controller.app.storeorder.vo;
import lombok.Data;
@Data
public class AppStoreOrderDetailVo {
private Double custom_price;
private Integer number;
private Double weight;
private String goods_name;
private String img;
}

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storeorderdetail/StoreOrderDetailMapper.java
View File

@ -5,9 +5,11 @@ import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderDetailVo;
import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrderDetailDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.member.controller.admin.storeorderdetail.vo.*;
import org.apache.ibatis.annotations.Select;
/**
* 商品订单详情 Mapper
@ -27,4 +29,8 @@ public interface StoreOrderDetailMapper extends BaseMapperX<StoreOrderDetailDO>
.orderByDesc(StoreOrderDetailDO::getId));
}
@Select("select od.custom_price,od.number,od.weight,sg.goods_name,sg.img from member_store_order_detail od left join member_store_goods sg on od.goods_id = sg.goods_id where od.order_id = #{orderId}")
List<AppStoreOrderDetailVo> selectByOrderId(Integer orderId);
}

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailService.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.service.storeorderdetail;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.member.controller.admin.storeorderdetail.vo.*;
import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderDetailVo;
import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrderDetailDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@ -54,5 +55,5 @@ public interface StoreOrderDetailService {
void saveBatch(List<StoreOrderDetailDO> list);
List<StoreOrderDetailDO> getListByOrderNo(Integer orderId);
List<AppStoreOrderDetailVo> getListByOrderNo(Integer orderId);
}

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.service.storeorderdetail;
import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderDetailVo;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -78,7 +79,7 @@ public class StoreOrderDetailServiceImpl implements StoreOrderDetailService {
}
@Override
public List<StoreOrderDetailDO> getListByOrderNo(Integer orderId) {
return storeOrderDetailMapper.selectList(Wrappers.<StoreOrderDetailDO>lambdaQuery().eq(StoreOrderDetailDO::getOrderId, orderId));
public List<AppStoreOrderDetailVo> getListByOrderNo(Integer orderId) {
return storeOrderDetailMapper.selectByOrderId(orderId);
}
}