交易完成添加打分功能

alien-entity/src/main/java/shop/alien/entity/second/SecondTradeRecord.java

@@ -111,6 +111,10 @@ public class SecondTradeRecord extends Model<SecondTradeRecord> {
     @TableField("buyer_evaluate")
     private String buyerEvaluate;
 
+    @ApiModelProperty(value = "买家评分")
+    @TableField("buyer_rating")
+    private Integer buyerRating;
+
     @ApiModelProperty(value = "卖家交易状态  0-未确认  1-交易成功  2-交易失败")
     @TableField("seller_transaction_status")
     private Integer sellerTransactionStatus;
@@ -119,6 +123,10 @@ public class SecondTradeRecord extends Model<SecondTradeRecord> {
     @TableField("seller_evaluate")
     private String sellerEvaluate;
 
+    @ApiModelProperty(value = "卖家评分")
+    @TableField("seller_rating")
+    private Integer sellerRating;
+
     @ApiModelProperty(value = "交易状态  1-待确认  2-已拒绝  3-待交易  4-交易成功  5-交易失败  6-交易取消")
     @TableField("trade_status")
     private Integer tradeStatus;

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

@@ -119,9 +119,9 @@ public class SecondTradeRecordController {
             @ApiImplicitParam(name = "type", value = "1-交易成功  2-交易失败", 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, String evaluate) throws Exception {
-        log.info("SecondTradeRecordController.tradeCompleteConfirm?tradeId={}, type={}, evaluate={}", tradeId, type, evaluate);
-        return R.data(secondTradeRecordService.tradeCompleteConfirm(tradeId, type, evaluate));
+    public R<Boolean> tradeCompleteConfirm(@RequestParam int tradeId, @RequestParam int type, String evaluate, Integer rating) throws Exception {
+        log.info("SecondTradeRecordController.tradeCompleteConfirm?tradeId={}, type={}, evaluate={}, rating={}", tradeId, type, evaluate, rating);
+        return R.data(secondTradeRecordService.tradeCompleteConfirm(tradeId, type, evaluate, rating));
     }
 
     @ApiOperation("获取用户交易确认信息")

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

@@ -31,7 +31,7 @@ public interface SecondTradeRecordService extends IService<SecondTradeRecord> {
 
     SecondTradeRecordVo getUserTradeStatus(int tradeId) throws Exception;
 
-    boolean tradeCompleteConfirm(int tradeId, int type, String evaluate) throws Exception;
+    boolean tradeCompleteConfirm(int tradeId, int type, String evaluate, Integer rating) throws Exception;
 
     List<SecondTradeRecordVo> getTradeRecord(int sideId) throws Exception;
 

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

@@ -474,7 +474,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean tradeCompleteConfirm(int tradeId, int type, String evaluate) throws Exception {
+    public boolean tradeCompleteConfirm(int tradeId, int type, String evaluate, Integer rating) throws Exception {
         try {
             int userId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getInteger("userId");
             SecondTradeRecord tradeRecord = secondTradeRecordMapper.selectById(tradeId);
@@ -485,11 +485,13 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
                 if (0 != tradeRecord.getBuyerTransactionStatus()) return false;
                 record.setBuyerTransactionStatus(type);
                 record.setBuyerEvaluate(evaluate);
+                record.setBuyerRating(rating);
             // 卖家
             } else if (userId == tradeRecord.getSellerId()) {
                 if (0 != tradeRecord.getSellerTransactionStatus()) return false;
                 record.setSellerTransactionStatus(type);
                 record.setSellerEvaluate(evaluate);
+                record.setSellerRating(rating);
                 record.setTradeStatus(1 == type ? 4 : 5);
                 // 卖家如果选择交易成功  同步修改商品表
                 if (1 == type) {