Browse Source

营销管理员跳过审核BUG修复

anderx 2 years ago
parent
commit
9a1fb45edd

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -955,7 +955,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
     select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,
            o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
-           d.finance_id  financeId,d.approval approvalStatus,d.approval_aid,ad.name approvalName
+           d.finance_id  financeId,d.approval approvalStatus,d.approval_aid approvalAid,ad.name approvalName
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
     left join department d on o.order_dep=d.id left join admin e on a.manager_id=e.id
     left join admin ad on d.approval_aid=ad.id

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -547,7 +547,9 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		StringBuffer str= new StringBuffer();
 		boolean flag= false;
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+		//如果订单是特批
 		if (new1.getApproval()==ApprovalNewState.TPDSH.getCode()|| new1.getApproval()==ApprovalNewState.TPBH.getCode()) {
+			//未设置跳过
 			if (order.getApprovalStatus()==0){
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				t.setApproval(ApprovalNewState.TPTG.getCode());