Merge branch 'dev/2024/0508/update-admin-Y' of feifan/mall-backend-admin into master

修改推掉日志表的字段

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/ordercallbacklogs/vo/OrderCallbackLogsPageReqVO.java

@@ -23,8 +23,8 @@ public class OrderCallbackLogsPageReqVO extends PageParam {
     @Schema(description = "回调响应体")
     private String responseBody;
 
-    @Schema(description = "回调状态", example = "2")
-    private String status;
+    @Schema(description = "回调状态，失败是0，成功是1", example = "1")
+    private Boolean status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/ordercallbacklogs/vo/OrderCallbackLogsRespVO.java

@@ -26,9 +26,9 @@ public class OrderCallbackLogsRespVO {
     @ExcelProperty("回调响应体")
     private String responseBody;
 
-    @Schema(description = "回调状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "回调状态，失败是0，成功是1", example = "1")
     @ExcelProperty("回调状态")
-    private String status;
+    private Boolean status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/ordercallbacklogs/vo/OrderCallbackLogsSaveReqVO.java

@@ -23,8 +23,8 @@ public class OrderCallbackLogsSaveReqVO {
     @NotEmpty(message = "回调响应体不能为空")
     private String responseBody;
 
-    @Schema(description = "回调状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "回调状态不能为空")
-    private String status;
+    @Schema(description = "回调状态，失败是0，成功是1", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "回调状态，失败是0，成功是1不能为空")
+    private Boolean status;
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/ordercallbacklogs/OrderCallbackLogsDO.java

@@ -37,8 +37,8 @@ public class OrderCallbackLogsDO extends BaseDO {
      */
     private String responseBody;
     /**
-     * 回调状态
+     * 回调状态，失败是0，成功是1
      */
-    private String status;
+    private Boolean status;
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/ordercallbacklogs/OrderCallbackLogsServiceImpl.java

@@ -69,12 +69,8 @@ public class OrderCallbackLogsServiceImpl implements OrderCallbackLogsService {
 
     @Override
     public void create(String orderId, String param, String responseBody, String status) {
-        if(status.equals("200")){
-            status = "SUCCESS";
-        }else{
-            status = "FAILED";
-        }
-        OrderCallbackLogsDO build = OrderCallbackLogsDO.builder().orderId(orderId).requestParam(param).responseBody(responseBody).status(status).build();
+        boolean flag = status.equals("200");
+        OrderCallbackLogsDO build = OrderCallbackLogsDO.builder().orderId(orderId).requestParam(param).responseBody(responseBody).status(flag).build();
         orderCallbackLogsMapper.insert(build);
     }