From fced9fc9ee879552238a1c83f884c7fa61ba6c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 15:14:22 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 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..a27445d 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,105 @@
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.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;
+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;
@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());
+ 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){
+ 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<>();
+ 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);
+ 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(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
+ jhyOrderItemsVolist.add(jhyOrderItemsVo);
+ }
+ }
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
+
+ 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