提成优化部分

biz-base/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://localhost:1230/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
     password: Dypg@1996
     initialSize: 10 #初始化连接数
@@ -22,11 +22,10 @@ dfs:
   path: /opt/dfs
   domain: /dfs
 
+
 #系统配置
 system:
   login:
     error-limit:
       lock-time: 30  #登录错误达到限制次数账号锁定时间（单位：分钟），默认30分钟
 
-
-

biz-base/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 server:
-  port: 8088
+  port: 8089
 
 spring:
   datasource:
-    url: jdbc:mysql://localhost:1230/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://47.108.172.52:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
     password: Dypg@1996
     initialSize: 10 #初始化连接数
@@ -19,8 +19,8 @@ spring:
 
 
 dfs:
-  path: /opt/dfs
-  domain: /dfs
+  path: /opt/test
+  domain: /test
 
 
 #系统配置

biz-base/src/test/java/BrokerageTest.java

@@ -1,116 +1,116 @@
-import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dayou.BaseApplication;
-import com.dayou.bo.LeaderRatioBO;
-import com.dayou.configuration.AsyncManager;
-import com.dayou.dto.ItemDTO;
-import com.dayou.entity.BrokerageMarketerRatio;
-import com.dayou.entity.Customer;
-import com.dayou.entity.ItemBrokerageGeneral;
-import com.dayou.service.*;
-import com.dayou.service.impl.ItemBrokerageSequenceServiceImpl;
-import com.google.common.cache.Cache;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Lists;
-import com.zaxxer.hikari.HikariDataSource;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-/**
- * 类说明：
- *
- * @author: wucl
- * @since: 2023/3/6
- * created with IntelliJ IDEA.
- */
-@Slf4j
-@SpringBootTest(classes = BaseApplication.class)
-@RunWith(SpringJUnit4ClassRunner.class)
-public class BrokerageTest {
-
-    @Autowired
-    private LoadingCache<String,BigDecimal> marketerRatioCache;
-
-    @Autowired
-    private LoadingCache<Long,BigDecimal> baseAmountsCache;
-
-    @Autowired
-    private LoadingCache<String,BigDecimal> globalConfigCache;
-
-    @Autowired
-    private ICustomerService customerService;
-
-    @Autowired
-    private IItemBrokerageSequenceService itemBrokerageSequenceService;
-
-    private HikariDataSource hikariDataSource;
-
-
-
-
-    @Test
-    public void testBrokerageCache() throws ExecutionException {
-        System.out.println(marketerRatioCache.size());
-        BigDecimal ifPresent = marketerRatioCache.get("2&3");
-        System.out.println(marketerRatioCache.size());
-    }
-
-    public static void main(String ages []) {
-//        itemBrokerageSequenceService.doNonMarketerAheadSettle();
-//        itemBrokerageSequenceService.doAbleItemBrokerageSettle();
-
-        HikariDataSource hikariDataSource = initDataSource();
-
-        for (int i =0 ;i<100000;i++){
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    StringBuffer sb = new StringBuffer("insert into customer (name) values");
-                    Thread threadName = Thread.currentThread();
-                    System.out.println(threadName +"线程开始执行...");
-                    long start = System.currentTimeMillis();
-                    for (int j =0;j<100;j++){
-                        if (j!=99){
-                            sb.append("('"+Thread.currentThread().getName()+"["+j+"]'),");
-                        }else {
-                            sb.append("('"+Thread.currentThread().getName()+"["+j+"]')");
-                        }
-
-                    }
-                    JdbcTemplate jdbcTemplate = new JdbcTemplate(hikariDataSource);
-                    jdbcTemplate.execute(sb.toString());
-                    long end = System.currentTimeMillis();
-                    System.out.println(threadName +"现成执行完毕,耗时：" + (end-start)+"毫秒");
-                }
-            }).start();
-        }
-        System.out.println("主线程退出...");
-    }
-
-    public static HikariDataSource initDataSource(){
-        HikariDataSource hikariDataSource = new HikariDataSource();
-        hikariDataSource.setConnectionTimeout(600000);
-        hikariDataSource.setMinimumIdle(100);
-        hikariDataSource.setMaximumPoolSize(100000);
-        hikariDataSource.setValidationTimeout(5000);
-        hikariDataSource.setIdleTimeout(300000);
-        hikariDataSource.setLeakDetectionThreshold(500000);
-        hikariDataSource.setJdbcUrl("jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true");
-        hikariDataSource.setUsername("root");
-        hikariDataSource.setPassword("914851221");
-        return hikariDataSource;
-    }
-
-}
+//import cn.hutool.core.lang.Assert;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.dayou.BaseApplication;
+//import com.dayou.bo.LeaderRatioBO;
+//import com.dayou.configuration.AsyncManager;
+//import com.dayou.dto.ItemDTO;
+//import com.dayou.entity.BrokerageMarketerRatio;
+//import com.dayou.entity.Customer;
+//import com.dayou.entity.ItemBrokerageGeneral;
+//import com.dayou.service.*;
+//import com.dayou.service.impl.ItemBrokerageSequenceServiceImpl;
+//import com.google.common.cache.Cache;
+//import com.google.common.cache.LoadingCache;
+//import com.google.common.collect.Lists;
+//import com.zaxxer.hikari.HikariDataSource;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.context.ApplicationContext;
+//import org.springframework.jdbc.core.JdbcTemplate;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//import java.math.BigDecimal;
+//import java.util.List;
+//import java.util.Set;
+//import java.util.concurrent.ExecutionException;
+//
+///**
+// * 类说明：
+// *
+// * @author: wucl
+// * @since: 2023/3/6
+// * created with IntelliJ IDEA.
+// */
+//@Slf4j
+//@SpringBootTest(classes = BaseApplication.class)
+//@RunWith(SpringJUnit4ClassRunner.class)
+//public class BrokerageTest {
+//
+//    @Autowired
+//    private LoadingCache<String,BigDecimal> marketerRatioCache;
+//
+//    @Autowired
+//    private LoadingCache<Long,BigDecimal> baseAmountsCache;
+//
+//    @Autowired
+//    private LoadingCache<String,BigDecimal> globalConfigCache;
+//
+//    @Autowired
+//    private ICustomerService customerService;
+//
+//    @Autowired
+//    private IItemBrokerageSequenceService itemBrokerageSequenceService;
+//
+//    private HikariDataSource hikariDataSource;
+//
+//
+//
+//
+//    @Test
+//    public void testBrokerageCache() throws ExecutionException {
+//        System.out.println(marketerRatioCache.size());
+//        BigDecimal ifPresent = marketerRatioCache.get("2&3");
+//        System.out.println(marketerRatioCache.size());
+//    }
+//
+//    public static void main(String ages []) {
+////        itemBrokerageSequenceService.doNonMarketerAheadSettle();
+////        itemBrokerageSequenceService.doAbleItemBrokerageSettle();
+//
+//        HikariDataSource hikariDataSource = initDataSource();
+//
+//        for (int i =0 ;i<100000;i++){
+//            new Thread(new Runnable() {
+//                @Override
+//                public void run() {
+//                    StringBuffer sb = new StringBuffer("insert into customer (name) values");
+//                    Thread threadName = Thread.currentThread();
+//                    System.out.println(threadName +"线程开始执行...");
+//                    long start = System.currentTimeMillis();
+//                    for (int j =0;j<100;j++){
+//                        if (j!=99){
+//                            sb.append("('"+Thread.currentThread().getName()+"["+j+"]'),");
+//                        }else {
+//                            sb.append("('"+Thread.currentThread().getName()+"["+j+"]')");
+//                        }
+//
+//                    }
+//                    JdbcTemplate jdbcTemplate = new JdbcTemplate(hikariDataSource);
+//                    jdbcTemplate.execute(sb.toString());
+//                    long end = System.currentTimeMillis();
+//                    System.out.println(threadName +"现成执行完毕,耗时：" + (end-start)+"毫秒");
+//                }
+//            }).start();
+//        }
+//        System.out.println("主线程退出...");
+//    }
+//
+//    public static HikariDataSource initDataSource(){
+//        HikariDataSource hikariDataSource = new HikariDataSource();
+//        hikariDataSource.setConnectionTimeout(600000);
+//        hikariDataSource.setMinimumIdle(100);
+//        hikariDataSource.setMaximumPoolSize(100000);
+//        hikariDataSource.setValidationTimeout(5000);
+//        hikariDataSource.setIdleTimeout(300000);
+//        hikariDataSource.setLeakDetectionThreshold(500000);
+//        hikariDataSource.setJdbcUrl("jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true");
+//        hikariDataSource.setUsername("root");
+//        hikariDataSource.setPassword("914851221");
+//        return hikariDataSource;
+//    }
+//
+//}

