xc-mall.git - Gitblit

			@@ -309,7 +309,7 @@
			// return new FebsResponse().fail().message("订单不存在");
			}
			Integer status = mallOrderInfo.getStatus();
			if(OrderStatusEnum.WAIT_FINISH.getValue() != status){
			if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
			continue;
			// return new FebsResponse().fail().message("订单不是待确认到货状态");
			}
			@@ -319,11 +319,7 @@
			OrderStateDto orderStateDto = new OrderStateDto();
			orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
			orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
			if(2 == mallOrderInfo.getIsHome()){
			orderStateDto.setOrderState("已送达自提点");
			}else{
			orderStateDto.setOrderState("已送达自提点");
			}
			orderStateDto.setOrderState("已送达自提点");
			String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
			MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
			orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());

			@@ -138,7 +138,7 @@
			// return new FebsResponse().fail().message("订单不存在");
			}
			Integer status = mallOrderInfo.getStatus();
			if(OrderStatusEnum.WAIT_FINISH.getValue() != status){
			if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
			continue;
			// return new FebsResponse().fail().message("订单不是待确认到货状态");
			}
			@@ -148,11 +148,7 @@
			OrderStateDto orderStateDto = new OrderStateDto();
			orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
			orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
			if(2 == mallOrderInfo.getIsHome()){
			orderStateDto.setOrderState("已送达自提点");
			}else{
			orderStateDto.setOrderState("已送达自提点");
			}
			orderStateDto.setOrderState("已送达自提点");
			String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
			MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
			orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());

	src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java	8 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java	8 ●●●●● patch \| view \| raw \| blame \| history