|
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
|
-import com.goafanti.common.model.TOrderAssist;
|
|
|
|
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.*;
|
|
import com.goafanti.order.bo.*;
|
|
|
import com.goafanti.order.service.OrderAssistService;
|
|
import com.goafanti.order.service.OrderAssistService;
|
|
@@ -26,9 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
import com.goafanti.common.bo.Result;
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
-import com.goafanti.common.model.TOrderNewWithBLOBs;
|
|
|
|
|
-import com.goafanti.common.model.TOrderRefundWithBLOBs;
|
|
|
|
|
-import com.goafanti.common.model.TOrderTask;
|
|
|
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.order.enums.ApprovalNewState;
|
|
import com.goafanti.order.enums.ApprovalNewState;
|
|
|
import com.goafanti.order.enums.OrderNewState;
|
|
import com.goafanti.order.enums.OrderNewState;
|
|
@@ -645,52 +642,84 @@ public class AdminNewOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,ErrorConstants.PARAM_BEING_ERROR,"协单人员"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,ErrorConstants.PARAM_BEING_ERROR,"协单人员"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- if (i==-2){
|
|
|
|
|
- res.getError().add(buildError("订单派单完成后不可修改"));
|
|
|
|
|
- return res;
|
|
|
|
|
- }
|
|
|
|
|
return res.data(orderAssistService.addAssist(in));
|
|
return res.data(orderAssistService.addAssist(in));
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
|
- * 新增协单人员
|
|
|
|
|
- * @param in
|
|
|
|
|
|
|
+ * 删除订单协单人员
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/deleteAssist",method = RequestMethod.POST)
|
|
@RequestMapping(value = "/deleteAssist",method = RequestMethod.POST)
|
|
|
- public Result deleteAssist(TOrderAssist in){
|
|
|
|
|
|
|
+ public Result deleteAssist(Integer id){
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
- if (in.getAid()==null){
|
|
|
|
|
|
|
+ if (id==null){
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"协单人"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"协单人"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- if (in.getOrderNo()==null){
|
|
|
|
|
|
|
+ return res.data(orderAssistService.deleteAssist(id));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 协单人员列表
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @RequestMapping(value = "/assistList",method = RequestMethod.GET)
|
|
|
|
|
+ public Result assistList(String orderNo){
|
|
|
|
|
+ Result res = new Result();
|
|
|
|
|
+ if (orderNo==null){
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- int i=orderAssistService.addAssistCheck(in);
|
|
|
|
|
- if (i==-1){
|
|
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,ErrorConstants.PARAM_BEING_ERROR,"协单人员"));
|
|
|
|
|
|
|
+ return res.data(orderAssistService.assistList(orderNo));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 新增订单上门服务
|
|
|
|
|
+ * @param in
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @RequestMapping(value = "/addOrderService",method = RequestMethod.POST)
|
|
|
|
|
+ public Result addOrderService(TOrderServiceBo in){
|
|
|
|
|
+ Result res = new Result();
|
|
|
|
|
+ if (in.getServiceTimes()==null){
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"服务时间"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- if (i==-2){
|
|
|
|
|
- res.getError().add(buildError("订单派单完成后不可修改"));
|
|
|
|
|
|
|
+ if (in.getOrderNo()==null){
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- return res.data(orderAssistService.addAssist(in));
|
|
|
|
|
|
|
+ return res.data(orderAssistService.addOrderService(in));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 协单人员列表
|
|
|
|
|
|
|
+ * 新增订单上门服务
|
|
|
|
|
+ * @param id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @RequestMapping(value = "/assistList",method = RequestMethod.GET)
|
|
|
|
|
- public Result assistList(String orderNo){
|
|
|
|
|
|
|
+ @RequestMapping(value = "/deleteOrderService",method = RequestMethod.POST)
|
|
|
|
|
+ public Result deleteOrderService(Integer id){
|
|
|
|
|
+ Result res = new Result();
|
|
|
|
|
+ if (id==null){
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"服务编号"));
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return res.data(orderAssistService.deleteOrderService(id));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 订单上门服务列表
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @RequestMapping(value = "/orderServiceList",method = RequestMethod.GET)
|
|
|
|
|
+ public Result orderServiceList(String orderNo){
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (orderNo==null){
|
|
if (orderNo==null){
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
- return res.data(orderAssistService.assistList(orderNo));
|
|
|
|
|
|
|
+ return res.data(orderAssistService.orderServiceList(orderNo));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|