Merge branch 'release-fix' into release

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/dataobject/customer/CustomerDO.java

@@ -356,12 +356,12 @@ public class CustomerDO extends BaseDO {
     /**
      * 默认付款，1-是，0-否
      */
-    private Boolean defaultPay ;
+    private Boolean defaultPay;
 
     /**
      * 控货无收货人,1-是，0-否
      */
-    private Boolean noConsignee ;
+    private Boolean noConsignee;
 
     @ApiModelProperty("延期申请次数")
     private int delayApprovalNum ;
@@ -504,6 +504,12 @@ public class CustomerDO extends BaseDO {
     @TableField(exist = false)
     private String customerServiceName;
 
+    /**
+     * 创建者名字
+     */
+    @TableField(exist = false)
+    private String createUsername;
+
 
     /**
      * 国家名称

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dto/CustomerPageReqDTO.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -35,8 +36,8 @@ public class CustomerPageReqDTO extends PageParam {
     @ApiModelProperty(value = "客户类别")
     private List<String> type;
 
-    @ApiModelProperty(value = "客户货运类型", notes = "参见customer_transport_type数据字典")
-    private String transportType;
+    @ApiModelProperty(value = "出货渠道", notes = "参见customer_transport_type数据字典")
+    private List<String> transportType;
 
     @ApiModelProperty(value = "客户资源类型", notes = "参见customer_resource_type数据字典")
     private List<Integer> resourceType;
@@ -51,8 +52,11 @@ public class CustomerPageReqDTO extends PageParam {
     @ApiModelProperty(value = "客户状态")
     private List<Integer> status;
 
+    // @ApiModelProperty(value = "部门")
+    // private String department;
+
     @ApiModelProperty(value = "部门")
-    private String department;
+    private List<Long> deptIds;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始创建时间")
@@ -100,4 +104,112 @@ public class CustomerPageReqDTO extends PageParam {
     private String memberMobile;
     @ApiModelProperty(value = "会员区号")
     private String memberAreaCode;
+
+
+
+
+    // 20240904 add start
+    @ApiModelProperty(value = "客户角色")
+    private List<String> role;
+
+
+    /**
+     * 业务国家 逗号分隔
+     */
+    @ApiModelProperty(value = "业务国家")
+    private List<Long> busiCountryIds;
+
+
+    @ApiModelProperty(value = "常用提货网点")
+    private List<Long> pickupPoints;
+
+
+    @ApiModelProperty(value = "创建人")
+    private Long founder;
+
+
+    // 开始入公海时间和结束入公海时间
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "开始入公海时间")
+    private Date beginEnterOpenSeaTime;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "结束入公海时间")
+    private Date endEnterOpenSeaTime;
+
+    @ApiModelProperty(value = "业绩类型（老客户：0 新客户：1）")
+    private Boolean isNew;
+
+
+    // 大于等于年度发货量
+    @ApiModelProperty(value = "大于等于年度发货量")
+    private BigDecimal geWeightYearly;
+    // 小于等于年度发货量
+    @ApiModelProperty(value = "小于等于年度发货量")
+    private BigDecimal leWeightYearly;
+    // 等于年度发货量
+    @ApiModelProperty(value = "等于年度发货量")
+    private BigDecimal eqWeightYearly;
+
+
+    // 大于等于年度发货次数
+    @ApiModelProperty(value = "大于等于年度发货次数")
+    private Integer geNumYearly;
+    // 小于等于年度发货次数
+    @ApiModelProperty(value = "小于等于年度发货次数")
+    private Integer leNumYearly;
+    // 等于年度发货次数
+    @ApiModelProperty(value = "等于年度发货次数")
+    private Integer eqNumYearly;
+
+
+    @ApiModelProperty(value = "主营商品类型")
+    private List<Long> productTypes;
+    @ApiModelProperty(value = "主营商品名称")
+    private List<Long> productIds;
+    @ApiModelProperty(value = "主要竞争对手")
+    private List<Long> competitorIds;
+
+
+    @ApiModelProperty(value = "推介人")
+    private Long promoter;
+
+    @ApiModelProperty(value = "到仓确认")
+    private Integer arrivalConfirm;
+
+    @ApiModelProperty(value = "控货无收货人,1-是，0-否")
+    private Boolean noConsignee;
+    @ApiModelProperty(value = "默认付款")
+    private Boolean defaultPay;
+    @ApiModelProperty(value = "是否显示提单价格")
+    private Boolean isShowTidanPrice;
+
+    //归属时间
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "开始归属时间")
+    private Date beginCustomerServiceConfirmedTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "结束归属时间")
+    private Date endCustomerServiceConfirmedTime;
+
+    // 首次成交时间
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "开始首次成交时间")
+    private Date beginFirstDealTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "结束首次成交时间")
+    private Date endFirstDealTime;
+
+
+    @ApiModelProperty(value = "获取方式")
+    private List<String> getMethods;
+    //创建入口
+    @ApiModelProperty(value = "创建入口")
+    private List<String> createFroms;
+    // 结算方式
+    @ApiModelProperty(value = "结算方式")
+    private List<String> balances;
+
+    // 20240904 add end
+
 }

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.http

@@ -41,7 +41,7 @@ Content-Type: application/json
 {"inquiry":null,"id":"38155","number":"SGP00004","name":"yh2345","nameEn":null,"level":1,"country":194,"type":"0,1","transportType":"1","agentId":null,"company":"","companyEn":null,"payerName":null,"address":null,"productType":null,"productId":null,"pickupPoint":null,"memberId":null,"birthday":null,"balance":null,"source":5,"picture":null,"customerService":null,"customerContacts":[{"customerId":38155,"department":"","position":"","name":"yh12345","nameEn":"","social":null,"socialNumber":"","email":"","isDefault":1,"userid":null,"username":null,"areaCode":"65","phoneNew":"66666666","createTime":1692929203000,"id":69056,"customerContactsId":69056,"customerName":null,"company":""}],"customerLines":[],"lightUnit":null,"promoter":null,"status":1,"founder":118,"department":null,"invoiceTitle":null,"licenseNumber":null,"bank":null,"bankNumber":null,"project":null,"billingAddress":null,"billingTell":null,"taxRate":0,"remarks":null,"arrivalConfirm":0,"weightUnit":null,"createTime":1692924735000,"isShowTidanPrice":true,"carName":null,"carNo":null,"customerBanks":[],"creditLevel":3,"vipLevelScore":1,"vipLevelNameZh":"普通","vipLevelNameEn":"common","creditLevelScore":400,"creditLevelNameZh":"信用良好","creditLevelNameEn":"good credit","customerServiceName":null,"consigneeFirstCustomerService":null,"isNew":true,"resourceType":1,"isInOpenSea":false,"enterOpenSeaTime":null,"estimateEnterOpenSeaTime":null,"catchTime":null,"promoterName":null,"enquiryInfo":null,"isCustomerServiceConfirmed":false,"isWebOrderConsigneeSync":false,"isPotential":false,"founderName":"yanghao","customerBankBackVOList":[],"countryNameZh":"新加坡","countryNameEn":"Singapore","productTypeNameZh":null,"productTypeNameEn":null,"productNameZh":null,"productNameEn":null,"pickupPointNameZh":null,"pickupPointNameEn":null}
 
 ### page
-GET {{baseUrl}}/ecw/customer/page?pageNo=1&pageSize=100&name=
+GET {{baseUrl}}/ecw/customer/page?pageNo=1&pageSize=10&customerService[0]=1144&customerService[1]=2659&beginEnterOpenSeaTime=2024-10-02%2000%3A00%3A00&endEnterOpenSeaTime=2024-10-05%2000%3A00%3A00
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderService.java

@@ -30,6 +30,8 @@ import java.util.List;
 public interface OrderService extends IService<OrderDO> {
 
     void updateOrderSalesmanId(Long orderId,Long salesman_id);
+
+
     /**
      * 创建订单
      *
@@ -379,4 +381,15 @@ public interface OrderService extends IService<OrderDO> {
 
 
     void updateOrderCustomerAndSalesmanId(Long customerId, Long salesmanId, Long orderId);
+
+
+
+    /**
+     * copy订单
+     *
+     * @param copyOrderId 复制的订单id
+     * @param memberUserDO 会员信息
+     * @return 编号
+     */
+    Long copyOrder(Long copyOrderId,MemberUserDO memberUserDO);
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -6201,4 +6201,24 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         orderMapper.updateOrderCustomerAndSalesmanId(customerId, salesmanId, orderId);
     }
 
+
+    @Override
+    public Long copyOrder(Long copyOrderId, MemberUserDO memberUserDO) {
+        OrderDO orderDO = orderMapper.selectById(copyOrderId);
+        // 发货人信息
+        OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
+        // 收货人信息
+        OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
+        // 控货信息
+        OrderCargoControlDO orderCargoControlDO = orderCargoControlMapper.selectOne(new LambdaQueryWrapper<OrderCargoControlDO>().eq(OrderCargoControlDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderCargoControlDO::getId).last("limit 1"));
+        // 始发地
+        OrderDepartureDO orderDepartureDO = orderDepartureService.getOne(new LambdaQueryWrapper<OrderDepartureDO>().eq(OrderDepartureDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderDepartureDO::getId).last("limit 1"));
+        // 目的地
+        OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getOne(new LambdaQueryWrapper<OrderObjectiveDO>().eq(OrderObjectiveDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderObjectiveDO::getId).last("limit 1"));
+        // 商品信息
+        List<OrderItemDO> itemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderItemDO::getOrderItemId));
+        // TODO 这里是否需要重新判断业绩归属
+        // TODO 如果是web端复制的，发货人不是当前登陆会员，是否要改为当前登陆的会员管理客户信息
+        return 0L;
+    }
 }