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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

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

@@ -183,7 +183,12 @@
               pay.setName(getPayName(pay.getPayType()));

            }

         }

      BigDecimal money = redPackBalanceService.getBalance(uid);

      BigDecimal money = new BigDecimal(0);

      try {

         money = redPackBalanceService.getBalance(uid);

      } catch (RedPackBalanceException e) {

         e.printStackTrace();

      }

      JSONObject data = new JSONObject();

      data.put("goods", goods);

      data.put("hongBaoBalance", money);