Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						b82f29335a
					
				| 
						 | 
					@ -2,6 +2,7 @@ package com.bonus.material.order.service.impl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.bonus.common.biz.enums.MaStatusEnum;
 | 
					import com.bonus.common.biz.enums.MaStatusEnum;
 | 
				
			||||||
import com.bonus.common.biz.enums.OrderStatusEnum;
 | 
					import com.bonus.common.biz.enums.OrderStatusEnum;
 | 
				
			||||||
 | 
					import com.bonus.common.core.utils.encryption.Sm4Utils;
 | 
				
			||||||
import com.bonus.common.security.utils.SecurityUtils;
 | 
					import com.bonus.common.security.utils.SecurityUtils;
 | 
				
			||||||
import com.bonus.material.device.domain.DevInfo;
 | 
					import com.bonus.material.device.domain.DevInfo;
 | 
				
			||||||
import com.bonus.material.lease.mapper.LeaseRepairRecordMapper;
 | 
					import com.bonus.material.lease.mapper.LeaseRepairRecordMapper;
 | 
				
			||||||
| 
						 | 
					@ -94,6 +95,7 @@ public class OrderServiceImpl implements OrderService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        List<OrderInfoDto> orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto);
 | 
					        List<OrderInfoDto> orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto);
 | 
				
			||||||
        for (OrderInfoDto dto : orderInfoDtos) {
 | 
					        for (OrderInfoDto dto : orderInfoDtos) {
 | 
				
			||||||
 | 
					            dto.setPhoneNumber(Sm4Utils.decrypt(dto.getPhoneNumber()));
 | 
				
			||||||
            List<OrderDetailDto> list = new ArrayList();
 | 
					            List<OrderDetailDto> list = new ArrayList();
 | 
				
			||||||
            String ids = dto.getIds();
 | 
					            String ids = dto.getIds();
 | 
				
			||||||
            for (String id : ids.split(",")) {
 | 
					            for (String id : ids.split(",")) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue