删除版本号

ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClueMiddle.java

@@ -6,8 +6,10 @@ import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -74,7 +76,6 @@ public class BaseClueMiddle implements Serializable {
     private String remark;
 
     @ApiModelProperty(value = "版本号")
-    @NotNull(message = "版本号不能为空")
     @Column(name = "optimistic_version")
     private Integer optimisticVersion;
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java

@@ -76,11 +76,6 @@ public class CompanyServiceImpl implements CompanyService {
         BeanUtil.copyProperties(companyDto, byUserId);
         byUserId.setApplicationTime(DateUtil.date());
         byUserId.setCompanyCode(byUserId.getCompanyName().trim());
-        byUserId.setRollCallFee(DoubleType.ZERO);
-        byUserId.setTalkCallFee(DoubleType.ZERO);
-        byUserId.setDoubleCallFee(DoubleType.ZERO);
-        byUserId.setTiktokCallFee(DoubleType.ZERO);
-        byUserId.setDeliveryCallFee(DoubleType.ZERO);
         userRepository.updateStatusById(Boolean.FALSE, SecurityUtils.getCurrentUserId());
         return companyMapper.toDto(companyRepository.save(byUserId));
     }

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -378,7 +378,9 @@ public class ClueServiceImpl implements ClueService {
         if (clueMiddle.getTurnoverAmount() != null) {
             clueMiddleOne.setTurnoverAmount(clueMiddle.getTurnoverAmount());
         }
-        clueMiddleOne.setOptimisticVersion(clueMiddle.getOptimisticVersion() + 1);
+        if (clueMiddle.getOptimisticVersion() != null) {
+            clueMiddleOne.setOptimisticVersion(clueMiddle.getOptimisticVersion() + 1);
+        }
         clueMiddleRepository.save(clueMiddleOne);
 
     }