Pārlūkot izejas kodu

交易完成添加打分功能

qrs 4 nedēļas atpakaļ
vecāks
revīzija
3d36d963d9

+ 8 - 0
alien-entity/src/main/java/shop/alien/entity/second/SecondTradeRecord.java

@@ -107,6 +107,10 @@ public class SecondTradeRecord extends Model<SecondTradeRecord> {
     @TableField("buyer_transaction_status")
     private Integer buyerTransactionStatus;
 
+    @ApiModelProperty(value = "买家完成交易时间")
+    @TableField("buyer_complete_time")
+    private Date buyerCompleteTime;
+
     @ApiModelProperty(value = "买家评价")
     @TableField("buyer_evaluate")
     private String buyerEvaluate;
@@ -119,6 +123,10 @@ public class SecondTradeRecord extends Model<SecondTradeRecord> {
     @TableField("seller_transaction_status")
     private Integer sellerTransactionStatus;
 
+    @ApiModelProperty(value = "卖家完成交易时间")
+    @TableField("seller_complete_time")
+    private Date sellerCompleteTime;
+
     @ApiModelProperty(value = "卖家评价")
     @TableField("seller_evaluate")
     private String sellerEvaluate;

+ 2 - 1
alien-second/src/main/java/shop/alien/second/controller/SecondTradeRecordController.java

@@ -117,7 +117,8 @@ public class SecondTradeRecordController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tradeId", value = "交易id", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "type", value = "1-交易成功  2-交易失败", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "evaluate", value = "评价", dataType = "String", paramType = "query")})
+            @ApiImplicitParam(name = "evaluate", value = "评价", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "rating", value = "评分", dataType = "Integer", paramType = "query")})
     @GetMapping("/tradeCompleteConfirm")
     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);

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

@@ -484,12 +484,14 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             if (userId == tradeRecord.getBuyerId()) {
                 if (0 != tradeRecord.getBuyerTransactionStatus()) return false;
                 record.setBuyerTransactionStatus(type);
+                record.setBuyerCompleteTime(new Date());
                 record.setBuyerEvaluate(evaluate);
                 record.setBuyerRating(rating);
             // 卖家
             } else if (userId == tradeRecord.getSellerId()) {
                 if (0 != tradeRecord.getSellerTransactionStatus()) return false;
                 record.setSellerTransactionStatus(type);
+                record.setSellerCompleteTime(new Date());
                 record.setSellerEvaluate(evaluate);
                 record.setSellerRating(rating);
                 record.setTradeStatus(1 == type ? 4 : 5);