Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-15 dbc8f0b2058d809e6dad0ada92d391109cbb4f57

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java

@@ -43,7 +43,8 @@
                  // 首次到账返利

                  

                  // 激活免单券

                  userSystemCouponService.triggerFreeCouponActivate(orderMoneyRecievedMQMsgDTO.getUid());

                  userSystemCouponService.triggerFreeCouponActivate(orderMoneyRecievedMQMsgDTO.getUid(),

                        orderMoneyRecievedMQMsgDTO.getOrderId(), orderMoneyRecievedMQMsgDTO.getSourceType());



                  // 业务代码执行成功后返回

                  return Action.CommitMessage;