消息、通知、交易

alien-entity/src/main/java/shop/alien/entity/store/LifeMessage.java

@@ -34,7 +34,7 @@ public class LifeMessage {
     @ApiModelProperty(value = "发送内容")
     private String content;
 
-    @ApiModelProperty(value = "消息类型  1-文本  2-图片 3-链接  4-二手交易信息")
+    @ApiModelProperty(value = "消息类型  1-文本  2-图片 3-链接  4-二手交易创建/确认/拒绝  5-二手交易签到提醒  6-二手交易已签到")
     private String type;
 
     private Date currentTime;

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeMessageVo.java

@@ -24,6 +24,9 @@ public class LifeMessageVo extends LifeMessage {
 
     @ApiModelProperty(value = "唯一标识")
     private String phoneId;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
 //
 //    @ApiModelProperty(value = "消息列表")
 //    private List<LifeMessage> messageList;

alien-entity/src/main/java/shop/alien/entity/store/vo/WebsocketVo.java

@@ -17,7 +17,7 @@ public class WebsocketVo {
     @ApiModelProperty(value = "类别(消息-message 公告-notice 心跳-heartbeat)")
     private String category;
 
-    @ApiModelProperty(value = "消息类型  1-文本  2-图片  3-链接")
+    @ApiModelProperty(value = "消息类型  1-文本  2-图片 3-链接  4-二手交易创建/确认/拒绝  5-二手交易签到提醒  6-二手交易已签到")
     private String type;
 
     @ApiModelProperty(value = "消息内容")

alien-entity/src/main/java/shop/alien/mapper/LifeMessageMapper.java

@@ -44,7 +44,8 @@ public interface LifeMessageMapper extends BaseMapper<LifeMessage> {
             ") " +
             "select message.id, message.type, message.phoneId, message.content, message.created_time createdTime, message.is_read, " +
             "       if (message.flag = 'user', user.user_name, suser.name) userName, " +
-            "       if (message.flag = 'user', user.user_image, img.img_url) userImage " +
+            "       if (message.flag = 'user', user.user_image, img.img_url) userImage," +
+            "       if (message.flag = 'user', user.id, suser.id) userId " +
             "from message_num message " +
             "left join life_user user on message.flag = 'user' and message.phone = user.user_phone and user.delete_flag = 0 " +
             "left join store_user suser on message.flag = 'store' and message.phone = suser.phone and suser.delete_flag = 0 " +

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

@@ -31,7 +31,7 @@ public class SecondTradeRecordController {
 
     private final SecondTradeRecordService secondTradeRecordService;
 
-    @ApiOperation("获取交易信息")
+    @ApiOperation("交易窗")
     @ApiOperationSupport(order = 1)
     @ApiImplicitParams({@ApiImplicitParam(name = "sideId", value = "对方的id", dataType = "Integer", paramType = "query", required = true)})
     @GetMapping("/getTradeRecord")
@@ -71,7 +71,7 @@ public class SecondTradeRecordController {
         return R.fail("签到失败");
     }
 
-    @ApiOperation("交易确认")
+    @ApiOperation("确认拒绝交易")
     @ApiOperationSupport(order = 5)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tradeId", value = "交易id", dataType = "Integer", paramType = "query", required = true),
@@ -84,10 +84,23 @@ public class SecondTradeRecordController {
         return R.fail("交易确认失败");
     }
 
-    @ApiOperation("取消交易")
+    @ApiOperation("交易完成确认")
     @ApiOperationSupport(order = 6)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tradeId", value = "交易id", dataType = "Integer", paramType = "query", required = true),
+            @ApiImplicitParam(name = "type", value = "0-失败  1-成功", dataType = "Integer", paramType = "query", required = true),
+            @ApiImplicitParam(name = "evaluate", value = "评价", dataType = "String", paramType = "query")})
+    @GetMapping("/tradeCompleteConfirm")
+    public R<Boolean> tradeCompleteConfirm(@RequestParam int tradeId, @RequestParam int type, @RequestParam String evaluate) throws Exception {
+        log.info("SecondTradeRecordController.tradeCompleteConfirm?tradeId={}, type={}, evaluate={}", tradeId, type, evaluate);
+        if (secondTradeRecordService.tradeCompleteConfirm(tradeId, type, evaluate)) return R.success("交易确认成功");
+        return R.fail("交易确认失败");
+    }
+
+    @ApiOperation("取消交易")
+    @ApiOperationSupport(order = 7)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tradeId", value = "交易id", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "cancelReason", value = "取消原因", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "cancelReasonSupplement", value = "取消原因补充", dataType = "String", paramType = "query")})
     @GetMapping("/cancelTrade")

alien-second/src/main/java/shop/alien/second/service/SecondTradeRecordService.java

@@ -24,6 +24,8 @@ public interface SecondTradeRecordService extends IService<SecondTradeRecord> {
 
     boolean tradeConfirm(int tradeId, int type, String evaluate) throws Exception;
 
+    boolean tradeCompleteConfirm(int tradeId, int type, String evaluate) throws Exception;
+
     boolean goodsTradeConfirm(int goodsId) throws Exception;
 
     boolean cancelTrade(int tradeId, String cancelReason, String cancelReasonSupplement) throws Exception;

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

@@ -2,21 +2,18 @@ package shop.alien.second.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import shop.alien.entity.second.SecondGoods;
 import shop.alien.entity.second.SecondTradeRecord;
-import shop.alien.entity.store.LifeMessage;
 import shop.alien.mapper.LifeMessageMapper;
 import shop.alien.mapper.second.SecondGoodsMapper;
 import shop.alien.mapper.second.SecondTradeRecordMapper;
 import shop.alien.second.service.SecondTradeRecordService;
 import shop.alien.util.common.JwtUtil;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -105,6 +102,17 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
     @Override
     public boolean tradeConfirm(int tradeId, int type, String evaluate) throws Exception {
         try {
+
+            return true;
+        } catch (Exception e) {
+            log.error("SecondTradeRecordServiceImpl.tradeConfirm Error Mgs={}", e.getMessage());
+            throw new Exception(e);
+        }
+    }
+
+    @Override
+    public boolean tradeCompleteConfirm(int tradeId, int type, String evaluate) throws Exception {
+        try {
             int userId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getInteger("userId");
             SecondTradeRecord tradeRecord = secondTradeRecordMapper.selectById(tradeId);
             SecondTradeRecord record = new SecondTradeRecord();
@@ -122,7 +130,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             secondTradeRecordMapper.updateById(record);
             return true;
         } catch (Exception e) {
-            log.error("SecondTradeRecordServiceImpl.tradeConfirm Error Mgs={}", e.getMessage());
+            log.error("SecondTradeRecordServiceImpl.tradeCCompleteConfirm Error Mgs={}", e.getMessage());
             throw new Exception(e);
         }
     }