From c772a1d7194910153e1eb3c678880c1b2226c319 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 17:09:50 +0800
Subject: [PATCH] 20210707

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java |   15 +++------------
 1 files changed, 3 insertions(+), 12 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 a27445d..dcf4277 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
@@ -74,24 +74,15 @@
         String decode = StringUtils.decode(viewJhyOrderVo.getNickName());
         viewJhyOrderVo.setNickName(decode);
 
-        Example exampleItems = new Example(JhyOrderItems.class);
-        Example.Criteria criteriaItems = exampleItems.createCriteria();
-        criteriaItems.andEqualTo("orderId",id);
-        ArrayList<JhyOrderItemsVo> jhyOrderItemsVolist = new ArrayList<>();
-        List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
+        List<JhyOrderItemsVo> jhyOrderItemsList = jhyOrderItemsMapper.selectJhyOrderItemListByOrderId(id);
         if(CollUtil.isNotEmpty(jhyOrderItemsList)){
-            for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
-                JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
+            for(JhyOrderItemsVo jhyOrderItemsVo : jhyOrderItemsList){
                 BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
-//                BigDecimal multiplyScore = jhyOrderItemsVo.getPrice()
-//                        .multiply(jhyOrderItemsVo.getWeight()==null?BigDecimal.ZERO :jhyOrderItemsVo.getWeight())
-//                        .multiply(new BigDecimal(40));
                 jhyOrderItemsVo.setPrice(multiply);
                 jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
-                jhyOrderItemsVolist.add(jhyOrderItemsVo);
             }
         }
-        viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
+        viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
 
         return viewJhyOrderVo;
     }

--
Gitblit v1.9.1