接单接口

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

@@ -150,10 +150,28 @@ public class PensionOrderController {
     public Result<PensionOrderDTO> getOrderInfo(@ApiIgnore @LoginUser UserEntity user,
                                                 @PathVariable("id") Long id){
         PensionOrderDTO data = pensionOrderService.getOrderInfoByIdAndUserId(id, user.getId());
-
         return new Result<PensionOrderDTO>().ok(data);
     }
 
+    @Login
+    @PutMapping("takingOrder/{id}")
+    @ApiOperation("接单")
+    public Result takingOrder(@ApiIgnore @LoginUser UserEntity user,
+                              @PathVariable("id") Long id){
+        PensionOrderDTO pensionOrderDTO = pensionOrderService.getOrderInfoByIdAndStatus(id, 0);
+        Date recipientTime = new Date();
+        pensionOrderDTO.setOrderRecipientId(user.getId());
+        pensionOrderDTO.setOrderRecipientName(user.getUsername());
+        pensionOrderDTO.setOrderRecipientPhone(user.getMobile());
+        pensionOrderDTO.setOrderRecipientTime(recipientTime);
+        pensionOrderDTO.setUpdateDate(recipientTime);
+        pensionOrderDTO.setStatus(1); //TODO 后期添加到Constant或新建枚举类
+        pensionOrderDTO.setStatusName("已接单");
+        pensionOrderService.update(pensionOrderDTO);
+
+        return new Result();
+    }
+
     @GetMapping("{id}")
     @ApiOperation("信息")
     public Result<PensionOrderDTO> get(@PathVariable("id") Long id){
@@ -167,6 +185,15 @@ public class PensionOrderController {
     public Result save(@RequestBody PensionOrderDTO dto){
         //校验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        dto.setId(null);
+        dto.setOrderNum(null);
+        dto.setStatus(0);
+        dto.setStatusName("未接单");
+        dto.setOrderRecipientTime(null);
+        dto.setOrderRecipientPhone(null);
+        dto.setOrderRecipientName(null);
+        dto.setOrderRecipientId(null);
         //设置日期
         dto.setCreateDate(new Date());
         dto.setUpdateDate(new Date());

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dao/PensionOrderDao.java

@@ -24,4 +24,6 @@ public interface PensionOrderDao extends BaseDao<PensionOrderEntity> {
 
     PensionOrderEntity getOrderInfoByIdAndUserId(Long orderId, Long userId);
 
+    PensionOrderEntity getOrderInfoByIdAndStatus(Long orderId, Integer status);
+
 }
\ No newline at end of file

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

@@ -39,4 +39,7 @@ public interface PensionOrderService extends CrudService<PensionOrderEntity, Pen
     //查询预约订单详情
     PensionOrderDTO getOrderInfoByIdAndUserId(Long id, Long userId);
 
+    //根据订单Id和订单状态查询
+    PensionOrderDTO getOrderInfoByIdAndStatus(Long orderId, Integer status);
+
 }
\ No newline at end of file

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

@@ -97,14 +97,20 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
 
     @Override
     public PensionOrderDTO getOrderInfoByIdAndUserId(Long id, Long userId) {
-        PensionOrderEntity orderInfo = pensionOrderDao.getOrderInfoByIdAndUserId(id, userId);
-        orderInfo.setServiceId(null);
-        orderInfo.setOrderRecipientId(null);
-        orderInfo.setDeptId(null);
-        orderInfo.setCreator(null);
-        orderInfo.setUpdater(null);
-        orderInfo.setUpdateDate(null);
-        return ConvertUtils.sourceToTarget(orderInfo, PensionOrderDTO.class);
+        PensionOrderEntity orderEntity = pensionOrderDao.getOrderInfoByIdAndUserId(id, userId);
+        orderEntity.setServiceId(null);
+        orderEntity.setOrderRecipientId(null);
+        orderEntity.setDeptId(null);
+        orderEntity.setCreator(null);
+        orderEntity.setUpdater(null);
+        orderEntity.setUpdateDate(null);
+        return ConvertUtils.sourceToTarget(orderEntity, PensionOrderDTO.class);
+    }
+
+    @Override
+    public PensionOrderDTO getOrderInfoByIdAndStatus(Long id, Integer status) {
+        PensionOrderEntity orderEntity = pensionOrderDao.getOrderInfoByIdAndStatus(id, status);
+        return ConvertUtils.sourceToTarget(orderEntity, PensionOrderDTO.class);
     }
 
 }
\ No newline at end of file

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

@@ -48,4 +48,8 @@
         SELECT * FROM pension_order WHERE pension_order.id = #{orderId} and pension_order.order_recipient_id = #{userId}
     </select>
 
+    <select id="getOrderInfoByIdAndStatus" resultType="io.hmit.modules.serviceOrder.entity.PensionOrderEntity">
+        SELECT * FROM pension_order WHERE pension_order.id = #{orderId} and pension_order.status = #{status}
+    </select>
+
 </mapper>