dao/src/main/resources/mapper/ItemMapper.xml

@@ -129,7 +129,7 @@
         <if test="item!=null and item.businessNo!=null and item.businessNo!='' ">
             and i.business_no like concat (#{item.businessNo},'%')
         </if>
-        <if test="item!=null and item.isCurYear!=null ">
+        <if test="item!=null and item.isCurYear!=null and item.isCurYear==true">
             AND i.sign_date &gt;= concat( YEAR ( now())- 1, '-12-23' )
             AND i.sign_date &lt;= concat( YEAR ( now()), '-12-22' )
         </if>

service/src/main/java/com/dayou/service/impl/PaymentCollectionServiceImpl.java

@@ -74,6 +74,9 @@ public class PaymentCollectionServiceImpl extends ServiceImpl<PaymentCollectionM
     @Override
     public Boolean add(PaymentCollection paymentCollection){
         BigDecimal totalAmount = iItemService.getById(paymentCollection.getItemId()).getAmount();
+        if (totalAmount==null){
+            ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"抱歉！该项目合同金额未填写，请先完善合同金额再操作。");
+        }
         List<Double> doneAmount = this.list(new LambdaQueryWrapper<PaymentCollection>()
                 .select(PaymentCollection::getAmount)
                 .eq(PaymentCollection::getItemId, paymentCollection.getItemId())