放开总号股东大盘的分红限制

docker-compose.yml

@@ -169,6 +169,37 @@ services:
     networks:
       - kxs_cloud_network
 
+#  kxs-rocket:
+#    image: xuchengen/rocketmq:5.1.3
+#    hostname: kxs-rocket
+#    container_name: kxs-rocket
+#    ports:
+#      - 8081:8081
+#      - 8080:8080
+#      - 9876:9876
+#      - 10909:10909
+#      - 10911:10911
+#      - 10912:10912
+#    environment:
+#      # nameserver最小堆内存，默认1024m
+#      - NAMESRV_XMS=256m
+#      # nameserver最大堆内存，默认1024m
+#      - NAMESRV_XMX=256m
+#      # nameserver年轻代内存，默认256m
+#      - NAMESRV_XMN=256m
+#      # broker最小堆内存，默认1024m
+#      - BROKER_XMS=256m
+#      # broker最大堆内存，默认1024m
+#      - BROKER_XMX=256m
+#      # broker年轻代内存，默认256m
+#      - BROKER_XMN=256m
+#      # broker堆外内存，默认1024m
+#      - BROKER_MDM=256m
+#      # 控制台nameserver地址，默认localhost:9876
+#      - NAMESRV_ADDR=192.168.101.250:9876
+#    restart: on-failure
+#    networks:
+#      - kxs_cloud_network
   kxs-rocket:
     image: apache/rocketmq:5.1.0
     hostname: kxs-rocket
@@ -187,6 +218,7 @@ services:
     hostname: kxs-rocket-broker
     container_name: kxs-rocket-broker
     ports:
+      - 8080:8081
       - 8081:8081
       - 10909:10909
       - 10911:10911
@@ -196,7 +228,7 @@ services:
     volumes:
       - ./data/broker/store:/home/rocketmq/store
       - ./kxs-visual/kxs-rocket/broker/broker.conf:/home/rocketmq/conf/broker.conf
-    command: sh mqbroker -n kxs-rocket:9876 -c /home/rocketmq/conf/broker.conf
+    command: sh mqbroker -n kxs-rocket:9876 -c /home/rocketmq/conf/broker.conf  --enable-proxy
     restart: on-failure
     networks:
       - kxs_cloud_network

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserTradeServiceImpl.java

@@ -93,7 +93,7 @@ public class KxsUserTradeServiceImpl extends ServiceImpl<KxsUserTradeMapper, Kxs
                     shdTradeAmtVO.setPosAmt(kxsUserTrade.getPosAmt());
                     baseMapper.insertTempShdTableData(tempTableName, shdTradeAmtVO);
                 }else{
-                    shdTradeAmtVO.setPosAmt(shdTradeAmtVO.getPosAmt());
+                    shdTradeAmtVO.setPosAmt(kxsUserTrade.getPosAmt());
                     baseMapper.updateTempShdTableData(tempTableName, shdTradeAmtVO);
                 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsShdScoreServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -92,8 +93,8 @@ public class KxsShdScoreServiceImpl extends ServiceImpl<KxsShdScoreMapper, KxsSh
             }
             //获取上级用户
             KxsUser kxsUser = kxsUserMapper.getParenUser(integralStatDTO.getUserId());
-            String exclude = "605,608,15600";
-            if(kxsUser == null || exclude.contains(kxsUser.getId().toString())){
+            List<Integer> exclude = Arrays.asList(605,608,15600);
+            if(kxsUser == null || exclude.contains(kxsUser.getId())){
                 continue;
             }
             //查询记录