From fefa68e08d3d2e97f57a583c5df5883231641f75 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 18:26:39 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 755497d..86988aa 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -5,7 +5,10 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.utils.StringUtils;
+import com.xzx.gc.entity.JhyOrderItems;
+import com.xzx.gc.entity.ScoreOrderDetails;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
+import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
import com.xzx.gc.shop.vo.QueryGoodsListVo;
import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
@@ -14,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -27,6 +31,8 @@
@Resource
JhyOrderMapper jhyOrderMapper;
+ @Resource
+ JhyOrderItemsMapper jhyOrderItemsMapper;
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
PageHelper.startPage(model.getPage(), model.getLimit());
@@ -48,6 +54,16 @@
public ViewJhyOrderVo viewJhyOrder(Long id) {
ViewJhyOrderVo viewJhyOrderVo = new ViewJhyOrderVo();
+ viewJhyOrderVo = jhyOrderMapper.viewJhyOrder(id);
+
+ String decode = StringUtils.decode(viewJhyOrderVo.getNickName());
+ viewJhyOrderVo.setNickName(decode);
+
+ Example exampleItems = new Example(JhyOrderItems.class);
+ Example.Criteria criteriaItems = exampleItems.createCriteria();
+ criteriaItems.andEqualTo("orderId",id);
+ List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
return viewJhyOrderVo;
}
--
Gitblit v1.9.1