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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java

@@ -161,8 +161,10 @@
         return;

      }

      try {

         String tips = UserSystemCouponService.giveCoupon(uid, id);

         out.print(JsonUtil.loadTrueResult(tips));

         UserSystemCouponVO vo = UserSystemCouponService.giveCoupon(uid, id);

         JSONObject data = new JSONObject();

         data.put("result", JsonUtil.getApiCommonGson().toJson(vo));

         out.print(JsonUtil.loadTrueResult(data));

      } catch (UserSystemCouponException e) {

         out.print(JsonUtil.loadFalseResult(1, e.getMsg()));

      }