From 1f2deeadddd52a23271c8df479912051c44f8f2d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 21:11:12 +0800
Subject: [PATCH] modify
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 98 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 9 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..599c89d 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,21 +1,24 @@
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.exception.RestException;
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.entity.*;
import com.xzx.gc.order.dto.AddJhyOrderDto;
-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.dto.JhyOrderListDto;
+import com.xzx.gc.order.mapper.*;
+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;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
@@ -39,9 +42,18 @@
private JhyOrderItemsMapper jhyOrderItemsMapper;
@Autowired
+ private JhyInfoMapper jhyInfoMapper;
+
+ @Autowired
private IdUtils idUtils;
public void addJhyOrder(AddJhyOrderDto orderDto) {
+// JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
+// if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+// throw new RestException(-3, "集货员不能下单");
+// }
+
+ // TODO 判断地址附近500米是否有集物员
String orderNo = idUtils.generate("JW", 10);
JhyOrder jhyOrder = new JhyOrder();
@@ -49,7 +61,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 +82,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 +98,60 @@
jhyOrderItemsMapper.insert(item);
}
}
+
+ public PageInfo<JhyOrderListVo> orderList(JhyOrderListDto orderListDto) {
+ JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderListDto.getUserId());
+ if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+ throw new RestException(-3, "不是集货员");
+ }
+
+ 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;
+ }
+
+ public void grabOrder(Long orderId, String userId) {
+ JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(userId);
+ if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+ throw new RestException(-3, "不是集货员");
+ }
+
+ JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
+ if (order == null) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ order.setJhyId(userId);
+ order.setStatus(JhyOrder.ORDER_STATUS_IMG);
+ jhyOrderMapper.updateByPrimaryKey(order);
+ }
+
+ public void cancelOrder(Long orderId, String userId) {
+ JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
+
+ if (!userId.equals(order.getUserId()) && !userId.equals(order.getJhyId())) {
+ throw new RestException(-3, "无权限操作");
+ }
+
+ order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+ jhyOrderMapper.updateByPrimaryKey(order);
+ }
}
--
Gitblit v1.9.1