更新交易配置

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java

@@ -54,7 +54,7 @@ public class DeliveryExpressTemplateController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得快递运费模板")
+        @Operation(summary = "获得快递运费模板")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
     public CommonResult<DeliveryExpressTemplateDetailRespVO> getDeliveryExpressTemplate(@RequestParam("id") Long id) {

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopPageReqVO.java

@@ -31,4 +31,13 @@ public class ShopPageReqVO extends PageParam {
     @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
     private String logoUrl;
 
+    @Schema(description = "是否启用全场包邮")
+    private Boolean deliveryExpressFreeEnabled;
+
+    @Schema(description = "全场包邮的最小金额，单位：分", example = "10353")
+    private Integer deliveryExpressFreePrice;
+
+    @Schema(description = "是否开启自提")
+    private Boolean deliveryPickUpEnabled;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopRespVO.java

@@ -45,4 +45,16 @@ public class ShopRespVO {
     @ExcelProperty("最后更新时间")
     private LocalDateTime updateTime;
 
+    @Schema(description = "是否启用全场包邮", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否启用全场包邮")
+    private Boolean deliveryExpressFreeEnabled;
+
+    @Schema(description = "全场包邮的最小金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10353")
+    @ExcelProperty("全场包邮的最小金额，单位：分")
+    private Integer deliveryExpressFreePrice;
+
+    @Schema(description = "是否开启自提", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否开启自提")
+    private Boolean deliveryPickUpEnabled;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopSaveReqVO.java

@@ -34,5 +34,12 @@ public class ShopSaveReqVO {
     @Schema(description = "域名", example = "https://www.zhongxing.cn")
     private String website;
 
+    @Schema(description = "是否启用全场包邮", example = "1")
+    private Boolean deliveryExpressFreeEnabled;
 
+    @Schema(description = "全场包邮的最小金额，单位：分", example = "10353")
+    private Integer deliveryExpressFreePrice;
+
+    @Schema(description = "是否开启自提", example = "1")
+    private Boolean deliveryPickUpEnabled;
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/shop/ShopDO.java

@@ -49,5 +49,17 @@ public class ShopDO extends BaseDO {
      * 域名
      */
     private String website;
+    /**
+     * 是否启用全场包邮
+     */
+    private Boolean deliveryExpressFreeEnabled;
+    /**
+     * 全场包邮的最小金额，单位：分
+     */
+    private Integer deliveryExpressFreePrice;
+    /**
+     * 是否开启自提
+     */
+    private Boolean deliveryPickUpEnabled;
 
 }