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

yujian

2019-09-10 9dfd71c4bde5afe4bf9bb9a8ec07549e4790b992

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

@@ -196,7 +196,7 @@
         prize = "NoPrize";

      } else {

         try {

            userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_NEWBIES);

            userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_NEWBIES, null);

         } catch (UserSystemCouponException e) {

            e.printStackTrace();

         } catch (Exception e) {