Browse Source

Merge remote-tracking branch 'origin/test'

limin 7 years ago
parent
commit
9ca334418e

+ 11 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -238,5 +238,15 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.data(orderNewService.addOrderRefund(t));
 			return res;
 	}
-	
+	/**
+	 * 审批特批订单
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value = "/approvalOrder",method = RequestMethod.GET)
+	public Result approvalOrder(String orderNo,Integer confirm,String reason){
+		Result res = new Result();
+		orderNewService.updateApprovalOrder(orderNo,confirm,reason);
+		return res;
+	}
 }

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

@@ -113,6 +113,13 @@ public interface OrderNewService {
 	 * @return
 	 */
 	int addOrderRefund(TOrderRefundWithBLOBs t);
+	/**
+	 * 特批审核
+	 * @param orderNo
+	 * @param confirm
+	 * @return
+	 */
+	int updateApprovalOrder(String orderNo,Integer confirm,String reason);
 	
 
 	

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

@@ -297,5 +297,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setResult("");
 		return tOrderRefundMapper.insertSelective(t);
 	}
+
+
+
+	@Override
+	public int updateApprovalOrder(String orderNo,Integer confirm,String reason) {
+		TOrderNew t=new TOrderNew();
+		t.setOrderNo(orderNo);
+		if (confirm==2) {
+			t.setApproval(2);
+			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+		} else {
+			t.setApproval(3);
+			
+		}
+		return 1;
+	}
 	
 }