|
|
@ -6,13 +6,10 @@ import com.dxhy.base.common.constant.OrderManagementConstant; |
|
|
|
import com.dxhy.base.common.model.OrderInfo; |
|
|
|
import com.dxhy.base.common.model.OrderInfo; |
|
|
|
import com.dxhy.base.common.model.R; |
|
|
|
import com.dxhy.base.common.model.R; |
|
|
|
import com.dxhy.base.common.utils.DecimalCalculateUtil; |
|
|
|
import com.dxhy.base.common.utils.DecimalCalculateUtil; |
|
|
|
import com.dxhy.base.service.module.buyer.model.BuyerEntity; |
|
|
|
|
|
|
|
import com.dxhy.base.service.module.buyer.service.BuyerService; |
|
|
|
|
|
|
|
import com.dxhy.base.service.module.thirdservice.simsback.model.TaxEquipmentInfo; |
|
|
|
import com.dxhy.base.service.module.thirdservice.simsback.model.TaxEquipmentInfo; |
|
|
|
import com.dxhy.base.service.module.thirdservice.simsback.service.SimsBackService; |
|
|
|
import com.dxhy.base.service.module.thirdservice.simsback.service.SimsBackService; |
|
|
|
import com.dxhy.base.service.module.thirdservice.user.model.DeptEntity; |
|
|
|
import com.dxhy.base.service.module.thirdservice.user.model.DeptEntity; |
|
|
|
import com.dxhy.base.service.module.thirdservice.user.service.UserInfoService; |
|
|
|
import com.dxhy.base.service.module.thirdservice.user.service.UserInfoService; |
|
|
|
import com.dxhy.base.service.openapi.protocol.qd.PageGfxxReq; |
|
|
|
|
|
|
|
import com.dxhy.base.thirdservice.module.base.service.BaseService; |
|
|
|
import com.dxhy.base.thirdservice.module.base.service.BaseService; |
|
|
|
import com.dxhy.base.thirdservice.module.thirdservice.redis.service.RedissonService; |
|
|
|
import com.dxhy.base.thirdservice.module.thirdservice.redis.service.RedissonService; |
|
|
|
import com.dxhy.management.common.constant.ConfigureConstant; |
|
|
|
import com.dxhy.management.common.constant.ConfigureConstant; |
|
|
@ -29,7 +26,6 @@ import com.dxhy.order.consumer.modules.bespoke.config.FildConfig; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.req.FileModel; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.req.FileModel; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo; |
|
|
|
|
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.yy.InvoiceBpmmap; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.yy.InvoiceBpmmap; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.yy.NewTable; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.yy.NewTable; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo; |
|
|
|
import com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo; |
|
|
@ -50,6 +46,7 @@ import org.redisson.api.RLock; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.math.RoundingMode; |
|
|
@ -81,8 +78,6 @@ public class YyOrderServiceImpl implements OrderService { |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private AllocateInvoiceInterfaceServiceV3 allocateInvoiceInterfaceServiceImplV3; |
|
|
|
private AllocateInvoiceInterfaceServiceV3 allocateInvoiceInterfaceServiceImplV3; |
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
|
|
|
private BuyerService buyerService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private SimsBackService simsBackService; |
|
|
|
private SimsBackService simsBackService; |
|
|
@ -185,8 +180,8 @@ public class YyOrderServiceImpl implements OrderService { |
|
|
|
try { |
|
|
|
try { |
|
|
|
if (locked){ |
|
|
|
if (locked){ |
|
|
|
List<YyOrderItemInfo> yyOrderItemInfoList = yyOrderItemInfoMapper.queryOrderItemInfo(yyOrderInfo.getId()); |
|
|
|
List<YyOrderItemInfo> yyOrderItemInfoList = yyOrderItemInfoMapper.queryOrderItemInfo(yyOrderInfo.getId()); |
|
|
|
boolean fpresent = yyOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringLessZero(item.getIsum())).findFirst().isPresent(); |
|
|
|
boolean fpresent = yyOrderItemInfoList.stream().anyMatch(item->DecimalCalculateUtil.stringLessZero(item.getIsum())); |
|
|
|
boolean zpresent = yyOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringMoreZero(item.getIsum())).findFirst().isPresent(); |
|
|
|
boolean zpresent = yyOrderItemInfoList.stream().anyMatch(item->DecimalCalculateUtil.stringMoreZero(item.getIsum())); |
|
|
|
if (fpresent && zpresent && yyOrderItemInfoList.size() > ConfigureConstant.INT_2){ |
|
|
|
if (fpresent && zpresent && yyOrderItemInfoList.size() > ConfigureConstant.INT_2){ |
|
|
|
backMessage.add(String.format(message, yyOrderInfo.getCdlcode(), "负数行订单明细不能超过两行")); |
|
|
|
backMessage.add(String.format(message, yyOrderInfo.getCdlcode(), "负数行订单明细不能超过两行")); |
|
|
|
continue; |
|
|
|
continue; |
|
|
|