Browse Source

合同列表修改、新增变更详情的变更id与员订单编号列表

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

+ 4 - 0
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -6,6 +6,8 @@ import com.goafanti.order.bo.NewOrderChangeBo;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface NewOrderChangeMapper {
@@ -88,4 +90,6 @@ public interface NewOrderChangeMapper {
 	void subtractRefundInvoice(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount);
 
 	NewOrderChangeBo selectByorderNoAndStatus(String orderNo);
+
+	List<Map<String, String>> getOrderChange(String orderNo);
 }

+ 9 - 4
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -690,11 +690,12 @@ select
 	where status != 4 and order_no= #{orderNo}
   </select>
   <select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
-  select a.id,a.order_no orderNo,b.contract_no contractNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType, 
+	select a.id,a.order_no orderNo,b.contract_no contractNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType, 
   date_format(b.create_time,'%Y-%m-%d %H:%i:%S')establishTimes, b.order_status orderStatus,b.total_amount totalAmount,a.status ,
   b.settlement_amount settlementAmount,(b.total_amount-b.settlement_amount) arrears,d.name salesmanName,e.name depName,a.`type`,
-  a.process_state processState from new_order_change a left join t_order_new b on a.order_no=b.order_no 
-  left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id 
+  a.process_state processState from (select max(id)id from new_order_change group by order_no) noc left join  new_order_change a on noc.id=a.id
+  left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id 
+  left join department e on b.order_dep=e.id
 	<if test="processState==2 or processState==3 "> 
 	left join (select order_no,consultant_id,manager_id from t_order_task group by order_no,consultant_id,manager_id) x on a.order_no=x.order_no
 	</if> 
@@ -784,7 +785,8 @@ select
   </select>
   
   <select id="selectOrderChangeCount" resultType="java.lang.Integer">
-  select count(*) from new_order_change a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
+  select count(*) from (select max(id)id from new_order_change group by order_no) noc left join  new_order_change a on noc.id=a.id
+  left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
   left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
 	<if test="processState==2 or processState==3 "> 
 	left join t_order_task x on a.order_no=x.order_no
@@ -879,4 +881,7 @@ select
 	set `refund_Invoice`=ifnull(`refund_Invoice`,0)- #{amount}
 	where order_no= #{orderNo}
 	</update>
+	<select id="getOrderChange" resultType="java.util.Map">
+	select id,used_order usedOrder from new_order_change where  order_no= #{orderNo} order by id
+	</select>
 </mapper>

+ 14 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -302,6 +302,20 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.data(orderChangeService.addOrderRefundInvoice(o));
 		return res;
 	}
+	
+	/**
+	 *  新增回收发票
+	 */
+	@RequestMapping(value ="/getOrderChange",method = RequestMethod.GET)
+	public Result getOrderChange(String  orderNo) {
+		Result res =new Result();
+		if (StringUtils.isBlank(orderNo)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单编号", "订单编号"));
+			return res;
+		}
+		res.data(orderChangeService.getOrderChange(orderNo));
+		return res;
+	}
 	/**
 	 *  删除回收发票
 	 */

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

@@ -71,5 +71,7 @@ public interface OrderChangeService {
 
 	List<TOrderNewBo> orderChangeUsed(String orderNo);
 
+	List<Map<String, String>> getOrderChange(String orderNo);
+
 
 }

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

@@ -772,6 +772,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}
 				return list;
 			}
+
+			@Override
+			public List<Map<String, String>> getOrderChange(String orderNo) {
+				List<Map<String, String>> list=new ArrayList<>();
+				list =newOrderChangeMapper.getOrderChange(orderNo);
+				return list;
+			}
 		
 
 }