优化

snowy-admin-web/src/views/biz/bizsaleorder/index.vue

@@ -58,8 +58,8 @@
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSaleOrderEdit') && record.saleStatus == '1'">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizSaleOrderEdit', 'bizSaleOrderDelete'], 'and') && record.saleStatus == '1'" />
-						<a-button style="color:red" type="link" danger size="small" v-if="hasPerm('bizSaleOrderDelete')" @click="deleteConfig(record)">删除</a-button>
+						<a-divider type="vertical" v-if="hasPerm(['bizSaleOrderEdit', 'bizSaleOrderDelete'], 'and') && (record.saleStatus == '1' || record.saleStatus == '3')" />
+						<a-button style="color:red" type="link" danger size="small" v-if="hasPerm('bizSaleOrderDelete') && (record.saleStatus == '1' || record.saleStatus == '3')" @click="deleteConfig(record)">删除</a-button>
 					</a-space>
 				</template>
 				<template v-if="column.dataIndex === 'saleOrderType'">

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/impl/BizOrderServiceImpl.java

@@ -357,6 +357,13 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
             if(result.compareTo(new BigDecimal(20)) <= 0){
                 //大于80%不需要审核
                 bizOrder.setOrderStatus("7");
+
+                //销售订单结束
+                BizSaleOrder bizSaleOrder = bizSaleOrderService.getById(bizOrder.getSaleOrderInfo());
+                if(ObjectUtil.isNotNull(bizSaleOrder)){
+                    bizSaleOrder.setSaleStatus("3");
+                    bizSaleOrderService.updateById(bizSaleOrder);
+                }
             }else{
                 bizOrder.setOrderStatus("5");
             }
@@ -377,6 +384,13 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
                 bizOrder.setOrderReason(bizOrderEditParam.getOrderReason());
             }else{
                 bizOrder.setOrderStatus("7");
+
+                //销售订单结束
+                BizSaleOrder bizSaleOrder = bizSaleOrderService.getById(bizOrder.getSaleOrderInfo());
+                if(ObjectUtil.isNotNull(bizSaleOrder)){
+                    bizSaleOrder.setSaleStatus("3");
+                    bizSaleOrderService.updateById(bizSaleOrder);
+                }
             }
             this.updateById(bizOrder);
         }