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

yujian

2019-07-22 1011d9d0aaab0e978caf4513b64f0a369bcd9a96

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -773,7 +773,7 @@
         userInfoService.addMoney(new UserInfo(uid), money);



         // 插入资金通知

         userMoneyMsgNotificationService.orderReward(uid, orderNo, money,

         userMoneyMsgNotificationService.orderReward(uid, orderNo,goodsType, money,

               userInfoService.selectByPKey(uid).getMyHongBao());



         /* 用户券信息状态及记录处理 */