clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

证书+保险

This commit is contained in:
kuang.yife 2023-02-26 00:50:52 +08:00
parent 5162a34830
commit d0e377328d
4 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -804,8 +804,24 @@ public class OrderDetailController extends BaseController {
OrderDetail detailInfo = this.orderDetailService.selectById(orderDetail.getId());
// 删除子单
orderDetailService.deleteOrderDetailByIds(orderDetail.getId().toString());
FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(detailInfo.getId());
// 财务子单金额返还给主单
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(detailInfo.getOrderMasterId());
financialMaster.setServerMoney(financialMaster.getServerMoney().add(financialDetail.getPayMoney()));
financialMasterService.updateFinancialMaster(financialMaster);
// 删除子财务单
financialDetailService.deleteFinancialDetailByOrderDetailId(orderDetail.getId());
// 退回旧商品
// List<OrderGoods> goodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId());
// goodsList.forEach(orderGoods -> {
// List<OrderGoods> masterGoods = orderGoodsService.selectByOrderMasterId(detailInfo.getOrderMasterId());
// masterGoods.forEach(master->{
// if(master.getGoodsStandardId().equals(orderGoods.getGoodsStandardId())){
// master.setServerGoodsNum(master.getServerGoodsNum()-orderGoods.getGoodsNum());
// }
// orderGoodsService.updateOrderGoods(master);
// });
// });
// 删除派单记录
orderGoodsService.deleteByOrderDetailId(orderDetail.getId());
OrderMaster orderMaster2Update = new OrderMaster();

24
ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
View File

@ -137,6 +137,30 @@
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-6 control-label">是否需要证书：</label>
<div class="col-sm-6">
<select name="isCert" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:text="否" th:value="0"/>
<option th:text="是" th:value="1"/>
</select>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-6 control-label">是否需要保险：</label>
<div class="col-sm-6">
<select name="isSure" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:text="否" th:value="0"/>
<option th:text="是" th:value="1"/>
</select>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">热门类目图标：</label>
<div class="col-sm-8">

6
ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
View File

@ -71,4 +71,10 @@ public class DeptGoodsCategory extends GoodsCategory {
private String hotCategoryName;
// 是否需要保险 1.需要
private Integer isSure;
// 是否需要证书 1.需要
private Integer isCert;
}

8
ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
View File

@ -24,6 +24,8 @@
<result property="deptMoney" column="dept_money"/>
<result property="retainRate" column="retain_rate"/>
<result property="retainMoney" column="retain_money"/>
<result property="isSure" column="is_sure"/>
<result property="isCert" column="is_cert"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@ -32,7 +34,7 @@
</resultMap>
<sql id="selectDeptGoodsCategory">
SELECT dept_goods_category_id, dept_id, goods_category_id, category_sort, is_hot, cover, hot_name,
SELECT dept_goods_category_id, dept_id, goods_category_id, category_sort, is_hot, cover, hot_name, is_sure, is_cert,
one_rate, two_rate, three_rate, dept_rate, dept_money, retain_rate, retain_money, create_by, create_time, remark
FROM dept_goods_category
</sql>
@ -40,7 +42,7 @@
<sql id="selectJoin">
SELECT dgc.dept_goods_category_id, dgc.dept_id, dgc.goods_category_id, dgc.category_sort,
dgc.one_rate, dgc.two_rate, dgc.three_rate, dgc.create_by, dgc.create_time, dgc.remark,
dgc.is_hot, dgc.cover, dgc.hot_name, dgc.dept_rate, dgc.dept_money, dgc.retain_rate, dgc.retain_money,
dgc.is_hot, dgc.cover, dgc.hot_name, dgc.is_sure, dgc.is_cert, dgc.dept_rate, dgc.dept_money, dgc.retain_rate, dgc.retain_money,
dgc.dept_category_name, gc.goods_category_name, gc.level, gc.parent_category_id, gc.type, gc.status,
gc.simple_goods_category_name
FROM dept_goods_category dgc LEFT JOIN goods_category gc ON dgc.goods_category_id = gc.goods_category_id
@ -70,6 +72,8 @@
<if test="isHot != null">is_hot = #{isHot},</if>
<if test="cover != null and cover != ''">cover = #{cover},</if>
<if test="hotName != null">hot_name = #{hotName},</if>
<if test="isSure != null">is_sure = #{isSure},</if>
<if test="isCert != null">is_cert = #{isCert},</if>
<if test="deptRate != null and deptRate != ''">dept_rate = #{deptRate},</if>
<if test="deptMoney != null and deptMoney != ''">dept_money = #{deptMoney},</if>
<if test="retainRate != null and retainRate != ''">retain_rate = #{retainRate},</if>