From d23bcde03ec0dfc061d0f0c0aeaf09b4591c3f69 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 22 Oct 2025 16:41:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/order/dto/LimitRateDTO.java | 3 ++- .../src/main/resources/mapper/OrderDetailMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LimitRateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LimitRateDTO.java index 0b7ffd90a..047c01469 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LimitRateDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LimitRateDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import lombok.Data; +import java.io.Serializable; import java.util.Set; import java.util.stream.Collectors; @@ -15,7 +16,7 @@ import java.util.stream.Collectors; * @description */ @Data -public class LimitRateDTO { +public class LimitRateDTO implements Serializable { private Long id; /** diff --git a/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml b/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml index f1ed54773..d190e77ca 100644 --- a/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/OrderDetailMapper.xml @@ -7,7 +7,7 @@ INSERT INTO tb_order_detail(order_id, shop_id, product_id, product_img, product_name, product_type, sku_id, sku_name, price,member_price,discount_sale_amount,unit_price, discount_amount, pack_amount, pay_amount, - return_amount, num, pack_number, coupon_num, + return_amount, num, pack_number, coupon_num, is_time_discount, return_num, refund_num, refund_no, discount_sale_note, status, place_num, is_temporary, is_print, is_wait_call, pro_group_info, remark, refund_remark, create_time, update_time) VALUES @@ -16,7 +16,7 @@ #{entity.productType}, #{entity.skuId}, #{entity.skuName}, #{entity.price},#{entity.memberPrice}, #{entity.discountSaleAmount}, #{entity.unitPrice}, #{entity.discountAmount}, #{entity.packAmount}, #{entity.payAmount}, #{entity.returnAmount}, #{entity.num}, #{entity.packNumber}, - #{entity.couponNum}, #{entity.returnNum}, #{entity.refundNum}, #{entity.refundNo}, + #{entity.couponNum}, #{entity.isTimeDiscount}, #{entity.returnNum}, #{entity.refundNum}, #{entity.refundNo}, #{entity.discountSaleNote}, #{entity.status}, #{entity.placeNum}, #{entity.isTemporary}, #{entity.isPrint}, #{entity.isWaitCall}, #{entity.proGroupInfo}, #{entity.remark}, #{entity.refundRemark}, now(), now())