|
|
@ -10,6 +10,7 @@ import com.dxhy.base.constant.TaxSeparateConfig; |
|
|
|
import com.dxhy.base.utils.PriceTaxSeparationUtilNew; |
|
|
|
import com.dxhy.base.utils.PriceTaxSeparationUtilNew; |
|
|
|
import com.dxhy.common.generatepdf.util.EwmUtil; |
|
|
|
import com.dxhy.common.generatepdf.util.EwmUtil; |
|
|
|
import com.dxhy.order.baseservice.config.BaseServiceConfig; |
|
|
|
import com.dxhy.order.baseservice.config.BaseServiceConfig; |
|
|
|
|
|
|
|
import com.dxhy.order.baseservice.module.buyer.dao.BuyerMapper; |
|
|
|
import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; |
|
|
|
import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; |
|
|
|
import com.dxhy.order.baseservice.module.buyer.service.BuyerService; |
|
|
|
import com.dxhy.order.baseservice.module.buyer.service.BuyerService; |
|
|
|
import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; |
|
|
|
import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; |
|
|
@ -60,6 +61,7 @@ import com.dxhy.order.model.qdsk.taxpayerinfo.Qdjcxx; |
|
|
|
import com.dxhy.order.utils.*; |
|
|
|
import com.dxhy.order.utils.*; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
@ -174,6 +176,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private GsClientMapper gsClientMapper; |
|
|
|
private GsClientMapper gsClientMapper; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
private BuyerMapper buyerMapper; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public PageUtils selectOrderInfo(Map<String, Object> map, List<String> shList, List<String> entList) { |
|
|
|
public PageUtils selectOrderInfo(Map<String, Object> map, List<String> shList, List<String> entList) { |
|
|
|
return orderProcessService.selectOrderInfo(map, shList, entList); |
|
|
|
return orderProcessService.selectOrderInfo(map, shList, entList); |
|
|
@ -252,6 +257,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
|
|
|
|
|
|
|
oderDetailInfo = this.convertOderDetailInfo(orderProcessInfo, orderItemList, orderInfo, pageOrderExts, orderInvoiceInfo); |
|
|
|
oderDetailInfo = this.convertOderDetailInfo(orderProcessInfo, orderItemList, orderInfo, pageOrderExts, orderInvoiceInfo); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId()); |
|
|
|
|
|
|
|
if (buyerEntity == null) { |
|
|
|
|
|
|
|
log.error("{}查询原始订单客户信息为空,id为:{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId()); |
|
|
|
|
|
|
|
return null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
oderDetailInfo.setCheckBankFlag(buyerEntity.getCheckBankFlag()); |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 如果是机动车,返回机动车信息 |
|
|
|
* 如果是机动车,返回机动车信息 |
|
|
|