From cedf9aab0ee975b04c52c0a75749e1eba852db2c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 17:44:21 +0800
Subject: [PATCH] add orderList
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 40 ++++++++++++++++++++
gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java | 2
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 11 +++++
gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java | 2 +
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 22 ++++++++++
gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java | 22 +++++++++++
6 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
index 9443cd9..754cf59 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
@@ -66,6 +66,6 @@
/**
* 集物员ID
*/
- private String jyhId;
+ private String jhyId;
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
index fc7fde0..25b69bb 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
@@ -2,8 +2,11 @@
import com.xzx.gc.common.Result;
import com.xzx.gc.common.request.BaseController;
+import com.xzx.gc.model.JsonResult;
import com.xzx.gc.order.dto.AddJhyOrderDto;
+import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.service.JhyOrderService;
+import com.xzx.gc.order.vo.JhyOrderListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -29,4 +32,12 @@
jhyOrderService.addJhyOrder(addJhyOrderDto);
return Result.success();
}
+
+ @ApiOperation("集物员订单列表")
+ @PostMapping(value = "/jhy/order/list")
+ public JsonResult<JhyOrderListVo> orderList(@RequestBody JhyOrderListDto jhyOrderListDto) {
+ return null;
+ }
+
+
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java
index 5bff938..81ebc3f 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java
@@ -1,5 +1,6 @@
package com.xzx.gc.order.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +14,7 @@
@ApiModelProperty(value = "地址ID")
private Long addressId;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "预约日期")
private Date reserveDate;
diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
new file mode 100644
index 0000000..913648e
--- /dev/null
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
@@ -0,0 +1,22 @@
+package com.xzx.gc.order.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "JhyOrderListDto", description = "集货员订单列表接收参数类")
+public class JhyOrderListDto {
+
+ @ApiModelProperty(value="页码")
+ private int pageNo=1;
+
+ @ApiModelProperty(value="每页显示记录数")
+ private int pageSize=10;
+
+ @ApiModelProperty(value = "状态 1-新任务 2-服务中 3-待入库 4-已完成")
+ private Integer status;
+
+
+}
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..6f646d4 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,19 @@
package com.xzx.gc.order.service;
import cn.hutool.core.util.StrUtil;
+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.JhyOrderListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +45,7 @@
private IdUtils idUtils;
public void addJhyOrder(AddJhyOrderDto orderDto) {
+ // TODO 判断地址附近500米是否有集物员
String orderNo = idUtils.generate("JW", 10);
JhyOrder jhyOrder = new JhyOrder();
@@ -49,7 +53,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 +74,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 +90,8 @@
jhyOrderItemsMapper.insert(item);
}
}
+
+ public List<JhyOrderListVo> orderList(JhyOrderListDto orderListDto) {
+ return null;
+ }
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
new file mode 100644
index 0000000..0d9fdad
--- /dev/null
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -0,0 +1,40 @@
+package com.xzx.gc.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "JhyOrderListVo", description = "集物员订单列表返回参数类")
+public class JhyOrderListVo {
+
+ @ApiModelProperty(value = "订单ID")
+ private Long orderId;
+
+ @ApiModelProperty(value = "预约时间")
+ private String reserveTime;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "物品")
+ private String items;
+
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ @ApiModelProperty(value = "经度")
+ private String lon;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "重量")
+ private String weight;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+}
\ No newline at end of file
--
Gitblit v1.9.1