Skip to content

O
order-group
Commit 573bd297 by shuhu.hou
Options

Merge branch 'feature/20200210_微信支付上传'

parents c2bb8e72 0b83fc6a
Showing with 1 additions and 1 deletions
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
...@@ -128,7 +128,7 @@ public class OrderCallBackMQService { ...@@ -128,7 +128,7 @@ public class OrderCallBackMQService {
OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class); OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
if (orderInfoReqs != null && OrderClientType.SAAS.getIndex().equals(orderInfoReqs.getOrderClient()) && if (orderInfoReqs != null && OrderClientType.SAAS.getIndex().equals(orderInfoReqs.getOrderClient()) &&
((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) || ((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) ||
(body.getOperateType() == 1 && NewOrderStatus.COMPLETE.getIndex().equals(orderInfoReqs.getOrderState())))) { (body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
return orderInfoReqs; return orderInfoReqs;
} }
} catch (Exception ex) { } catch (Exception ex) {
......
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