Browse Source

修改

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
3eb628c9d3

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

@@ -492,7 +492,7 @@
   
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeDunOut">
 	select a.id,a.order_no orderNo,ifnull(a.tid,c.tid)tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
-  	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,a.ctid,
+  	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,a.ctid,a.did,
   	  ifnull(b.commodity_name,c.commodity_name) commodityName,a.money,a.status, a.appropriation_ratio appropriationRatio
   	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
     	where a.cid= #{id} order by a.id

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

@@ -600,7 +600,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				nd.setMoney(cd.getMoney());
 				newOrderDunMapper.updateByPrimaryKeySelective(nd);
 			}else if(cd.getType()==3) {
-				newOrderDunMapper.deleteByPrimaryKey(cd.getTid());
+				newOrderDunMapper.deleteByPrimaryKey(cd.getDid());
 			}
 		}