From 5bea19d97acc927f0eeca23b89111ed828ac7ce6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 20:27:37 +0800
Subject: [PATCH] 20210628 集物员审核

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 54 insertions(+), 1 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 9ce3f6d..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
@@ -1,17 +1,70 @@
 package com.xzx.gc.shop.service;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+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;
+import com.xzx.gc.shop.vo.QueryScoreDetailsListVo;
+import com.xzx.gc.shop.vo.ViewJhyOrderVo;
 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;
+import java.util.List;
 import java.util.Map;
 
 @Service
 @Transactional
 @Slf4j
 public class JhyService {
+
+    @Resource
+    JhyOrderMapper jhyOrderMapper;
+    @Resource
+    JhyOrderItemsMapper jhyOrderItemsMapper;
+
     public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
-        return null;
+        PageHelper.startPage(model.getPage(), model.getLimit());
+        List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
+        if(CollUtil.isNotEmpty(maps)){
+            for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
+                String decode = StringUtils.decode(queryJhyOrderListVo.getName());
+                queryJhyOrderListVo.setName(decode);
+            }
+        }
+        PageInfo pageInfo = new PageInfo(maps);
+        int count = Convert.toInt(pageInfo.getTotal());
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", maps);
+        map.put("count", count);
+        map.put("code", 0);
+        return map;
+    }
+
+    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