|  | @@ -356,11 +356,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 | 
											
												
													
														|  |          //发送延迟消息
 |  |          //发送延迟消息
 | 
											
												
													
														|  |          cancelOrderSender.sendMessage(orderId, delayTimes);
 |  |          cancelOrderSender.sendMessage(orderId, delayTimes);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +    @Autowired
 | 
											
												
													
														|  | 
 |  | +    private  OmsOrderOperateHistoryMapper omsOrderOperateHistoryMapper;
 | 
											
												
													
														|  |      @Override
 |  |      @Override
 | 
											
												
													
														|  |      public void confirmReceiveOrder(Long orderId) {
 |  |      public void confirmReceiveOrder(Long orderId) {
 | 
											
												
													
														|  |          // redis 用户信息
 |  |          // redis 用户信息
 | 
											
												
													
														|  | -        UmsMember member = memberUtil.getRedisUmsMember(request);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        UmsMember member = memberService.getCurrentMember();
 | 
											
												
													
														|  |          OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
 |  |          OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
 | 
											
												
													
														|  |          if (!member.getId().equals(order.getMemberId())) {
 |  |          if (!member.getId().equals(order.getMemberId())) {
 | 
											
												
													
														|  |              Asserts.fail("不能确认他人订单!");
 |  |              Asserts.fail("不能确认他人订单!");
 | 
											
										
											
												
													
														|  | @@ -372,6 +373,13 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 | 
											
												
													
														|  |          order.setConfirmStatus(1);
 |  |          order.setConfirmStatus(1);
 | 
											
												
													
														|  |          order.setReceiveTime(new Date());
 |  |          order.setReceiveTime(new Date());
 | 
											
												
													
														|  |          orderMapper.updateByPrimaryKey(order);
 |  |          orderMapper.updateByPrimaryKey(order);
 | 
											
												
													
														|  | 
 |  | +        OmsOrderOperateHistory record=new OmsOrderOperateHistory();
 | 
											
												
													
														|  | 
 |  | +        record.setCreateTime(new Date());
 | 
											
												
													
														|  | 
 |  | +        record.setOrderId(orderId);
 | 
											
												
													
														|  | 
 |  | +        record.setOperateMan(member.getNickname());
 | 
											
												
													
														|  | 
 |  | +        record.setOrderStatus(4);
 | 
											
												
													
														|  | 
 |  | +        record.setNote("确认收货!");
 | 
											
												
													
														|  | 
 |  | +        omsOrderOperateHistoryMapper.insertSelective(record);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      @Override
 |  |      @Override
 |