Commit d9e48f75 by 徐康

增加是否买券订单字段

parent 7e5bea14
...@@ -534,5 +534,10 @@ public class QueryOrderResponseVo { ...@@ -534,5 +534,10 @@ public class QueryOrderResponseVo {
*/ */
private PayGiftCheckAndJoinResponseDto payGiftReps; private PayGiftCheckAndJoinResponseDto payGiftReps;
/**
* 是否买券订单 麦咖啡使用
*/
private Integer isCouponOrder;
} }
...@@ -91,6 +91,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.PayItem; ...@@ -91,6 +91,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType; import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType; import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType; import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq; import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq; import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
...@@ -1580,6 +1581,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1580,6 +1581,10 @@ public class OrderServiceImpl implements Orderservice {
queryOrderResponseVo.setOrderTypeDesc(Optional.ofNullable(McCafeOrderTypeGather.getByCode(queryOrderResponseVo.getOrderType())) queryOrderResponseVo.setOrderTypeDesc(Optional.ofNullable(McCafeOrderTypeGather.getByCode(queryOrderResponseVo.getOrderType()))
.map(McCafeOrderTypeGather::getDesc).orElse("")); .map(McCafeOrderTypeGather::getDesc).orElse(""));
queryOrderResponseVo.setIsCouponOrder(queryOrderResponseVo.getProducts().stream()
.filter(o -> !ProductTypeEnum.VIRTUAL_PRODUCT.getCode().equals(o.getProductType())
&& !ProductTypeEnum.WITH_ORDER_VIRTUAL_PRODUCT.getCode().equals(o.getProductType())).findAny().isPresent()?0:1);
//48小时自动退款描述 //48小时自动退款描述
if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig() != null if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig() != null
&& queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) { && queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
......
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