Skip to content

O
order-group
Commit 8b98c287 by zhiheng.zhang
Options

Merge branch 'feature/2020/09/30-20-停车上订单未支付积分回退-张志恒' into qa 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
parents 58ac3c38 a470a7fe
Showing with 103 additions and 1 deletions
assortment-ordercenter-sdk/readme.md
...@@ -80,3 +80,59 @@ ...@@ -80,3 +80,59 @@
| 2.0.8-SNAPSHOT| 加料商品 | 梁崇福 | 2020-07-27 | | 2.0.8-SNAPSHOT| 加料商品 | 梁崇福 | 2020-07-27 |
| 2.0.14-SNAPSHOT| 麦咖啡 | 谌会阳 | 2020-08-17 | | 2.0.14-SNAPSHOT| 麦咖啡 | 谌会阳 | 2020-08-17 |
| 2.0.15-SNAPSHOT| 升级ordercenter-sdk | 肖家炜 | 2020-08-25 | | 2.0.15-SNAPSHOT| 升级ordercenter-sdk | 肖家炜 | 2020-08-25 |
| 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
| 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
| 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
| 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
| 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
| 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
| 1.2.9.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
| 1.3.0.RELEASE | app订单 | 丁凯 | 2020-04-20 |
| 1.3.1.RELEASE | queryOrderById返回新增商家、平台优惠 | 侯书虎 | 2020-04-20 |
| 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 |
| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
| 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
| 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
| 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
| 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
| 1.3.8.RELEASE | 配送费时间金额 | 胡超 | 2020-05-11 |
| 1.3.9.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
| 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
| 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
| 1.4.3.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
| 1.4.4.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-18 |
| 1.4.5.RELEASE | 升级券码sdk |胡超 | 2020-05-18 |
| 1.4.6.RELEASE | 券码接口新增组织机构 |胡超 | 2020-05-18 |
| 1.4.7.RELEASE | 创建订单增加appid字段 | wuping | 2020-05-18 |
| 1.4.8.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
| 1.3.4-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
| 1.3.5-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
| 1.4.9.RELEASE | 售后单任务 | wuping | 2020-05-21 |
| 1.5.0-RELEASE| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-22 |
| 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型 | wuping | 2020-05-15 |
| 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提 | wuping | 2020-05-18 |
| 1.5.1-RELEASE| 增加订单支付方式 | 海波 | 2020-05-25 |
| 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
| 1.5.3-RELEASE| 增加下游订单号 | 海波 | 2020-06-01 |
| 1.5.4-RELEASE| 客如云增加字段 | 茹祥 | 2020-06-01 |
| 1.5.5-RELEASE| 会员价优惠新增类型 | 侯书虎 | 2020-06-02 |
| 1.5.6-RELEASE| 更新客如云方法名 | 海波 | 2020-06-05 |
| 1.5.7-RELEASE| 集点参数为0 不要调会员接口 | 梁崇福 | 2020-06-08 |
| 1.5.8-RELEASE| 查询非码微店订单，下载 | 梁崇福 | 2020-06-08 |
| 1.5.9-RELEASE| 券码修改为channle_code | 梁崇福 | 2020-06-08 |
| 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
| 1.5.10.RELEASE | 买券订单修改升级RELEASE | wuping | 2020-06-10 |
| 1.9.2-SNAPSHOT| 预约单任务删除 | wuping | 2020-06-05 |
| 1.5.11.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
| 1.5.12.RELEASE | 围餐 | dingkai | 2020-06-16 |
| 1.5.13.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
| 1.5.14.RELEASE | 停车费sdk | dingkai | 2020-06-22 |
| 1.5.16.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 |
| 1.5.17.RELEASE | 停车场订单修改 | 伍平 | 2020-07-13 |
| 2.0.5-RELEASE | 围餐修改 | 谌会阳 | 2020-07-27 |
| 2.0.6-RELEASE | ordercenter新增常量 | 张志恒 | 2020-08-04 |
| 2.0.7-RELEASE | 加料商品开发 | 梁崇福 | 2020-08-24 |
| 2.0.8-RELEASE | 订单渠道映射调整 | 李小二 | 2020-08-24 |
| 2.0.9-RELEASE | 麦咖啡 | 徐康 | 2020-09-07 |
| 2.10.0-RELEASE | 停车场订单 | 张志恒 | 2020-09-28 |
\ No newline at end of file
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
...@@ -91,9 +91,13 @@ public class OrderCallBackMQService { ...@@ -91,9 +91,13 @@ public class OrderCallBackMQService {
sendWechatReportMQ(body); sendWechatReportMQ(body);
//上报发票信息 //上报发票信息
sendInvoiceReportMQ(body); sendInvoiceReportMQ(body);
//未支付超时关单，发送队列冲正积分、券码等 //未支付超时关单，发送队列冲正积分、券码等,停车场订单走单独逻辑
if (checkParkingOrders(orderInfoReqs)) {
revertParkingOrders(body);
}else{
revert(body); revert(body);
} }
}
/** /**
* 冲正库存、券码等 * 冲正库存、券码等
...@@ -161,6 +165,10 @@ public class OrderCallBackMQService { ...@@ -161,6 +165,10 @@ public class OrderCallBackMQService {
if (ObjectUtils.equals(1, orderInfoReqs.getPayState()) || ObjectUtils.equals(NewOrderStatus.PENDING_PAYMENT.getIndex(), orderInfoReqs.getOrderState())) { if (ObjectUtils.equals(1, orderInfoReqs.getPayState()) || ObjectUtils.equals(NewOrderStatus.PENDING_PAYMENT.getIndex(), orderInfoReqs.getOrderState())) {
return null; return null;
} }
//停车场订单关闭状态不通知开放平台
if (checkParkingOrders(orderInfoReqs)) {
return null;
}
return orderInfoReqs; return orderInfoReqs;
} }
...@@ -285,4 +293,37 @@ public class OrderCallBackMQService { ...@@ -285,4 +293,37 @@ public class OrderCallBackMQService {
log.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),e.toString()); log.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),e.toString());
} }
} }
/**
* 冲正库存、券码等
* @param body
*/
public void revertParkingOrders(OrderCallBackRequestVo body){
String orderCode=body.getOrderCode();
ApiLog.info("parkingOrderBackOrdersStatusChange", orderCode);
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(orderCode);
//2：未支付
requestDto.setOrderStatus(2);
try {
Header header = new Header(MQAction.INSERT.getAction(), "parkingOrderBackOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
} catch (Exception e) {
ErrorLog.errorConvertJson(this.getClass(),"parkingOrderBackOrdersStatusChange:"+orderCode,e);
}
}
/**
* 检查是否符合停车场订单
* @param orderInfoReqs
* @return
*/
private boolean checkParkingOrders(OrderInfoReqs orderInfoReqs){
if (orderInfoReqs.getOrderClient().equals(OrderClientType.PARKING.getIndex()) && orderInfoReqs.getBizType() == 99 && orderInfoReqs.getPayState() ==3 && orderInfoReqs.getOrderState() == 7) {
return true;
}
return false;
}
} }
ordercenter-sdk/readme.md
...@@ -79,3 +79,7 @@ ...@@ -79,3 +79,7 @@
|1.4.35-SNAPSHOT | 修复queryRelatedOrderByCode反序列化问题 | 肖家炜 | 2020-08-25 | |1.4.35-SNAPSHOT | 修复queryRelatedOrderByCode反序列化问题 | 肖家炜 | 2020-08-25 |
| 1.3.11.RELEASE | 新增常量类转化 | 张志恒 | 2020-08-04 | | 1.3.11.RELEASE | 新增常量类转化 | 张志恒 | 2020-08-04 |
1.3.22.RELEASE | 枚举增加SVC | 张虹旺 | 2020-08-27 | 1.3.22.RELEASE | 枚举增加SVC | 张虹旺 | 2020-08-27 |
| 1.3.12.RELEASE | 加料商品 | 梁崇福 | 2020-08-24 |
| 1.3.13.RELEASE | 麦咖啡 | 徐康 | 2020-09-07 |
| 1.3.14.RELEASE | 修复查询订单时transId为null的问题 | 肖家炜 | 2020-09-08 |
| 1.3.15.RELEASE | 停车场订单撤单 | 张志恒 | 2020-09-28 |
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