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

Skip to content

L
liquidnet-bus-v1
Commit d9f21bc5 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

生成快递单以后 用 orderExpressId查询

parent 0087890d
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 49 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @ d9f21bc5
......@@ -424,13 +424,13 @@
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
// actions.push('<a class="btn btn-warning btn-xs ' + generateImageFlag + '" href="javascript:void(0)" onclick="generateImage(\'' + row.orderExpressId + '\',)"></i>下载快递单</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + printExpressFlag + '" href="javascript:void(0)" onclick="printExpress(\'' + row.orderExpressId + '\',)"></i>打印快递单</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></i>路由主动查询</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></i>路由主动查询</a> ');
return actions.join('');
}
}]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @ d9f21bc5
......@@ -299,12 +299,11 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto cancelOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderTicketsId : ids) {
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
.notIn("express_status", expressStatus)
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
String orderTicketsId = orderExpressInfo.getOrderTicketsId();
if (null != orderExpressInfo) {
Map<String, String> hBody = new HashMap<>();
hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
......@@ -344,11 +343,9 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderTicketsId : ids) {
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
.notIn("express_status", expressStatus)
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
if (null != orderExpressInfo) {
Map<String, String> hBody = new HashMap<>();
......@@ -387,12 +384,11 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderTicketsId : ids) {
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
.notIn("express_status", expressStatus)
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
String orderTicketsId = orderExpressInfo.getOrderTicketsId();
KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
);
......@@ -435,12 +431,11 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto getListFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderTicketsId : ids) {
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
.notIn("express_status", expressStatus)
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
String orderTicketsId = orderExpressInfo.getOrderTicketsId();
if (null != orderExpressInfo) {
Map<String, String> hBody = new HashMap<>();
hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
......@@ -478,10 +473,9 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public ResponseDto listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderTicketsId : ids) {
for (String orderExpressId : ids) {
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
.notIn("express_status", expressStatus)
Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
if (null != orderExpressInfo) {
Map<String, String> hBody = new HashMap<>();
......@@ -549,18 +543,18 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
int limitNum = 1;
int mid = 0;
do {
List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, mid, limitNum);
List<KylinOrderExpress> expressList = kylinOrderExpressMapper.getCanCancelExpressList(performanceId, mid, limitNum);
if (!CollectionUtil.isEmpty(orderList)) {
List<String> orderIds = orderList.stream().map(KylinOrderTickets -> KylinOrderTickets.getOrderTicketsId()).collect(Collectors.toList());
if (!CollectionUtil.isEmpty(expressList)) {
List<String> expressIds = expressList.stream().map(KylinOrderExpress -> KylinOrderExpress.getOrderExpressId()).collect(Collectors.toList());
PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam = new PerformanceExpressSearchAdminParam();
performanceExpressSearchAdminParam.setIds(orderIds);
performanceExpressSearchAdminParam.setIds(expressIds);
cancelOrder(performanceExpressSearchAdminParam);
}
count = orderList.size();
count = expressList.size();
if (count > 0) {
KylinOrderTickets lastInfo = orderList.get(count - 1);
KylinOrderExpress lastInfo = expressList.get(count - 1);
mid = lastInfo.getMid();
}
} while (count >= limitNum);
......@@ -594,7 +588,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
}
public String batchGenerateImage(String performanceId) {
List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999);
/*List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelExpressList(performanceId, 0, 9999999);
String ossPath = "";
if (!CollectionUtil.isEmpty(orderList)) {
......@@ -603,7 +597,8 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
performanceExpressSearchAdminParam.setIds(orderIds);
ossPath = generateImage(performanceExpressSearchAdminParam);
}
return ossPath;
return ossPath;*/
return "";
}
public KylinOrderExpressPrintVo printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderExpressMapper.java
View file @ d9f21bc5
......@@ -24,4 +24,6 @@ public interface KylinOrderExpressMapper extends BaseMapper<KylinOrderExpress> {
@Param("mid") Integer mid,
@Param("limitNum") Integer limitNum
);
List<KylinOrderExpress> getCanCancelExpressList(String performanceId, int mid, int limitNum);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java
View file @ d9f21bc5
......@@ -38,5 +38,4 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
List<KylinOrderTickets> getCanPlaceOrderList(@Param("performanceId") String performanceId, @Param("mid") int mid, @Param("limitNum") int limitNum);
List<KylinOrderTickets> getCanCancelOrderList(@Param("performanceId") String performanceId, @Param("mid") int mid, @Param("limitNum") int limitNum);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderExpressMapper.xml
View file @ d9f21bc5
......@@ -38,4 +38,15 @@
ORDER BY a.mid ASC
LIMIT ${limitNum}
</select>
<select id="getCanCancelExpressList" resultType="com.liquidnet.service.kylin.entity.KylinOrderExpress">
SELECT
mid, order_express_id, order_tickets_id
FROM kylin_order_express
<where>
performance_id = #{performanceId}
AND express_status = 2 -- 只能取消申请成功的 揽收以后不支持取消
AND kot.mid > ${mid}
</where>
LIMIT ${limitNum}
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ d9f21bc5
......@@ -327,20 +327,4 @@
GROUP BY kot.order_tickets_id
LIMIT ${limitNum}
</select>
<select id="getCanCancelOrderList" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
SELECT
kot.order_tickets_id,
kot.mid
FROM kylin_order_tickets kot
INNER join kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
INNER join kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
INNER join kylin_order_express koe ON kot.order_tickets_id = koe.order_tickets_id
<where>
kotr.performance_id = #{performanceId}
AND kot.get_ticket_type = 'express'
AND koe.express_status NOT IN (1, 3) -- 只能取消申请成功的
AND kot.mid > ${mid}
</where>
LIMIT ${limitNum}
</select>
</mapper>
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