Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 632d4f41 by 刘鑫
Options

Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

2 parents 99133ef3 63ba6ded
Expand all
Inline Side-by-side
Showing with 71 additions and 19 deletions
project-order/src/main/java/com/dituhui/pea/order/common/RedisService.java
...@@ -73,7 +73,7 @@ public class RedisService { ...@@ -73,7 +73,7 @@ public class RedisService {
try { try {
ValueOperations<String, String> operations = redisTemplate.opsForValue(); ValueOperations<String, String> operations = redisTemplate.opsForValue();
operations.set(key, value); operations.set(key, value);
redisTemplate.expire(key, expireTime, TimeUnit.SECONDS); redisTemplate.expire(key, expireTime, TimeUnit.MILLISECONDS);
result = true; result = true;
} catch (Exception e) { } catch (Exception e) {
log.error("[set]---------->redis存值失败， key为： {}, 失败原因：{}", key, e.getMessage(), e); log.error("[set]---------->redis存值失败， key为： {}, 失败原因：{}", key, e.getMessage(), e);
......
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceDetailResp.java
...@@ -17,7 +17,7 @@ public class OrderServiceDetailResp { ...@@ -17,7 +17,7 @@ public class OrderServiceDetailResp {
private String location; private String location;
private String orderStatus; private String orderStatus;
private String serviceStatus; private String serviceStatus;
private OrderDetail reschedulingParams; // private OrderDetail reschedulingParams;
private List<KV> items; private List<KV> items;
/** /**
...@@ -93,14 +93,18 @@ public class OrderServiceDetailResp { ...@@ -93,14 +93,18 @@ public class OrderServiceDetailResp {
private String beanTags; private String beanTags;
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public static class OrderDetail {
private String location;
private String address; private String address;
private String brand;
private String date; private String date;
private String type; //
private String skill; // @Data
} // @JsonInclude(JsonInclude.Include.NON_NULL)
// public static class OrderDetail {
// private String location;
// private String address;
// private String brand;
// private String date;
// private String type;
// private String skill;
// }
} }
project-order/src/main/java/com/dituhui/pea/order/feign/bean/BelongRB.java
...@@ -13,6 +13,10 @@ public class BelongRB { ...@@ -13,6 +13,10 @@ public class BelongRB {
* 账号中心部门id * 账号中心部门id
*/ */
private String bsDeptId; private String bsDeptId;
/**
* bean部门id
*/
private String beanDeptId;
/** /**
* 部门名称 * 部门名称
......
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Department.java
...@@ -24,6 +24,10 @@ public class Department { ...@@ -24,6 +24,10 @@ public class Department {
*/ */
private String tagName; private String tagName;
/** /**
* 部门中文名称
*/
private String tagNameCn;
/**
* 部门描述 非必须 * 部门描述 非必须
*/ */
private String desc; private String desc;
......
project-order/src/main/java/com/dituhui/pea/order/feign/bean/enums/BeanPointTypeEnum.java 0 → 100644
package com.dituhui.pea.order.feign.bean.enums;
public enum BeanPointTypeEnum {
// 类型（1分站，2外围，3小组，4网点，5自保点，6社会独立点，7商家独立点，8连锁网点，9网点伞下店）
// Self("1", "自保点"),
// Social("2", "社会独立点"),
// Business("3", "商家独立点"),
// Chain("4", "连锁网点"),
// Umbrella("5", "网点伞下店"),
// Umbrella("5", "网点伞下店"),
peaSelf(5, "自保点"),
peaSocial(6, "社会独立点"),
peaBusiness(7, "商家独立点"),
peaChain(8, "连锁网点"),
peaUmbrella(9, "网点伞下店");
private Integer type;
private String clazz;
BeanPointTypeEnum() {
}
BeanPointTypeEnum(Integer type, String clazz) {
this.type = type;
this.clazz = clazz;
}
public Integer getType() {
return type;
}
public String getClazz() {
return clazz;
}
public static Integer getTypeByClazz(String clazz) {
for (BeanPointTypeEnum value : BeanPointTypeEnum.values()) {
if (value.getClazz().equals(clazz)) {
return value.getType();
}
}
return null;
}
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceDetailImpl.java
...@@ -49,14 +49,6 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -49,14 +49,6 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
List<KV> items = this.packOrderDetail(order); List<KV> items = this.packOrderDetail(order);
// 设置订单详情信息 // 设置订单详情信息
OrderServiceDetailResp.OrderDetail detail = new OrderServiceDetailResp.OrderDetail();
detail.setAddress(String.format("%s%s%s", order.getCity(), order.getCounty(), order.getAddress()));
detail.setLocation(String.format("%s,%s", order.getX(), order.getY()));
detail.setDate(TimeUtils.IsoLocalDate2String(order.getDt()));
detail.setBrand(order.getBrand());
detail.setType(order.getType());
detail.setSkill(order.getSkill());
OrderServiceDetailResp res = new OrderServiceDetailResp(); OrderServiceDetailResp res = new OrderServiceDetailResp();
res.setOrderId(orderId); res.setOrderId(orderId);
res.setRisk(""); res.setRisk("");
...@@ -67,9 +59,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -67,9 +59,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
res.setOrderStatus(order.getOrderStatus()); res.setOrderStatus(order.getOrderStatus());
res.setServiceStatus(order.getServiceStatus()); res.setServiceStatus(order.getServiceStatus());
res.setLocation(String.format("%s,%s", order.getX(), order.getY())); res.setLocation(String.format("%s,%s", order.getX(), order.getY()));
res.setReschedulingParams(detail);
res.setItems(items); res.setItems(items);
res.setDate(TimeUtils.IsoLocalDate2String(order.getDt()));
res.setAddress(String.format("%s%s%s", order.getCity(), order.getCounty(), order.getAddress()));
res.setIsMultiple(order.getIsMultiple()); res.setIsMultiple(order.getIsMultiple());
res.setIsAppointEngineer(order.getIsAppointEngineer()); res.setIsAppointEngineer(order.getIsAppointEngineer());
if (StringUtils.isNotBlank(order.getAppointEngineerCodes())) { if (StringUtils.isNotBlank(order.getAppointEngineerCodes())) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!