添加商家驳回理由

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java

@@ -152,7 +152,7 @@ public class McStrokeController extends BaseController {
     @RequiresPermissions("merchant:order:edit")
     @RequiresPermissions("merchant:order:edit")
     public ApiResult<Boolean> cancel(@Validated @RequestBody StrokeCancelParam strokeCancelParam) throws Exception {
     public ApiResult<Boolean> cancel(@Validated @RequestBody StrokeCancelParam strokeCancelParam) throws Exception {
 
 
-        boolean flag = strokeService.cancel(strokeCancelParam.getId());
+        boolean flag = strokeService.cancel(strokeCancelParam.getId(),strokeCancelParam.getRefusalReason());
         return ApiResult.result(flag);
         return ApiResult.result(flag);
     }
     }
 
 

api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/StrokeCancelParam.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 
 
 /**
 /**
@@ -26,5 +27,8 @@ public class StrokeCancelParam extends BaseEntity {
     @ApiModelProperty("主键ID")
     @ApiModelProperty("主键ID")
     private Long id;
     private Long id;
 
 
+    @NotBlank(message = "商家驳回理由不能为空")
+    @ApiModelProperty("商家驳回理由")
+    private String refusalReason;
 
 
 }
 }

common/src/main/java/com/jumeirah/common/entity/Stroke.java

@@ -174,4 +174,8 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("付款渠道，0-线下渠道，1-线上渠道")
     @ApiModelProperty("付款渠道，0-线下渠道，1-线上渠道")
     private Integer paymentChannel;
     private Integer paymentChannel;
 
 
+    @NotBlank(message = "商家驳回理由不能为空")
+    @ApiModelProperty("商家驳回理由")
+    private String refusalReason;
+
 }
 }

common/src/main/java/com/jumeirah/common/service/StrokeService.java

@@ -41,7 +41,7 @@ public interface StrokeService extends BaseService<Stroke> {
     boolean updateStroke(Stroke stroke) throws Exception;
     boolean updateStroke(Stroke stroke) throws Exception;
 
 
 
 
-    boolean cancel(Long id) throws Exception;
+    boolean cancel(Long id, String refusalReason) throws Exception;
 
 
     /**
     /**
      * 删除
      * 删除

common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java

@@ -69,11 +69,12 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
     }
     }
 
 
     @Override
     @Override
-    public boolean cancel(Long id) throws Exception {
+    public boolean cancel(Long id, String refusalReason) throws Exception {
 
 
         // 修改订单状态为取消
         // 修改订单状态为取消
         Stroke stroke = new Stroke();
         Stroke stroke = new Stroke();
         stroke.setId(id)
         stroke.setId(id)
+                .setRefusalReason(refusalReason)
                 .setStatus(StrokeStatusEnum.CANCEL.getCode())
                 .setStatus(StrokeStatusEnum.CANCEL.getCode())
                 .setUpdateTime(new Timestamp(System.currentTimeMillis()));
                 .setUpdateTime(new Timestamp(System.currentTimeMillis()));
         boolean b = super.updateById(stroke);
         boolean b = super.updateById(stroke);