From 4667d1e9ac2b01a6753eb8a87fb721051bf07ac4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 13:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/java/com/jilongda/applet/service/impl/TOrderServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/service/impl/TOrderServiceImpl.java b/applet/src/main/java/com/jilongda/applet/service/impl/TOrderServiceImpl.java
index 24cdd30..503f5e8 100644
--- a/applet/src/main/java/com/jilongda/applet/service/impl/TOrderServiceImpl.java
+++ b/applet/src/main/java/com/jilongda/applet/service/impl/TOrderServiceImpl.java
@@ -1,13 +1,18 @@
package com.jilongda.applet.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jilongda.applet.mapper.TOrderGoodsMapper;
import com.jilongda.applet.model.TOrder;
import com.jilongda.applet.mapper.TOrderMapper;
+import com.jilongda.applet.model.TOrderGoods;
import com.jilongda.applet.query.TOrderQuery;
import com.jilongda.applet.service.TOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.applet.vo.TOrderVO;
import com.jilongda.common.basic.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.List;
@@ -22,10 +27,54 @@
@Service
public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements TOrderService {
+ @Autowired
+ private TOrderGoodsMapper orderGoodsMapper;
@Override
public PageInfo<TOrderVO> pageList(TOrderQuery query) {
PageInfo<TOrderVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TOrderVO> list = this.baseMapper.pageList(query,pageInfo);
+ for (TOrderVO tOrderVO : list) {
+ List<TOrderGoods> orderGoods = orderGoodsMapper.selectList(new LambdaQueryWrapper<TOrderGoods>().eq(TOrderGoods::getOrderId, tOrderVO.getId()));
+ for (TOrderGoods orderGood : orderGoods) {
+ if (StringUtils.hasLength(orderGood.getModelName())){
+ // 镜架
+ tOrderVO.setFrame(orderGood.getBrandName()+orderGood.getModelName()+" "+orderGood.getColor());
+ continue;
+ }
+ if (StringUtils.hasLength(orderGood.getLLens())){
+ String temp = null;
+ switch (orderGood.getType()){
+ case 1:
+ temp = "球面";
+ break;
+ case 2:
+ temp = "非球面";
+ break;
+ case 3:
+ temp = "双非";
+ break;
+ }
+ tOrderVO.setLensL(orderGood.getBrandName() + orderGood.getSeriesName() + temp + orderGood.getRefractiveIndex());
+ continue;
+ }
+ if (StringUtils.hasLength(orderGood.getRLens())){
+ String temp = null;
+ switch (orderGood.getType()){
+ case 1:
+ temp = "球面";
+ break;
+ case 2:
+ temp = "非球面";
+ break;
+ case 3:
+ temp = "双非";
+ break;
+ }
+ tOrderVO.setLensR(orderGood.getBrandName() + orderGood.getSeriesName() + temp + orderGood.getRefractiveIndex());
+ }
+ }
+ }
+
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1