diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterLog.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterLog.java new file mode 100644 index 00000000..0220fec2 --- /dev/null +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterLog.java @@ -0,0 +1,71 @@ +package com.suisung.mall.common.modules.store; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + *
+ * 门店打票机表 + *
+ * + * @author panjunjie + * @since 2024-10-28 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("shop_store_printer") +@ApiModel(value = "ShopStorePrinter对象", description = "门店打票机表") +public class ShopStorePrinterLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "日志自增ID") + @TableId(value = "log_id", type = IdType.INPUT) + private Long log_id; + + @ApiModelProperty(value = "打印分类") + private Integer category; + + @ApiModelProperty(value = "门店ID") + private Integer store_id; + + @ApiModelProperty(value = "订单ID") + private String order_id; + + @ApiModelProperty(value = "打印模版ID") + private Long template_id; + + @ApiModelProperty(value = "模版字符串") + private String template_value; + + @ApiModelProperty(value = "模版渲染数据值") + private String template_data; + + @ApiModelProperty(value = "最终打印的内容") + private String print_content; + + @ApiModelProperty(value = "状态:1-有效;2-无效;") + private Integer status; + + @ApiModelProperty(value = "新增用户ID") + private Integer created_by; + + @ApiModelProperty(value = "更新用户ID") + private Integer updated_by; + + @ApiModelProperty(value = "新增时间") + private Date created_at; + + @ApiModelProperty(value = "修改时间") + private Date updated_at; +} diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java b/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java index ef00459a..90877d3c 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java +++ b/mall-common/src/main/java/com/suisung/mall/common/utils/FreeMakerUtils.java @@ -48,13 +48,12 @@ public class FreeMakerUtils { } catch (Exception e) { log.error(e.getMessage(), e); return null; -// throw new RuntimeException(e); } finally { if (stringWriter != null) { try { stringWriter.close(); } catch (IOException e) { -// throw new RuntimeException(e); + log.error(e.getMessage(), e); return null; } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java index 231f2375..7df8918f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java @@ -3,7 +3,6 @@ package com.suisung.mall.shop.store.controller.admin; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.modules.store.ShopStorePrinter; import com.suisung.mall.shop.store.service.ShopStorePrinterService; -import com.suisung.mall.shop.store.utis.FeieUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java index 82e0a0b1..f500fb9e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java @@ -1,8 +1,6 @@ package com.suisung.mall.shop.store.controller.admin; import com.suisung.mall.common.api.CommonResult; -import com.suisung.mall.common.modules.store.ShopStorePrinterRegion; -import com.suisung.mall.shop.store.service.ShopStorePrinterRegionService; import com.suisung.mall.shop.store.service.ShopStorePrinterTemplateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterLogMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterLogMapper.java new file mode 100644 index 00000000..5f98630f --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterLogMapper.java @@ -0,0 +1,18 @@ +package com.suisung.mall.shop.store.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.suisung.mall.common.modules.store.ShopStorePrinterLog; +import org.springframework.stereotype.Repository; + +/** + *+ * 店铺打票机 mapper 接口 + *
+ * + * @author panjunjie + * @since 2024-10-28 + */ + +@Repository +public interface ShopStorePrinterLogMapper extends BaseMapper
* 店铺打票机 mapper 接口
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterLogService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterLogService.java
new file mode 100644
index 00000000..b0490cdd
--- /dev/null
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterLogService.java
@@ -0,0 +1,17 @@
+package com.suisung.mall.shop.store.service;
+
+import com.suisung.mall.common.modules.store.ShopStorePrinterLog;
+import com.suisung.mall.core.web.service.IBaseService;
+
+public interface ShopStorePrinterLogService extends IBaseService