From 5bea19d97acc927f0eeca23b89111ed828ac7ce6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 20:27:37 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index f686b31..9859109 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -1,16 +1,23 @@
package com.xzx.gc.order.service;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.entity.AddressInfo;
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.entity.JhyOrderItems;
import com.xzx.gc.entity.SysEnvironmentalInfo;
import com.xzx.gc.order.dto.AddJhyOrderDto;
+import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.mapper.AddressMapper;
import com.xzx.gc.order.mapper.JhyOrderItemsMapper;
import com.xzx.gc.order.mapper.JhyOrderMapper;
import com.xzx.gc.order.mapper.SysEnvironmentalInfoMapper;
+import com.xzx.gc.order.vo.JhyOrderDetailsVo;
+import com.xzx.gc.order.vo.JhyOrderListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +49,7 @@
private IdUtils idUtils;
public void addJhyOrder(AddJhyOrderDto orderDto) {
+ // TODO 判断地址附近500米是否有集物员
String orderNo = idUtils.generate("JW", 10);
JhyOrder jhyOrder = new JhyOrder();
@@ -49,7 +57,18 @@
jhyOrder.setOrderNo(orderNo);
jhyOrder.setArea(addressInfo.getAddressArea());
- jhyOrder.setAddress(addressInfo.getAddress());
+
+ StringBuffer address = new StringBuffer();
+ address.append(addressInfo.getDetailAddress());
+ if (StrUtil.isNotBlank(addressInfo.getTagName())) {
+ address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
+ if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
+ address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
+ address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
+ }
+ }
+ jhyOrder.setAddress(address.toString());
+
jhyOrder.setUsername(addressInfo.getRelaName());
jhyOrder.setPhone(addressInfo.getMobilePhone());
jhyOrder.setLongitude(addressInfo.getLongitude());
@@ -59,6 +78,7 @@
jhyOrder.setWeight(orderDto.getWeight());
jhyOrder.setStatus(JhyOrder.ORDER_STATUS_WAITING);
jhyOrder.setCreatedTime(new Date());
+ jhyOrder.setUserId(orderDto.getUserId());
jhyOrderMapper.insert(jhyOrder);
long[] typeIds = StrUtil.splitToLong(orderDto.getTypeIds(), ",");
@@ -74,4 +94,28 @@
jhyOrderItemsMapper.insert(item);
}
}
+
+ public PageInfo<JhyOrderListVo> orderList(JhyOrderListDto orderListDto) {
+ PageHelper.startPage(orderListDto.getPageNo(), orderListDto.getPageSize());
+ List<JhyOrderListVo> data = jhyOrderMapper.selectJhyOrderList(orderListDto);
+ return new PageInfo<>(data);
+ }
+
+ public JhyOrderDetailsVo orderDetails(Long orderId, String userId) {
+ JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
+ List<JhyOrderItems> items = jhyOrderItemsMapper.selectOrderItems(orderId);
+
+ BigDecimal total = BigDecimal.ZERO;
+ for (JhyOrderItems item : items) {
+ total = total.add(StrUtil.isNotBlank(item.getScore()) ? new BigDecimal(item.getScore()) : BigDecimal.ZERO);
+ }
+
+ JhyOrderDetailsVo detailsVo = new JhyOrderDetailsVo();
+ BeanUtil.copyProperties(order, detailsVo);
+
+ detailsVo.setAddress(order.getArea() + order.getAddress());
+ detailsVo.setTotalPrice(total);
+ detailsVo.setItems(items);
+ return detailsVo;
+ }
}
--
Gitblit v1.9.1