1.机构处理添加取消原因

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderController.java

@@ -324,11 +324,12 @@ public class PensionOrderController {
      */
     @Login
     @GetMapping("organizationHandle")
-    @ApiOperation(value = "机构处理(机构)", notes = "传参为1（派单）时，recipient_id必传")
+    @ApiOperation(value = "机构处理(机构)", notes = "传参为1（派单）时，recipient_id必传；传参为3（取消）时，cancel_reason必传；")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "订单ID", paramType = "query", required = true, dataType="long") ,
             @ApiImplicitParam(name = "status", value = "处理状态： 5接单 1派单 3取消", paramType = "query", required = true, dataType="int") ,
-            @ApiImplicitParam(name = "recipient_id", value = "接单服务人员ID", paramType = "query", dataType="long")
+            @ApiImplicitParam(name = "recipient_id", value = "接单服务人员ID", paramType = "query", dataType="long") ,
+            @ApiImplicitParam(name = "cancel_reason", value = "订单取消原因", paramType = "query", dataType="String")
     })
     public Result organizationHandle(@ApiIgnore @LoginUser UserEntity user,
                                      @ApiIgnore @RequestParam Map<String, Object> params){

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java

@@ -192,6 +192,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
             if (pensionOrderEntity.getStatus() != 2 && pensionOrderEntity.getStatus() != 4) {
                 pensionOrderEntity.setStatus(3);
                 pensionOrderEntity.setStatusName(Constant.OrderStatus.CANCEL.getMessage());
+                pensionOrderEntity.setCancelReason(params.get("cancel_reason").toString());
                 update(ConvertUtils.sourceToTarget(pensionOrderEntity, PensionOrderDTO.class));
             } else {
                 return false;