1.订单表添加 服务内容描述 content 字段

2.服务人员订单完成接口 完成

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java

@@ -70,6 +70,12 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "接单人电话")
 	private String orderRecipientPhone;
 
+	@ApiModelProperty(value = "服务内容描述")
+	private String content;
+
+	@ApiModelProperty(value = "实际金额")
+	private String actPrice;
+
 	@ApiModelProperty(value = "部门ID")
 	private Long deptId;
 

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java

@@ -91,6 +91,14 @@ public class PensionOrderEntity extends BaseEntity {
      * 接单人电话
      */
 	private String orderRecipientPhone;
+	/**
+	 * 服务内容描述
+	 */
+	private String content;
+	/**
+	 * 实际金额
+	 */
+	private String actPrice;
     /**
      * 部门ID
      */

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

@@ -203,6 +203,23 @@ public class PensionOrderController {
         return new Result<PageData<PensionOrderDTO>>().ok(page);
     }
 
+    /**
+     * 服务人员完成订单接口
+     */
+    @Login
+    @GetMapping("staffFinishedOrder")
+    @ApiOperation(value = "服务人员完成订单接口(服务人员)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "订单ID", paramType = "query", required = true, dataType="long") ,
+            @ApiImplicitParam(name = "content", value = "描述服务内容", paramType = "query", required = true, dataType="String") ,
+            @ApiImplicitParam(name = "location", value = "经纬定位", paramType = "query", required = true, dataType="String")
+    })
+    public Result staffFinishedOrder(@ApiIgnore @LoginUser UserEntity user,
+                                                   @ApiIgnore @RequestParam Map<String, Object> params){
+        pensionOrderService.staffFinishedOrder(params, user.getId());
+        return new Result();
+    }
+
     /**
      * 机构订单接口
      */
@@ -217,7 +234,7 @@ public class PensionOrderController {
             @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
     })
     public Result<PageData<PensionOrderDTO>> organization(@ApiIgnore @LoginUser UserEntity user,
-                                                   @ApiIgnore @RequestParam Map<String, Object> params){
+                                                          @ApiIgnore @RequestParam Map<String, Object> params){
         //登录->查询登录人员所属机构ID->机构ID查询服务ID（List）->服务ID + 状态查询订单（List）
         PageData<PensionOrderDTO> page = pensionOrderService.getOrganizationOrder(params, user.getId());
         return new Result<PageData<PensionOrderDTO>>().ok(page);

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java

 package io.hmit.modules.serviceOrder.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.hmit.common.constant.Constant;
 import io.hmit.entity.UserEntity;
 import io.swagger.annotations.ApiModel;
@@ -73,6 +74,10 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "接单人电话")
 	private String orderRecipientPhone;
 
+	@ApiModelProperty(value = "服务内容描述")
+	private String content;
+
+	@JsonIgnore
 	@ApiModelProperty(value = "实际金额")
 	private String actPrice;
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java

@@ -83,6 +83,10 @@ public class PensionOrderEntity extends BaseEntity {
      * 接单人电话
      */
 	private String orderRecipientPhone;
+	/**
+	 * 服务内容描述
+	 */
+	private String content;
 	/**
 	 * 实际金额
 	 */

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

@@ -54,4 +54,6 @@ public interface PensionOrderService extends CrudService<PensionOrderEntity, Pen
     //老人、子女取消订单
     Boolean elderFamilyCancel(Long id, String reason);
 
+    //服务人员完结订单
+    void staffFinishedOrder(Map<String, Object> params, Long userId);
 }

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

@@ -214,6 +214,19 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
         return false;
     }
 
+    @Override
+    public void staffFinishedOrder(Map<String, Object> params, Long userId) {
+        Long orderId = Long.parseLong(params.get("id").toString());
+        String location = params.get("location").toString();
+        String content = params.get("content").toString();
+        PensionOrderEntity pensionOrderEntity = pensionOrderDao.selectById(orderId);
+        pensionOrderEntity.setStatus(4);
+        pensionOrderEntity.setStatusName(Constant.OrderStatus.WAIT_EVALUATE.getMessage());
+        pensionOrderEntity.setContent(content);
+        pensionOrderEntity.setLocation(location);
+        update(ConvertUtils.sourceToTarget(pensionOrderEntity, PensionOrderDTO.class));
+    }
+
     //对List进行手动分页
     private List<PensionOrderDTO> getSubList(Map<String, Object> params, List<PensionOrderDTO> list){
         Integer pageNum = Integer.parseInt(params.get("page").toString());

hmit-api/src/main/resources/mapper/serviceOrder/PensionOrderDao.xml

@@ -35,7 +35,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date
         FROM pension_order po
         WHERE po.id = #{orderId} AND po.status = #{status}
@@ -45,7 +45,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -71,7 +71,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -88,7 +88,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -99,7 +99,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -110,7 +110,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps
@@ -124,7 +124,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps, tb_user tu
@@ -135,7 +135,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
                po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
                po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+               po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
                po.creator, po.creator_name, po.creator_tel, po.create_date,
                ps.icon
         FROM pension_order po, pension_service ps, tb_user tu
@@ -147,7 +147,7 @@
         SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
         po.appointment_person, po.appointment_phone, po.appointment_time, po.remark, po.location,
         po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
-        po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
+        po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason, content,
         po.creator, po.creator_name, po.creator_tel, po.create_date,
         ps.icon
         FROM pension_order po, pension_service ps