From 2ef4c9581dfa56582e63566aadc112aa9bc6f4a1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Nov 2021 14:26:52 +0800
Subject: [PATCH] 20211108
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 c6060c4..cdabb62 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
@@ -6,16 +6,15 @@
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.rabbitmq.client.Address;
+import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.StringUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.shop.dto.AssignJhyOrderDto;
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.mapper.OrderInfoMapper;
-import com.xzx.gc.shop.mapper.ScoreOrderMapper;
+import com.xzx.gc.shop.mapper.*;
import com.xzx.gc.shop.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,12 +52,44 @@
String name = model.getAccount();
model.setAccount(name);
model.setAccountPhone(accountPhone);
+ List<Integer> status = new ArrayList<>();
+ if(CollUtil.isEmpty(model.getStatus())){
+ status.add(1);
+ status.add(2);
+ status.add(3);
+ status.add(4);
+ status.add(5);
+ status.add(6);
+ model.setStatus(status);
+ }
+
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);
+
+ String orderAddr = queryJhyOrderListVo.getArea() + queryJhyOrderListVo.getAddress();
+ Long userId = queryJhyOrderListVo.getUserId();
+ List<AddressInfo> addressInfos = jhyOrderMapper.selectAddRessInfoByUserId(userId);
+ if(CollUtil.isNotEmpty(addressInfos)){
+ for(AddressInfo addressInfo : addressInfos){
+ 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() : "");
+ }
+ }
+ if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+ queryJhyOrderListVo.setUnitName(addressInfo.getUnitName());
+ queryJhyOrderListVo.setHouseNumber(addressInfo.getHouseNumber());
+ }
+ }
+ }
}
}
// if(CollUtil.isNotEmpty(maps)){
@@ -163,11 +194,10 @@
return total;
}
- public void assignJhyOrder(AssignJhyOrderDto model) {
+ public void assignJhyOrder(AssignJhyOrderDto model,String userId) {
Long orderId = model.getOrderId();
- Long jhyId = model.getJhyId();
JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
- order.setJhyId(jhyId.toString());
+ order.setJhyId(userId);
order.setStatus(JhyOrder.ORDER_STATUS_IMG);
jhyOrderMapper.updateByPrimaryKey(order);
}
--
Gitblit v1.9.1