记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit ecff6da7 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'test'

parents 205c0dd3 2360534e
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 89 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @ ecff6da7
package com.liquidnet.service.kylin.constant; package com.liquidnet.service.kylin.constant;
import sun.management.resources.agent;
public class KylinRedisConst { public class KylinRedisConst {
public static final String FIELDS = "kylin:fields:id"; public static final String FIELDS = "kylin:fields:id";
public static final String PERFORMANCES = "kylin:performances:id:"; public static final String PERFORMANCES = "kylin:performances:id:";
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressPushRouteParam.java
View file @ ecff6da7
...@@ -12,7 +12,5 @@ public class PerformanceExpressPushRouteParam { ...@@ -12,7 +12,5 @@ public class PerformanceExpressPushRouteParam {
private String acceptAddress; // 路由节点发生的城市 private String acceptAddress; // 路由节点发生的城市
private String remark; // 路由节点具体描述 private String remark; // 路由节点具体描述
private String opCode; // 路由节点操作码 private String opCode; // 路由节点操作码
private String companyId; // 客户appid
private String routeAddress; // 客户推送接收地址
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ ecff6da7
...@@ -380,8 +380,11 @@ public class PerformanceVoUtils { ...@@ -380,8 +380,11 @@ public class PerformanceVoUtils {
ticketStatus.setTotalExchange(null); ticketStatus.setTotalExchange(null);
tickets.setTimeStart(null); tickets.setTimeStart(null);
tickets.setTimeEnd(null); tickets.setTimeEnd(null);
tickets.setPriceDiscountMember(null);
tickets.setPriceDiscount(null);
ticketStatus.setCounts(null); ticketStatus.setCounts(null);
ticketStatus.setIsMember(null); ticketStatus.setIsMember(null);
ticketStatus.setIsExclusive(null);
ticketRelations.setCreatedAt(null); ticketRelations.setCreatedAt(null);
tickets.setCreatedAt(null); tickets.setCreatedAt(null);
ticketsMapper.update(tickets, new UpdateWrapper<KylinTickets>().eq("tickets_id", tickets.getTicketsId())); ticketsMapper.update(tickets, new UpdateWrapper<KylinTickets>().eq("tickets_id", tickets.getTicketsId()));
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpressStatus.java 0 → 100644
View file @ ecff6da7
package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
* 订单快递状态
* </p>
*
* @author jiangxiulong
* @since 2021-07-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderExpressStatus implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Integer mid;
private String orderExpressStatusId;
private String orderExpressId;
private String orderStateCode; // 订单状态
private String orderStateDesc; // 订单状态描述
private String empCode; // 收件员工工号
private String empPhone; // 收件员手机号
private String netCode; // 网点
private String lastTime; // 最晚上门时间
private String bookTime; // 客户预约时间
private String carrierCode; // 承运商代码(SF)
/**
* 创建时间
*/
private String createdAt;
/**
* 修改时间
*/
private String updatedAt;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderExpressStatusMapper.java 0 → 100644
View file @ ecff6da7
package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.entity.KylinOrderExpressStatus;
/**
* <p>
* 订单快递状态 Mapper 接口 处理数据库
* </p>
*
* @author jiangxiulong
* @since 2021-07-01
*/
public interface KylinOrderExpressStatusMapper extends BaseMapper<KylinOrderExpressStatus> {
}
liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/task/FeignPlatformTaskClient.java
View file @ ecff6da7
...@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
@Component @Component
@FeignClient(name = "liquidnet-service-platform", @FeignClient(name = "liquidnet-service-platform",
contextId = "FeignPlatformTaskClient", path = "", contextId = "FeignPlatformTaskClient", path = "",
// url = "${liquidnet.url.platform}", url = "${liquidnet.url.platform}",
url = "", // url = "",
fallback = FallbackFactory.Default.class) fallback = FallbackFactory.Default.class)
public interface FeignPlatformTaskClient { public interface FeignPlatformTaskClient {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ ecff6da7
...@@ -803,10 +803,10 @@ CREATE TABLE `kylin_order_express` ...@@ -803,10 +803,10 @@ CREATE TABLE `kylin_order_express`
`order_tickets_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id', `order_tickets_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
`order_express_code` varchar(255) NOT NULL DEFAULT '' COMMENT '订单快递编号', `order_express_code` varchar(255) NOT NULL DEFAULT '' COMMENT '订单快递编号',
`mailno` varchar(255) NOT NULL DEFAULT '' COMMENT '顺丰运单号', `mailno` varchar(255) NOT NULL DEFAULT '' COMMENT '顺丰运单号',
`express_type` tinyint NOT NULL DEFAULT '0' COMMENT '快件产品类型 1顺丰特快...', `express_type` tinyint NOT NULL DEFAULT 0 COMMENT '快件产品类型 1顺丰特快...',
`filter_result` varchar(2) NOT NULL DEFAULT '0' COMMENT '1-人工确认；2-可收派；3-不可以收派', `filter_result` varchar(2) NOT NULL DEFAULT '0' COMMENT '1-人工确认；2-可收派；3-不可以收派',
`remark` varchar(255) NOT NULL DEFAULT '' COMMENT 'filter_result=3时返回不可以收派的原因代码', `remark` varchar(255) NOT NULL DEFAULT '' COMMENT 'filter_result=3时返回不可以收派的原因代码',
`express_status` tinyint NOT NULL DEFAULT '0' COMMENT '快递状态', `express_status` tinyint NOT NULL DEFAULT 0 COMMENT '快递状态',
`origincode` varchar(255) NOT NULL DEFAULT '' COMMENT '原寄地区域代码 可用于顺丰电子面单标签打印', `origincode` varchar(255) NOT NULL DEFAULT '' COMMENT '原寄地区域代码 可用于顺丰电子面单标签打印',
`destcode` varchar(255) NOT NULL DEFAULT '' COMMENT '目的地区域代码 可用于顺丰电子面单标签打印', `destcode` varchar(255) NOT NULL DEFAULT '' COMMENT '目的地区域代码 可用于顺丰电子面单标签打印',
`print_icon` varchar(255) NOT NULL DEFAULT '' COMMENT '打印图标', `print_icon` varchar(255) NOT NULL DEFAULT '' COMMENT '打印图标',
...@@ -841,18 +841,38 @@ CREATE TABLE `kylin_order_express_route` ...@@ -841,18 +841,38 @@ CREATE TABLE `kylin_order_express_route`
`mid` int unsigned NOT NULL AUTO_INCREMENT, `mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_express_route_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_route_id', `order_express_route_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_route_id',
`order_express_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_id', `order_express_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_id',
`accept_address` varchar(200) NOT NULL DEFAULT '0' COMMENT '路由节点发生的城市', `accept_address` varchar(200) NOT NULL DEFAULT '' COMMENT '路由节点发生的城市',
`accept_date` varchar(200) NOT NULL DEFAULT '' COMMENT 'YYYY-MM-DD', `accept_date` varchar(200) NOT NULL DEFAULT '' COMMENT 'YYYY-MM-DD',
`accept_time` varchar(200) NOT NULL DEFAULT '0.00' COMMENT 'HH24:MM:SS', `accept_time` varchar(200) NOT NULL DEFAULT '' COMMENT 'HH24:MM:SS',
`accept_totaltime` varchar(200) NOT NULL DEFAULT '0.00' COMMENT 'YYYY-MM-DD HH24:MM:SS', `accept_totaltime` varchar(200) NOT NULL DEFAULT '' COMMENT 'YYYY-MM-DD HH24:MM:SS',
`remark` varchar(255) NOT NULL DEFAULT '0.00' COMMENT '路由节点具体描述', `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '路由节点具体描述',
`opcode` varchar(200) NOT NULL DEFAULT '0.00' COMMENT '路由节点操作码', `opcode` varchar(200) NOT NULL DEFAULT '' COMMENT '路由节点操作码',
`created_at` timestamp NULL DEFAULT NULL, `created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL, `updated_at` timestamp NULL DEFAULT NULL,
KEY `order_express_route_id_index` (`order_express_route_id`), KEY `order_express_route_id_index` (`order_express_route_id`),
PRIMARY KEY (`mid`) PRIMARY KEY (`mid`)
) ENGINE = InnoDB COMMENT '订单快递路由表'; ) ENGINE = InnoDB COMMENT '订单快递路由表';
drop TABLE if exists `kylin_order_express_status`;
CREATE TABLE `kylin_order_express_status`
(
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_express_status_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_status_id',
`order_express_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_id',
`order_state_code` varchar(200) NOT NULL DEFAULT '' COMMENT '订单状态',
`order_state_desc` varchar(200) NOT NULL DEFAULT '' COMMENT '订单状态描述',
`emp_code` varchar(200) NOT NULL DEFAULT '' COMMENT '收件员工工号',
`emp_phone` varchar(200) NOT NULL DEFAULT '' COMMENT '收件员手机号',
`net_code` varchar(200) NOT NULL DEFAULT '' COMMENT '网点',
`last_time` varchar(255) NOT NULL DEFAULT '' COMMENT '最晚上门时间',
`book_time` varchar(200) NOT NULL DEFAULT '' COMMENT '客户预约时间',
`carrier_code` varchar(200) NOT NULL DEFAULT '' COMMENT '承运商代码(SF)',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
KEY `order_express_status_id_index` (`order_express_status_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB COMMENT '订单快递状态表';
drop TABLE if exists `kylin_order_refund_pic`; drop TABLE if exists `kylin_order_refund_pic`;
CREATE TABLE `kylin_order_refund_pic` CREATE TABLE `kylin_order_refund_pic`
( (
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
View file @ ecff6da7
...@@ -11,13 +11,6 @@ ...@@ -11,13 +11,6 @@
<artifactId>liquidnet-service-kylin-impl</artifactId> <artifactId>liquidnet-service-kylin-impl</artifactId>
<dependencies> <dependencies>
<!-- kylin -->
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-kylin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- common --> <!-- common -->
<dependency> <dependency>
<groupId>com.liquidnet</groupId> <groupId>com.liquidnet</groupId>
...@@ -39,13 +32,6 @@ ...@@ -39,13 +32,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-adam</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- other --> <!-- other -->
<dependency> <dependency>
<groupId>taobao-sdk-impl</groupId> <groupId>taobao-sdk-impl</groupId>
...@@ -55,6 +41,16 @@ ...@@ -55,6 +41,16 @@
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath> <systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath>
</dependency> </dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-kylin-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-adam-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @ ecff6da7
package com.liquidnet.service.kylin.utils; package com.liquidnet.service.kylin.utils;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.*; import com.liquidnet.service.kylin.dto.vo.mongo.*;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java
View file @ ecff6da7
package com.liquidnet.service.platform.service.express.shunfeng; package com.liquidnet.service.platform.service.express.shunfeng;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.*; import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.param.*; import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo; import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.IKylinOrderExpress; import com.liquidnet.service.kylin.service.IKylinOrderExpress;
...@@ -14,16 +14,16 @@ import com.liquidnet.service.platform.utils.ShunfengSignUtils; ...@@ -14,16 +14,16 @@ import com.liquidnet.service.platform.utils.ShunfengSignUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Enumeration; import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
/** /**
* <p> * <p>
...@@ -71,77 +71,86 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd ...@@ -71,77 +71,86 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
@Autowired @Autowired
private KylinOrderExpressRouteMapper kylinOrderExpressRouteMapper; private KylinOrderExpressRouteMapper kylinOrderExpressRouteMapper;
@Autowired
private KylinOrderExpressStatusMapper kylinOrderExpressStatusMapper;
@Autowired @Autowired
HttpServletRequest httpServletRequest; HttpServletRequest httpServletRequest;
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
public boolean orderStatus(String performanceExpressPushStatusParam) { public boolean orderStatus(@RequestBody String params) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushStatusParam, httpServletRequest); if (res) {
System.out.println(performanceExpressPushStatusParam); PerformanceExpressPushStatusParam performanceExpressPushStatusParam = JsonUtils.fromJson(params, PerformanceExpressPushStatusParam.class);
System.out.println(res); KylinOrderExpressStatus kylinOrderExpressStatus = new KylinOrderExpressStatus();
String orderExpressStatusId = IDGenerator.nextSnowId();
Enumeration headerNames = httpServletRequest.getHeaderNames();
while (headerNames.hasMoreElements()) { KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(new QueryWrapper<KylinOrderExpress>().eq("mailno", performanceExpressPushStatusParam.getWaybillNo()));
String key = (String) headerNames.nextElement(); kylinOrderExpressStatus.setOrderExpressStatusId(orderExpressStatusId);
String value = httpServletRequest.getHeader(key); kylinOrderExpressStatus.setOrderExpressId(orderExpressInfo.getOrderExpressId());
System.out.println(key + "=" + value); kylinOrderExpressStatus.setOrderStateCode(performanceExpressPushStatusParam.getOrderStateCode());
kylinOrderExpressStatus.setOrderStateDesc(performanceExpressPushStatusParam.getOrderStateDesc());
kylinOrderExpressStatus.setEmpCode(performanceExpressPushStatusParam.getEmpCode());
kylinOrderExpressStatus.setEmpPhone(performanceExpressPushStatusParam.getEmpPhone());
kylinOrderExpressStatus.setNetCode(performanceExpressPushStatusParam.getNetCode());
kylinOrderExpressStatus.setLastTime(performanceExpressPushStatusParam.getLastTime());
kylinOrderExpressStatus.setBookTime(performanceExpressPushStatusParam.getBookTime());
kylinOrderExpressStatus.setCarrierCode(performanceExpressPushStatusParam.getCarrierCode());
kylinOrderExpressStatus.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressStatusMapper.insert(kylinOrderExpressStatus);
return true;
} }
return false; return false;
} }
public boolean orderFreightList(String performanceExpressPushFreightParam) { public boolean orderFreightList(@RequestBody String params) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushFreightParam, httpServletRequest); if (true) {
System.out.println(performanceExpressPushFreightParam); PerformanceExpressPushFreightParam performanceExpressPushFreightParam = JsonUtils.fromJson(params, PerformanceExpressPushFreightParam.class);
System.out.println(res); KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(new QueryWrapper<KylinOrderExpress>().eq("mailno", performanceExpressPushFreightParam.getWaybillNo()));
String orderExpressId = orderExpressInfo.getOrderExpressId();
Enumeration headerNames = httpServletRequest.getHeaderNames();
while (headerNames.hasMoreElements()) { kylinOrderExpressFeeInfoMapper.delete(new QueryWrapper<KylinOrderExpressFeeInfo>().eq("order_express_id", orderExpressId));
String key = (String) headerNames.nextElement();
String value = httpServletRequest.getHeader(key); List<PerformanceExpressPushFreightInfoParam> feeList = performanceExpressPushFreightParam.getFeeList();
System.out.println(key + "=" + value); for (PerformanceExpressPushFreightInfoParam feeInfo : feeList) {
KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
String orderExpressFeeInfoId = IDGenerator.nextSnowId();
kylinOrderExpressFeeInfo.setOrderExpressFeeInfoId(orderExpressFeeInfoId);
kylinOrderExpressFeeInfo.setOrderExpressId(orderExpressId);
kylinOrderExpressFeeInfo.setType(feeInfo.getFeeIndType().toString());
kylinOrderExpressFeeInfo.setName(feeInfo.getFeeTypeCode());
kylinOrderExpressFeeInfo.setValue(BigDecimal.valueOf(feeInfo.getFeeAmt()));
kylinOrderExpressFeeInfo.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressFeeInfoMapper.insert(kylinOrderExpressFeeInfo);
}
return true;
} }
/*KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
String orderExpressFeeInfoId = IDGenerator.nextSnowId();
kylinOrderExpressFeeInfo.setOrderExpressFeeInfoId(orderExpressFeeInfoId);
kylinOrderExpressFeeInfo.setOrderExpressId(orderExpressInfo.getOrderExpressId());
kylinOrderExpressFeeInfo.setType((String) feeInfo.get("type"));
kylinOrderExpressFeeInfo.setName((String) feeInfo.get("name"));
kylinOrderExpressFeeInfo.setValue(new BigDecimal(feeInfo.get("value").toString()));
kylinOrderExpressFeeInfo.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressFeeInfoMapper.insert(kylinOrderExpressFeeInfo);*/
return false; return false;
} }
public boolean orderRoute(String performanceExpressPushRouteParam) { public boolean orderRoute(@RequestBody String params) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushRouteParam, httpServletRequest); if (res) {
System.out.println(performanceExpressPushRouteParam); PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class);
System.out.println(res); KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
String orderExpressRouteId = IDGenerator.nextSnowId();
Enumeration headerNames = httpServletRequest.getHeaderNames();
while (headerNames.hasMoreElements()) { KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(new QueryWrapper<KylinOrderExpress>().eq("mailno", performanceExpressPushRouteParam.getMailno()));
String key = (String) headerNames.nextElement(); kylinOrderExpressRoute.setOrderExpressRouteId(orderExpressRouteId);
String value = httpServletRequest.getHeader(key); kylinOrderExpressRoute.setOrderExpressId(orderExpressInfo.getOrderExpressId());
System.out.println(key + "=" + value); kylinOrderExpressRoute.setAcceptAddress(performanceExpressPushRouteParam.getAcceptAddress());
kylinOrderExpressRoute.setAcceptTotaltime(performanceExpressPushRouteParam.getAcceptTime());
kylinOrderExpressRoute.setRemark(performanceExpressPushRouteParam.getRemark());
kylinOrderExpressRoute.setOpcode(performanceExpressPushRouteParam.getOpCode());
kylinOrderExpressRoute.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressRouteMapper.insert(kylinOrderExpressRoute);
return true;
} }
/*KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
String orderExpressRouteId = IDGenerator.nextSnowId();
kylinOrderExpressRoute.setOrderExpressRouteId(orderExpressRouteId);
kylinOrderExpressRoute.setOrderExpressId(orderExpressInfo.getOrderExpressId());
kylinOrderExpressRoute.setAcceptAddress((String) routeInfo.get("accept_address"));
kylinOrderExpressRoute.setAcceptDate((String) routeInfo.get("accept_date"));
kylinOrderExpressRoute.setAcceptTime((String) routeInfo.get("accept_time"));
kylinOrderExpressRoute.setAcceptTotaltime((String) routeInfo.get("accept_totaltime"));
kylinOrderExpressRoute.setRemark((String) routeInfo.get("remark"));
kylinOrderExpressRoute.setOpcode((String) routeInfo.get("opcode"));
kylinOrderExpressRoute.setCreatedAt(DateUtil.getNowTime());
kylinOrderExpressRouteMapper.insert(kylinOrderExpressRoute);*/
return false; return false;
} }
......
liquidnet-bus-service/liquidnet-service-ticket/liquidnet-service-ticket-api/HELP.md 0 → 100644
View file @ ecff6da7
# Getting Started
### Reference Documentation
For further reference, please consider the following sections:
* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.4.5/maven-plugin/reference/html/)
* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.4.5/maven-plugin/reference/html/#build-image)
liquidnet-bus-service/liquidnet-service-ticket/liquidnet-service-ticket-do/HELP.md 0 → 100644
View file @ ecff6da7
# Getting Started
### Reference Documentation
For further reference, please consider the following sections:
* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.4.5/maven-plugin/reference/html/)
* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.4.5/maven-plugin/reference/html/#build-image)
liquidnet-bus-service/liquidnet-service-ticket/liquidnet-service-ticket-impl/HELP.md 0 → 100644
View file @ ecff6da7
# Getting Started
### Reference Documentation
For further reference, please consider the following sections:
* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.4.5/maven-plugin/reference/html/)
* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.4.5/maven-plugin/reference/html/#build-image)
* [Spring Native Reference Guide](https://docs.spring.io/spring-native/docs/current/reference/htmlsingle/)
### Additional Links
These additional references should also help you:
* [Configure the Spring AOT Plugin](https://docs.spring.io/spring-native/docs/0.9.2-SNAPSHOT/reference/htmlsingle/#spring-aot-maven)
## Spring Native
This project has been configured to let you generate a lightweight container running a native executable.
Docker should be installed and configured on your machine prior to creating the image, see [the Getting Started section of the reference guide](https://docs.spring.io/spring-native/docs/0.9.2-SNAPSHOT/reference/htmlsingle/#getting-started-buildpacks).
To create the image, run the following goal:
```
$ ./mvnw spring-boot:build-image
```
Then, you can run the app like any other container:
```
$ docker run --rm liquidnet-service-ticket-impl:0.0.1-SNAPSHOT
```
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment