Przeglądaj źródła

退单退款,退单不退款,未设置审核不跳入退票BUG修复

anderx 2 lat temu
rodzic
commit
308d156206

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

@@ -1031,7 +1031,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
     <if test="specially == 3">
-  	  and dep.approval_aid= #{aid,jdbcType=VARCHAR}
+  	<if test="manageType ==0">
+      and dep.approval_aid= #{aid,jdbcType=VARCHAR}
+    </if>
       and  a.order_status=2
       <if test="approval ==0">
         and a.process_status in(4)
@@ -1205,7 +1207,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
      <if test="specially == 3">
-       and dep.approval_aid= #{aid,jdbcType=VARCHAR}
+       <if test="manageType ==0">
+         and dep.approval_aid= #{aid,jdbcType=VARCHAR}
+       </if>
        and  a.order_status=2
        <if test="approval ==0">
          and a.process_status in(4)

+ 1 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -936,9 +936,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		if (in.getSpecially()==3){
 			params.put("aid", TokenManager.getAdminId());
-			if (TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
-				params.put("manageType",0);
-			}else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+			if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
 				params.put("manageType",1);
 			}else  {
 				params.put("manageType",0);