Skip to content

O
order-group
Commit 7bdf35be by 姜海波
Options

增加超时配置

parent 0538d644
Showing with 2 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -82,6 +82,7 @@ import java.util.function.Function; ...@@ -82,6 +82,7 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND; import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
import static cn.freemud.enums.BusinessTypeEnum.SAAS_DELIVERY;
@Component @Component
public class OrderAdapter { public class OrderAdapter {
...@@ -134,7 +135,7 @@ public class OrderAdapter { ...@@ -134,7 +135,7 @@ public class OrderAdapter {
ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>(); ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
long deliveryAmount = 0; long deliveryAmount = 0;
long discountDeliveryAmount = 0; long discountDeliveryAmount = 0;
if (StringUtils.isNotEmpty(createOrderVo.getMenuType())&&deliveryInfoDto != null) { if (createOrderVo.getMenuType().equals(SAAS_DELIVERY.getCode())&&deliveryInfoDto != null) {
deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount(); deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount(); discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){ if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment