From d25897a9e4a96079e3ef9d767083e631ead13a1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 16:23:51 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 27a6e0e..ee3c7f3 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,12 +1,15 @@
package com.xzx.gc.order.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.constant.Constants;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.IdUtils;
+import com.xzx.gc.common.utils.LocationUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.dto.AddJhyOrderDto;
import com.xzx.gc.order.dto.JhyOrderConfirmDto;
@@ -15,6 +18,7 @@
import com.xzx.gc.order.mapper.*;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
import com.xzx.gc.order.vo.JhyOrderListVo;
+import com.xzx.gc.order.vo.JhyStatusCountVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,9 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Slf4j
@Service
@@ -55,17 +57,25 @@
@Autowired
private IdUtils idUtils;
+ @Autowired
+ private DistribService distribService;
+
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米是否有集物员
+ AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
+
+ List<JhyInfo> jhyInfos = jhyInfoMapper.selectJhyInfoListInAddressRange(addressInfo.getAddressId());
+ if (CollUtil.isEmpty(jhyInfos)) {
+ throw new RestException(-3, "该区域暂无集物员");
+ }
+
String orderNo = idUtils.generate("JW", 10);
JhyOrder jhyOrder = new JhyOrder();
- AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
jhyOrder.setOrderNo(orderNo);
jhyOrder.setArea(addressInfo.getAddressArea());
@@ -161,6 +171,7 @@
order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
}
+ order.setJhyId(null);
jhyOrderMapper.updateByPrimaryKey(order);
}
@@ -222,5 +233,33 @@
userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
accountMapper.updateByPrimaryKey(userAccount);
+
+ distribService.distribRecord(order.getId(), order.getUserId());
+ }
+
+ public Map<Integer, Integer> orderStatusCount(String userId) {
+ List<JhyStatusCountVo> count = jhyOrderMapper.selectOrderStatusCount(userId);
+
+ Map<Integer, Integer> map = new HashMap<>();
+ for (int i = 1; i < 6; i++) {
+ if (CollUtil.isNotEmpty(count)) {
+ boolean flag = false;
+ for (JhyStatusCountVo jhyStatusCountVo : count) {
+ if (i == jhyStatusCountVo.getStatus()) {
+ map.put(i, jhyStatusCountVo.getCnt());
+ flag = true;
+ break;
+ }
+ }
+
+ if (flag) {
+ continue;
+ }
+ }
+
+ map.put(i, 0);
+ }
+
+ return map;
}
}
--
Gitblit v1.9.1