From c6678a96508681993d0f4956d8082994579442bb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 18:19:54 +0800
Subject: [PATCH] 20210707
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 eb18721..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
@@ -3,11 +3,14 @@
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.JhyOrder;
import com.xzx.gc.entity.JhyOrderItems;
import com.xzx.gc.entity.ScoreOrderDetails;
+import com.xzx.gc.shop.dto.CancelJhyOrderDto;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
@@ -36,13 +39,25 @@
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());
+ String name = model.getAccount();
+ model.setAccount(name);
+ model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
if(CollUtil.isNotEmpty(maps)){
for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
- String decode = StringUtils.decode(queryJhyOrderListVo.getName());
- queryJhyOrderListVo.setName(decode);
+ Long id = queryJhyOrderListVo.getId();
+ List<JhyOrderItemsVo> jhyOrderItemsVos = jhyOrderItemsMapper.selectByOrderId(id);
+ queryJhyOrderListVo.setJhyOrderItemsVos(jhyOrderItemsVos);
}
}
+// 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<>();
@@ -59,23 +74,23 @@
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()).multiply(new BigDecimal(40));
jhyOrderItemsVo.setPrice(multiply);
- jhyOrderItemsVo.setAllPrice(multiplyScore);
- jhyOrderItemsVolist.add(jhyOrderItemsVo);
+ jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
}
}
- viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
return viewJhyOrderVo;
}
+
+ public void cancelJhyOrder(CancelJhyOrderDto model) {
+ Long id = model.getId();
+ JhyOrder jhyOrder = jhyOrderMapper.selectByPrimaryKey(id);
+ jhyOrder.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+ jhyOrderMapper.updateByPrimaryKey(jhyOrder);
+ }
}
--
Gitblit v1.9.1