Browse Source

财务管理员列表数据bug修改
技术员结算奖新增修改

limin 7 years ago
parent
commit
3006de9ef9

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

@@ -856,7 +856,7 @@
 	from t_order_new o 
 	left join `user` u on o.buyer_id = u.id 
 	left join admin a on o.salesman_id = a.id 
-	where delete_sign = 0 and approval = 2 and finance_id is null 
+	where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
   	<if test='o.orderNo != null and o.orderNo != ""'>
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
   	</if>
@@ -918,7 +918,7 @@
 	from t_order_new o 
 	left join `user` u on o.buyer_id = u.id 
 	left join admin a on o.salesman_id = a.id 
-	where delete_sign = 0 and approval = 2 and finance_id is null 
+	where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
   	<if test='o.orderNo != null and o.orderNo != ""'>
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
   	</if>

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

@@ -208,6 +208,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				int c = bonusMapper.checkByOnoAndSub(bonus);
 				//不存在就设置
 				if(c==0){
+					bonus.setId(UUID.randomUUID().toString());
 					bonusMapper.insertSelective(bonus);
 				}