又想干了

alien-second/src/main/java/shop/alien/second/service/impl/PlatformSecondTradeServiceImpl.java

@@ -95,6 +95,7 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
             throw new Exception(e);
         }
     }
+
     @Override
     public List<JSONObject> getOperationJsonList(Integer tradeId) throws Exception {
         try {
@@ -180,7 +181,7 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
                 // 第一个人签到
                 JSONObject signInJson = new JSONObject();
                 signInJson.put("flag", 1);
-                signInJson.put("message", (Objects.equals(record.getBuyerId(), signIn.get(0).getUserId()) ? "买家" : "卖家" ) + "已签到");
+                signInJson.put("message", (Objects.equals(record.getBuyerId(), signIn.get(0).getUserId()) ? "买家" : "卖家") + "已签到");
                 signInJson.put("time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(signIn.get(0).getCreatedTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()));
                 operationJsonList.add(signInJson);
 
@@ -188,13 +189,13 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
                 if (signIn.size() > 1) {
                     JSONObject signInJson2 = new JSONObject();
                     signInJson2.put("flag", 1);
-                    signInJson2.put("message", (Objects.equals(record.getBuyerId(), signIn.get(1).getUserId()) ? "买家" : "卖家" ) + "已签到");
+                    signInJson2.put("message", (Objects.equals(record.getBuyerId(), signIn.get(1).getUserId()) ? "买家" : "卖家") + "已签到");
                     signInJson2.put("time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(signIn.get(1).getCreatedTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()));
                     operationJsonList.add(signInJson2);
                 } else {
                     JSONObject signInJson2 = new JSONObject();
                     signInJson2.put("flag", CollectionUtil.isEmpty(successFail) ? 0 : 2);
-                    signInJson2.put("message", (Objects.equals(record.getBuyerId(), signIn.get(0).getUserId()) ? "卖家" : "买家" ) + "未签到");
+                    signInJson2.put("message", (Objects.equals(record.getBuyerId(), signIn.get(0).getUserId()) ? "卖家" : "买家") + "未签到");
                     signInJson2.put("time", "");
                     operationJsonList.add(signInJson2);
                 }
@@ -227,7 +228,7 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
                 // 第一个人确认交易
                 JSONObject successFailJson = new JSONObject();
                 successFailJson.put("flag", 1);
-                successFailJson.put("message", (Objects.equals(record.getBuyerId(), successFail.get(0).getUserId()) ? "买家" : "卖家" ) + "确认交易" +
+                successFailJson.put("message", (Objects.equals(record.getBuyerId(), successFail.get(0).getUserId()) ? "买家" : "卖家") + "确认交易" +
                         (5 == successFail.get(0).getType() ? "成功" : "失败"));
                 successFailJson.put("time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(successFail.get(0).getCreatedTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()));
                 operationJsonList.add(successFailJson);
@@ -236,14 +237,14 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
                 if (successFail.size() > 1) {
                     JSONObject successFailJson2 = new JSONObject();
                     successFailJson2.put("flag", 1);
-                    successFailJson2.put("message", (Objects.equals(record.getBuyerId(), successFail.get(1).getUserId()) ? "买家" : "卖家" ) + "确认交易" +
+                    successFailJson2.put("message", (Objects.equals(record.getBuyerId(), successFail.get(1).getUserId()) ? "买家" : "卖家") + "确认交易" +
                             (5 == successFail.get(1).getType() ? "成功" : "失败"));
                     successFailJson2.put("time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(successFail.get(1).getCreatedTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()));
                     operationJsonList.add(successFailJson2);
                 } else {
                     JSONObject successFailJson2 = new JSONObject();
                     successFailJson2.put("flag", Objects.equals(record.getSellerId(), successFail.get(0).getUserId()) ? 2 : 0);
-                    successFailJson2.put("message", (Objects.equals(record.getBuyerId(), successFail.get(0).getUserId()) ? "卖家" : "买家" ) + "未确认交易");
+                    successFailJson2.put("message", (Objects.equals(record.getBuyerId(), successFail.get(0).getUserId()) ? "卖家" : "买家") + "未确认交易");
                     successFailJson2.put("time", "");
                     operationJsonList.add(successFailJson2);
                 }
@@ -282,7 +283,7 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
         try {
             if (StringUtils.isBlank(beginTime)) beginTime = "1970-01-01 00:00:00";
             if (StringUtils.isBlank(endTime)) endTime = "9999-12-31 23:59:59";
-            return null;
+            return secondTradeRecordMapper.getRankingList(beginTime, endTime);
         } catch (Exception e) {
             log.error("PlatformSecondTradeServiceImpl.getRankingList Error Msg={}", e.getMessage());
             throw new Exception(e);
@@ -297,7 +298,7 @@ public class PlatformSecondTradeServiceImpl extends ServiceImpl<SecondTradeRecor
             wrapper.set(SecondTradeRecord::getFailureFlag, 1);
             wrapper.set(SecondTradeRecord::getFailureReason, failureReason);
             secondTradeRecordMapper.update(null, wrapper);
-        } catch (Exception e) {`
+        } catch (Exception e) {
             log.error("PlatformSecondTradeServiceImpl.setTradeFailure Error Msg={}", e.getMessage());
             throw new Exception(e);
         }