diff --git a/yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java b/yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java index 5f0bb887c5a423630170f6106ab965107890245e..13371446f45654333b4325b1ee11fa26a0fbf317 100644 --- a/yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java +++ b/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,", // 跟进客户ç»ç† diff --git a/yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferRespVO.java b/yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferRespVO.java index e7619338142ab49ac29df6401a4b20037ec1d877..0f7284ac2c7db41e5604fff194889689adb1765b 100644 --- a/yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferRespVO.java +++ b/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; diff --git a/yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java b/yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java index bbe46bd7dd87b39e5c2c13706e231bf6ad018f43..b943ccc1d56c1a0ddb32ab73ca0575751309f700 100644 --- a/yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java +++ b/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()); }