sioudhung/OpticalSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:配片单验光参数调整优化

Browse Source
This commit is contained in:
一休哥哥6666
2026-07-14 14:53:12 +08:00
parent 9be6fd6ec9
commit 324679964c
6 changed files with 492 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jy-system/src/main/java/com/ruoyi/jysystem/domain/JySysOrder.java
View File

@@ -62,6 +62,9 @@ public class JySysOrder extends BaseEntity
@Excel(name = "渐进多焦点价格")
private BigDecimal progressiveMultifocalPrice;
@Excel(name = "是否老花", readConverterExp = "0=否,1=是")
private Integer presbyopia;
@Excel(name = "订单状态", dictType = "jy_order_status")
private String orderStatus;
@@ -261,6 +264,16 @@ public class JySysOrder extends BaseEntity
this.progressiveMultifocalPrice = progressiveMultifocalPrice;
}
public Integer getPresbyopia()
{
return presbyopia;
}
public void setPresbyopia(Integer presbyopia)
{
this.presbyopia = presbyopia;
}
public String getOrderStatus()
{
return orderStatus;
@@ -385,6 +398,7 @@ public class JySysOrder extends BaseEntity
.append("priceC", getPriceC())
.append("logisticsFee", getLogisticsFee())
.append("progressiveMultifocal", getProgressiveMultifocal())
.append("presbyopia", getPresbyopia())
.append("orderStatus", getOrderStatus())
.append("purchaseSettleStatus", getPurchaseSettleStatus())
.append("saleSettleStatus", getSaleSettleStatus())

8
jy-system/src/main/resources/mapper/jysystem/JySysOrderMapper.xml
View File

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="logisticsFee" column="logistics_fee" />
<result property="progressiveMultifocal" column="progressive_multifocal" />
<result property="progressiveMultifocalPrice" column="progressive_multifocal_price" />
<result property="presbyopia" column="presbyopia" />
<result property="orderStatus" column="order_status" />
<result property="purchaseSettleStatus" column="purchase_settle_status" />
<result property="saleSettleStatus" column="sale_settle_status" />
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.lens_factory_tenant_id, lt.name as lens_factory_tenant_name,
o.product_id, p.product_model, p.product_name,
o.lens_id, l.product_name as lens_product_name, l.material as lens_material,
o.price_b, o.price_c, o.logistics_fee, o.progressive_multifocal, o.progressive_multifocal_price, o.order_status, o.purchase_settle_status, o.sale_settle_status,
o.price_b, o.price_c, o.logistics_fee, o.progressive_multifocal, o.progressive_multifocal_price, o.presbyopia, o.order_status, o.purchase_settle_status, o.sale_settle_status,
o.receiver_name, o.receiver_phone, o.receiver_address, o.attachment,
o.remark, o.del_flag, o.create_by, o.create_time, o.update_by, o.update_time
from jy_sys_order o
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="logisticsFee != null">logistics_fee,</if>
<if test="progressiveMultifocal != null">progressive_multifocal,</if>
<if test="progressiveMultifocalPrice != null">progressive_multifocal_price,</if>
<if test="presbyopia != null">presbyopia,</if>
<if test="orderStatus != null">order_status,</if>
<if test="purchaseSettleStatus != null">purchase_settle_status,</if>
<if test="saleSettleStatus != null">sale_settle_status,</if>
@@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="logisticsFee != null">#{logisticsFee},</if>
<if test="progressiveMultifocal != null">#{progressiveMultifocal},</if>
<if test="progressiveMultifocalPrice != null">#{progressiveMultifocalPrice},</if>
<if test="presbyopia != null">#{presbyopia},</if>
<if test="orderStatus != null">#{orderStatus},</if>
<if test="purchaseSettleStatus != null">#{purchaseSettleStatus},</if>
<if test="saleSettleStatus != null">#{saleSettleStatus},</if>
@@ -152,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="logisticsFee != null">logistics_fee = #{logisticsFee},</if>
<if test="progressiveMultifocal != null">progressive_multifocal = #{progressiveMultifocal},</if>
<if test="progressiveMultifocalPrice != null">progressive_multifocal_price = #{progressiveMultifocalPrice},</if>
<if test="presbyopia != null">presbyopia = #{presbyopia},</if>
<if test="orderStatus != null">order_status = #{orderStatus},</if>
<if test="purchaseSettleStatus != null">purchase_settle_status = #{purchaseSettleStatus},</if>
<if test="saleSettleStatus != null">sale_settle_status = #{saleSettleStatus},</if>
@@ -196,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select o.id, o.order_no, o.brand_tenant_id, bt.name as brand_tenant_name,
o.lens_factory_tenant_id, lf.name as lens_factory_tenant_name,
o.product_id, o.lens_id, o.price_b, o.price_c, o.logistics_fee,
o.progressive_multifocal, o.progressive_multifocal_price, o.order_status,
o.progressive_multifocal, o.progressive_multifocal_price, o.presbyopia, o.order_status,
o.purchase_settle_status, o.sale_settle_status,
o.receiver_name, o.receiver_phone, o.receiver_address, o.attachment, o.remark,
o.del_flag, o.create_by, o.create_time, o.update_by, o.update_time

1
jy-system/src/main/resources/sql/jy_sys_order.sql
View File

@@ -16,6 +16,7 @@ CREATE TABLE `jy_sys_order` (
`logistics_fee` decimal(10, 2) NULL DEFAULT NULL COMMENT '物流费用',
`progressive_multifocal` tinyint(4) NULL DEFAULT 0 COMMENT '是否渐进多焦点（0否 1是）',
`progressive_multifocal_price` decimal(10, 2) NULL DEFAULT 0 COMMENT '渐进多焦点价格',
`presbyopia` tinyint(4) NULL DEFAULT 0 COMMENT '是否老花（0否 1是）',
`order_status` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '订单状态（字典 jy_order_status）',
`purchase_settle_status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '采购结算状态（0未结算 1已结算）',
`sale_settle_status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '销售结算状态（0未结算 1已结算）',