Merge remote-tracking branch 'origin/div' into div

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java

@@ -307,8 +307,8 @@
         integralGetService.addCouponRebate(uid);



      } catch (ShareGoodsException e) {

         if (e.getCode() == 1001) {

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

         if (e.getCode() == 1001 || e.getCode() == 1002) {

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

         } else {

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

         }