From 02b38bb7c08d68fffc6af25e4ba00a456d96e94e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:22:54 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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..e073a68 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,21 +1,26 @@
package com.xzx.gc.shop.service;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
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 com.xzx.gc.shop.vo.*;
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.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,9 +32,15 @@
@Resource
JhyOrderMapper jhyOrderMapper;
+ @Resource
+ JhyOrderItemsMapper jhyOrderItemsMapper;
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
PageHelper.startPage(model.getPage(), model.getLimit());
+ String accountPhone = model.getAccount();
+ String name = StrUtil.isEmpty(model.getAccount())?model.getAccount():StringUtils.encode(model.getAccount());
+ model.setAccount(name);
+ model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
if(CollUtil.isNotEmpty(maps)){
for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
@@ -48,6 +59,29 @@
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);
+ ArrayList<JhyOrderItemsVo> jhyOrderItemsVolist = new ArrayList<>();
+ List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
+ if(CollUtil.isNotEmpty(jhyOrderItemsList)){
+ for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
+ JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
+ 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(multiplyScore);
+ jhyOrderItemsVolist.add(jhyOrderItemsVo);
+ }
+ }
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
return viewJhyOrderVo;
}
--
Gitblit v1.9.1