Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

商务单加上售中

Browse Source
This commit is contained in:
xiezhijun
2021-08-26 10:15:29 +08:00
parent 78465d9eca
commit 1c6bda9901
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
View File

@ -227,7 +227,6 @@ public class SysOrderServiceImpl implements ISysOrderService {
sysOrder.setMainOrderId(0L);
sysOrder.setAfterSaleCommissOrder(0);
sysOrder.setPreSaleId(null);
sysOrder.setOnSaleId(null);
sysOrder.setPushPreSaleId(null);
sysOrder.setPlannerId(null);
sysOrder.setPlannerAssisId(null);
@ -327,7 +326,6 @@ public class SysOrderServiceImpl implements ISysOrderService {
sysOrder.setMainOrderId(0L);
sysOrder.setAfterSaleCommissOrder(0);
sysOrder.setPreSaleId(null);
sysOrder.setOnSaleId(null);
sysOrder.setPushPreSaleId(null);
sysOrder.setPlannerId(null);
sysOrder.setPlannerAssisId(null);

2
stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
View File

@ -44,7 +44,7 @@
</if>
<!-- 因为体验单、售中单都存在售中，存在两种情况需要计算提成，1、售中单 2、售中自己开的体验单（通过售前是否为NULL或0判断，售前不为空则表示售前开的体验单，不计算售中提成） -->
<if test="postCode != null and postCode == 'on_sale_id'">
AND (order_type = 3 OR (order_type = 2 AND (pre_sale_id IS NULL || pre_sale_id = 0)))
AND (order_type = 3 OR order_type = 4 OR (order_type = 2 AND (pre_sale_id IS NULL || pre_sale_id = 0)))
</if>
GROUP BY ${column}
</sql>

2
stdiet-ui/src/utils/orderType.js
View File

@ -233,7 +233,7 @@ export function dealOrderModuleshowByOrderType(orderType, moduleshow, form){
form.operatorId = null;
form.operatorAssisId = null;
}
moduleshow.onSaleShow = true;
moduleshow.preSaleShow = false;
moduleshow.plannerShow = false;
moduleshow.plannerAssisShow = false;