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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 9feaaf5..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
@@ -3,6 +3,7 @@
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;
@@ -36,6 +37,10 @@
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){
@@ -68,9 +73,11 @@
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()).multiply(new BigDecimal(40));
- jhyOrderItemsVo.setAllPrice(multiply);
- jhyOrderItemsVo.setAllScore(multiplyScore);
+ 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);
}
}
--
Gitblit v1.9.1