mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(order): 新增订单产品折扣功能 

- 在订单编辑页面添加产品折扣输入框
- 在 OrderList 模型中添加 discount 字段
- 更新 OrderInfoMapper映射文件，支持 discount 字段的查询和更新
-调整订单总价计算逻辑，考虑折扣因素
master
chenhao 2025-05-16 10:13:51 +08:00
parent 4773bd250d
commit 0c9ed50afb
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ruoyi-admin/src/main/resources/templates/manage/order/edit.html
View File

@ -88,30 +88,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6"> <!-- <div class="col-xs-6">-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-4 control-label is-required">代表处：</label> <!-- <label class="col-sm-4 control-label is-required">代表处：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group"> <!-- <div class="input-group">-->
<!-- <input name="orderDept" type="hidden" th:field="*{orderDept}" id="treeId"/>--> <!-- <input name="orderDept" type="hidden" th:field="*{orderDept}" id="treeId"/>-->
<!-- <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTree()" id="treeName" th:field="*{orderDeptName}" required>--> <!-- <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTree()" id="treeName" th:field="*{orderDeptName}" required>-->
<!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>--> <!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="col-xs-6"> <!-- <div class="col-xs-6">-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-4 control-label is-required">代理商：</label> <!-- <label class="col-sm-4 control-label is-required">代理商：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<!-- <div class="input-group">--> <!-- <div class="input-group">-->
<!-- <input name="orderPartnerCode" type="hidden" th:field="*{orderPartnerCode}" id="treeId1">--> <!-- <input name="orderPartnerCode" type="hidden" th:field="*{orderPartnerCode}" id="treeId1">-->
<!-- <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartner()" id="treeName1" th:field="*{partnerDeptName}" required>--> <!-- <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartner()" id="treeName1" th:field="*{partnerDeptName}" required>-->
<!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>--> <!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>-->
<!-- </div>--> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">签定日期：</label> <label class="col-sm-4 control-label is-required">签定日期：</label>
@ -252,6 +252,15 @@
return html; return html;
} }
}, },
{
field: 'discount',
align: 'center',
title: '折扣',
formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].discount' value='%s'>", index, value);
return html;
}
},
{ {
field: 'amount', field: 'amount',

2
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java
View File

@ -47,6 +47,8 @@ public class OrderList extends BaseEntity
/** 总价 */ /** 总价 */
@Excel(name = "总价") @Excel(name = "总价")
private BigDecimal amount; private BigDecimal amount;
/** 优惠 */
private BigDecimal discount;
/** 创建时间 */ /** 创建时间 */

3
ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
View File

@ -154,6 +154,7 @@
t1.product_code, t1.product_code,
t2.product_name, t2.product_name,
t1.quantity, t1.quantity,
t1.discount,
t1.price, t1.price,
t1.amount, t1.amount,
t1.remark, t1.remark,
@ -279,6 +280,8 @@
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="item.quantity != null">quantity = #{item.quantity},</if> <if test="item.quantity != null">quantity = #{item.quantity},</if>
<if test="item.amount != null">amount = #{item.amount},</if> <if test="item.amount != null">amount = #{item.amount},</if>
<if test="item.discount != null and item.discount!=''">discount = #{item.discount},</if>
<if test="item.price != null and item.price!=''">price = #{item.price},</if>
<if test="item.remark != null">remark = #{item.remark},</if> <if test="item.remark != null">remark = #{item.remark},</if>
updated_at = NOW(), updated_at = NOW(),
</trim> </trim>