Browse Source

订单变更新增按变更id查看详情

anderx 6 years ago
parent
commit
9b9f554e92

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

@@ -79,4 +79,6 @@ public interface NewOrderChangeMapper {
 	NewOrderChangeBo selectByorderNo(String orderNo);
 
 	int checkOderNo(String orderNo);
+
+	NewOrderChangeBo selectById(Integer id);
 }

+ 12 - 3
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -596,14 +596,23 @@ from new_order_change a  where 1=1
 	order by a.create_time desc
 	limit 1
   </select>
+  
+  <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
+  select a.id,a.order_no orderNo,a.process_state processState,a.status,a.`type`,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes, a.remarks,
+a.voucher_url voucherUrl,a.total_amount totalAmount,a.settlement_amount settlementAmount,a.change_amount changeAmount,a.applicant,a.dep_name depName, 
+a.project_state projectState,a.zxs_cost zxsCost, a.zxs_remarks zxsRemarks,date_format(a.payment_time,'%Y-%m-%d')paymentTimes,
+a.payment_amount paymentAmount,date_format(a. invoice_time,'%Y-%m-%d') invoiceTimes,a.invoice_amount invoiceAmount,a.invoice_type invoiceType,
+a.cw_cost cwCost,a.refundable_amount refundableAmount,a.cw_remarks cwRemarks
+from new_order_change a  where 1=1 and a.id= #{id}
+  </select>
   <select id="checkOderNo" resultType="java.lang.Integer">
   select count(*) from new_order_change
 	where status != 4 and order_no= #{orderNo}
   </select>
   <select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
-  	select a.order_no orderNo, 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, 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,
-  b.settlement_amount settlementAmount,(b.total_amount-b.settlement_amount) arrears,d.name salesmanName,e.name depName,
+  b.settlement_amount settlementAmount,(b.total_amount-b.settlement_amount) arrears,d.name salesmanName,e.name depName,a.`type` 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 
 	<if test="processState==2 or processState==3 "> 
@@ -621,7 +630,7 @@ from new_order_change a  where 1=1
   	</foreach>
 	</if>
 	<if test="processState==2 or processState==3 ">
-	and f.aid=#{aid}
+	and f.aid=#{aid}  and process_state &gt;= 2
 	</if>
 	<if test="processState==5">
 	and b.finance_id =#{aid}

+ 14 - 0
src/main/java/com/goafanti/order/bo/NewOderCahngeListBo.java

@@ -1,11 +1,13 @@
 package com.goafanti.order.bo;
 
 public class NewOderCahngeListBo {
+	private Integer id;
 	private String orderNo;
 	private String createTimes;
 	private String nickname;
 	private Integer orderType;
 	private String establishTimes;
+	private Integer type;
 	private Integer orderStatus;
 	private String totalAmount;
 	private String settlementAmount;
@@ -85,6 +87,18 @@ public class NewOderCahngeListBo {
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
 	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 	
 	
 }

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

@@ -42,7 +42,7 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 *    变更详情
+	 *    订单查看变更详情
 	 */
 	@RequestMapping(value = "/orderChangeDetails", method = RequestMethod.GET)
 	public Result orderChangeDetails(String orderNo){
@@ -55,6 +55,19 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	/**
+	 *    id查看变更详情
+	 */
+	@RequestMapping(value = "/orderChangeDetailsById", method = RequestMethod.GET)
+	public Result orderChangeDetailsById(Integer id){
+		Result res = new Result();
+		if(null==id){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单变更编号"));
+			return res;
+		}
+		res.setData(orderChangeService.orderChangeDetailsById( id));
+		return res;
+	}
+	/**
 	 * 变更修改
 	 */
 	@RequestMapping(value = "/updateOrderChange", method = RequestMethod.POST)

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

@@ -23,6 +23,8 @@ public interface OrderChangeService {
 
 	int updateOrderChange(NewOrderChangeBo t, Integer changeType);
 
+	NewOrderChangeBo orderChangeDetailsById(Integer id);
+
 
 
 }

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

@@ -131,7 +131,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if(t.getDeleteSign()==3)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
+		if(t.getDeleteSign()==2)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		return t;
 	}
 

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

@@ -80,6 +80,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return nb;
 	}
 	@Override
+	public NewOrderChangeBo orderChangeDetailsById(Integer id) {
+		NewOrderChangeBo nb=newOrderChangeMapper.selectById(id);
+		return nb;
+	}
+	@Override
 	public int pushOrderChangeAudit(String orderNo, String remarks, Integer status,Integer processState) {
 		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
 		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
@@ -158,13 +163,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		TOrderNew additionalOrder =new TOrderNew();
 		String additionalOrderNo;
 		orderNew.setOrderNo(nb.getOrderNo());
-		orderNew.setDeleteSign(4);//设置为变更中
+		orderNew.setDeleteSign(3);//设置为变更中
 		orderNew.setPrimaryOrder(newOrderNo);
 		if (nb.getType()==4||nb.getType()==5) {//重报或者赠送
 			additionalOrderNo=idGenerator.generateId().toString();
 			orderNew.setAdditionalOrder(additionalOrderNo);
 			additionalOrder.setOrderNo(additionalOrderNo);
 			additionalOrder.setCreater(TokenManager.getAdminId());
+			additionalOrder.setSalesmanId(t1.getSalesmanId());
 			additionalOrder.setOrderType(t1.getOrderType());
 			additionalOrder.setBuyerId(t1.getBuyerId());	
 			tOrderNewMapper.insertSelective(additionalOrder);

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

@@ -756,7 +756,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if(t.getDeleteSign()==3)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
+		if(t.getDeleteSign()==2)throw new BusinessException(new Error( "订单变更锁定中","订单变更锁定中"));
 		return t;
 	}