需求95 报价单页面和列表调整

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java

@@ -275,6 +275,7 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "user.name AS customer_name,",
             "user.enter_open_sea_time,",
             "user.estimate_enter_open_sea_time,",
+            "user.id as customerId,",
             "(select count(1) from ecw_customer_followup l where l.offer_id = o.offer_id) as log_count, ",
             "(SELECT su.nickname FROM system_user as su WHERE su.id = o.creator AND su.deleted = 0 ) as creator_name,",
             // 跟进客户经理

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferRespVO.java

@@ -97,6 +97,9 @@ public class OfferRespVO extends OfferBaseVO {
     @ApiModelProperty(value = "客户名称")
     private String customerName;
 
+    @ApiModelProperty(value = "客户")
+    private Long customerId;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "进入公海时间")
     private Date enterOpenSeaTime;

yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java

@@ -203,8 +203,8 @@ public class OfferController {
                      BigDecimal volume= new BigDecimal(0);
                      BigDecimal weight=new BigDecimal(0);
                     for (OfferProdDO offerProdDO : offerProdDOList) {
-                        volume = volume.add(offerProdDO.getVolume());
-                        weight = weight.add(offerProdDO.getWeight());
+                        volume = volume.add(offerProdDO.getVolume()==null?new BigDecimal(0):offerProdDO.getVolume());
+                        weight = weight.add(offerProdDO.getWeight()==null?new BigDecimal(0):offerProdDO.getWeight());
                         if (offerProdDO.getSpecialPriceType()){
                             respVO.setSpecialPriceType(offerProdDO.getSpecialPriceType());
                         }