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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -267,10 +267,10 @@
      }

      try {

         previewInfoService.saveExtractRecord(uid, dayTime, money);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

      } catch (PreviewInfoException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      }

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

   }



   @RequestMapping(value = "getExtractRecord")

@@ -286,7 +286,6 @@
         list = new ArrayList<>();



      JSONArray JSONArray = new JSONArray();

		
      if (list.size() > 0) {

         for (Extract extract : list) {

            Date receiveTime = extract.getReceiveTime();

@@ -408,13 +407,8 @@
   @RequestMapping(value = "saveMoneyArrival")

   public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String dayTime,

         String orderNo, PrintWriter out) {

      if (uid == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户未登录"));

         return;

      }



      try {

         String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo);

         String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo, acceptData.getPlatform());

         JSONObject object = new JSONObject();

         object.put("link", link);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));

@@ -422,7 +416,7 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("保存失败"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("预览失败"));

      }

   }