Merge branch 'master-fix' into dev

yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/OrderAssociationOfferInfoEvent.java

+package cn.iocoder.yudao.framework.apollo.core.event;
+
+import cn.iocoder.yudao.framework.common.validation.Marks;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class OrderAssociationOfferInfoEvent {
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    @ApiModelProperty(value = "主键ID", required = true)
+    private Long offerId;
+
+
+
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java

@@ -592,6 +592,23 @@ public class OrderBackVO {
     private Boolean isChargeCustomer;
 
 
+    @ApiModelProperty(value = "客户业绩类型：1 新客户业绩 0老客户业绩")
+    private Integer yejiType;
+
+    /*
+     业绩产生时间
+     */
+    private Date yejiCreateDate;
+
+    /*
+     海运根据体积计算出的V值，空运根据重量计算出的V值
+
+     */
+    private BigDecimal calVValue;
+
+    @ApiModelProperty(value = "是否有收货人，1-是，0-否")
+    private Boolean hasConsignee = true;
+
     public void setExternalWarehouseJson(String externalWarehouseJson) {
         this.externalWarehouseJson = externalWarehouseJson;
         if (StringUtils.isNotBlank(externalWarehouseJson)) {

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/listener/OrderAssociationOfferListener.java

@@ -3,11 +3,14 @@ package cn.iocoder.yudao.module.sale.listener;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.apollo.core.event.OrderAssociationOfferCostEvent;
+import cn.iocoder.yudao.framework.apollo.core.event.OrderAssociationOfferInfoEvent;
 import cn.iocoder.yudao.module.product.dto.FeeDto;
 import cn.iocoder.yudao.module.product.enums.FeeTypeEnum;
 import cn.iocoder.yudao.module.sale.service.offer.OfferService;
 import cn.iocoder.yudao.module.sale.vo.offer.EstCostVO;
+import cn.iocoder.yudao.module.sale.vo.offer.OfferRespVO;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
@@ -53,4 +56,17 @@ public class OrderAssociationOfferListener {
             }
         }
     }
+
+    /**
+     * 根据订单id查询关联报价单信息
+     *
+     * @param event 参数与返回值
+     */
+    @EventListener(OrderAssociationOfferInfoEvent.class)
+    public void selectOfferInfoByOrderId(OrderAssociationOfferInfoEvent event) {
+        OfferRespVO offerRespVO = offerService.getOfferByOrderId(event.getOrderId());
+        if (Objects.nonNull(offerRespVO)) {
+            event.setOfferId(offerRespVO.getOfferId());
+        }
+    }
 }