bug #1489修改

alien-second/src/main/java/shop/alien/second/controller/SecondTradeRecordController.java

@@ -155,7 +155,7 @@ public class SecondTradeRecordController {
 
     @ApiOperation("修改交易信息")
     @ApiOperationSupport(order = 11)
-    @ApiImplicitParams({@ApiImplicitParam(name = "type", value = "1-交易成功  2-交易失败", dataType = "Integer", paramType = "query", required = true)})
+    @ApiImplicitParams({@ApiImplicitParam(name = "type", value = "1-确认  2-拒绝", dataType = "Integer", paramType = "query", required = true)})
     @GetMapping("/modifyTradeRecord")
     public R<Boolean> modifyTradeRecord(int type, Integer tradeId, String transactionTime, String transactionLatitudeLongitude, String transactionLatitudeLongitudeAddress, String transactionLocation, String messageId) throws Exception {
         log.info("SecondTradeRecordController.modifyTradeRecord?record={}", transactionTime);

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

@@ -609,6 +609,15 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
                 wrapper.set(SecondTradeRecord::getTransactionLatitudeLongitude, transactionLatitudeLongitude);
                 wrapper.set(SecondTradeRecord::getTransactionLatitudeLongitudeAddress, transactionLatitudeLongitudeAddress);
                 wrapper.set(SecondTradeRecord::getTransactionLocation, transactionLocation);
+                // 清空签到信息
+                wrapper.set(SecondTradeRecord::getBuyerSignIn, 0);
+                wrapper.set(SecondTradeRecord::getBuyerSignInTime, null);
+                wrapper.set(SecondTradeRecord::getBuyerSignInLatitudeLongitude, null);
+                wrapper.set(SecondTradeRecord::getBuyerSignInLatitudeLongitudeAddress, null);
+                wrapper.set(SecondTradeRecord::getSellerSignIn, 0);
+                wrapper.set(SecondTradeRecord::getSellerSignInTime, null);
+                wrapper.set(SecondTradeRecord::getSellerSignInLatitudeLongitude, null);
+                wrapper.set(SecondTradeRecord::getSellerSignInLatitudeLongitudeAddress, null);
                 wrapper.eq(SecondTradeRecord::getId, tradeId);
                 secondTradeRecordMapper.update(null, wrapper);
             }
@@ -645,6 +654,11 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
 
             alienStoreFeign.sendMsgToClientByPhoneId(phoneId, JSONObject.from(webSocketVo).toJSONString());
             alienStoreFeign.sendMsgToClientByPhoneId(receiverId, JSONObject.from(webSocketVo).toJSONString());
+
+            // 交易时间小于十分钟,直接发送交易提醒
+            if (1 == type && Math.abs(Duration.between(Instant.now(), trade.getTransactionTime().toInstant()).getSeconds()) < 600) {
+                sendSignInMessage(trade);
+            }
             return true;
         } catch (Exception e) {
             log.error("SecondTradeRecordServiceImpl.modifyTradeRecord(): Error Msg={}", e.getMessage());