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

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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

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



      } catch (ShareGoodsException e) {

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

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

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

         } else {

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