From 3bef30e502d6efe68cad7671ae73a0814108dfa7 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Sat, 9 Nov 2024 16:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E7=A5=A8=E6=9C=BA?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=A2=9E=E5=8A=A0=E5=8F=96=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=B8=8A=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suisung/mall/common/api/StateCode.java | 2 +- .../common/modules/order/ShopOrderInfo.java | 2 ++ .../modules/store/ShopStorePrinterLog.java | 18 ++++++++-- .../suisung/mall/common/api/StateCode.class | Bin 15613 -> 15613 bytes .../common/modules/order/ShopOrderInfo.class | Bin 40357 -> 41249 bytes .../order/listener/OrderPayedListener.java | 8 ++++- .../order/service/ShopOrderInfoService.java | 7 ++++ .../impl/ShopOrderBaseServiceImpl.java | 14 ++++---- .../impl/ShopOrderInfoServiceImpl.java | 32 +++++++++++++++++ .../impl/ShopStorePrinterServiceImpl.java | 18 +++++----- .../mall/shop/store/utis/FeieUtil.java | 34 ++++++------------ .../mapper/order/ShopOrderBaseMapper.xml | 2 +- .../mapper/order/ShopOrderInfoMapper.xml | 2 +- .../order/listener/OrderPayedListener.class | Bin 4645 -> 4920 bytes .../order/service/ShopOrderInfoService.class | Bin 560 -> 668 bytes .../impl/ShopOrderBaseServiceImpl.class | Bin 271059 -> 271153 bytes .../impl/ShopOrderInfoServiceImpl.class | Bin 19916 -> 20797 bytes .../mapper/order/ShopOrderBaseMapper.xml | 2 +- .../mapper/order/ShopOrderInfoMapper.xml | 2 +- 19 files changed, 94 insertions(+), 49 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java b/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java index 5b62c1d4..d36fcddb 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java +++ b/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java @@ -103,9 +103,9 @@ public class StateCode { public static final int PRODUCT_VERIFY_WAITING = 3002; //审核中 public static final int ORDER_STATE_WAIT_PAY = 2010; //待付款 - 虚拟映射 - public static final int ORDER_STATE_WAIT_PAID = 2016; //已经付款 - 虚拟映射 public static final int ORDER_STATE_WAIT_REVIEW = 2011; //待订单审核 public static final int ORDER_STATE_WAIT_FINANCE_REVIEW = 2013; //待财务审核 + public static final int ORDER_STATE_WAIT_PAID = 2016; //已经付款 - 虚拟映射 public static final int ORDER_STATE_PICKING = 2020; //待配货 public static final int ORDER_STATE_WAIT_SHIPPING = 2030; //待发货 public static final int ORDER_STATE_SHIPPED = 2040; //已发货 diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderInfo.java b/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderInfo.java index 80956adc..31856f29 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderInfo.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderInfo.java @@ -195,4 +195,6 @@ public class ShopOrderInfo implements Serializable { @ApiModelProperty(value = "服务类型(ENUM):1001-到店服务;1002-上门服务;1003-试驾模板; 针对虚拟产品") private Integer order_valid_type; + @ApiModelProperty(value = "取单号，根据每个店铺每天已支付的订单累加+1") + private Long order_pickup_num; } 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 index 0220fec2..efa3884c 100644 --- 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 @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; @@ -21,14 +23,26 @@ import java.util.Date; * @since 2024-10-28 */ @Data +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("shop_store_printer") -@ApiModel(value = "ShopStorePrinter对象", description = "门店打票机表") +@TableName("shop_store_printer_log") +@ApiModel(value = "ShopStorePrinterLog", description = "门店打票机打印日志表") public class ShopStorePrinterLog implements Serializable { private static final long serialVersionUID = 1L; + public ShopStorePrinterLog(Integer category,Integer storeId,String orderId,Long templateId,String templateValue, String templateData,String printContent) { + this.category = category; + this.store_id = storeId; + this.order_id = orderId; + this.template_id = templateId; + this.template_data = templateData; + this.template_value = templateValue; + this.print_content = printContent; + } + @ApiModelProperty(value = "日志自增ID") @TableId(value = "log_id", type = IdType.INPUT) private Long log_id; diff --git a/mall-common/target/classes/com/suisung/mall/common/api/StateCode.class b/mall-common/target/classes/com/suisung/mall/common/api/StateCode.class index c890d6c74e632adb53da30c1cf417c8d1714a917..c48e7fdab728f279484d721174e76bfb95b09ff8 100644 GIT binary patch delta 67 zcmexc`L}XI8Rz85oNm&h{y{FTLGi&Mjv=n`;f|gm@d1vWF3b!J><>0y=ge0XJkB7= XSj}L^z{p_Fz`(%7aB_3F{xV(w3EmUo delta 43 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