feat: 导入公司对接数据开发

service-base/src/main/java/com/simuwang/base/mapper/daq/DistributionMapper.java

@@ -36,7 +36,7 @@ public interface DistributionMapper {
 
     List<DistributionDO> getDistributionByFundId(@Param("channelId")Integer channelId,@Param("fundId")String fundId,@Param("distributeType") Integer distributeType);
 
-    BigDecimal getSumDistributeByFundId(@Param("fundId")String fundId,@Param("distributeDate") String distributeDate);
+    BigDecimal getSumDistributeByFundId(@Param("channelId")Integer channelId,@Param("fundId")String fundId,@Param("distributeDate") String distributeDate);
 
     Long countDistributionTotal();
 }

service-base/src/main/java/com/simuwang/base/pojo/dos/DistributionTablePageDO.java

@@ -29,7 +29,7 @@ public class DistributionTablePageDO{
     /**
      * 渠道名称
      */
-    private Integer channelName;
+    private String channelName;
     /**
      * 基金id
      */

service-base/src/main/java/com/simuwang/base/pojo/vo/DistributionTablePageVO.java

@@ -27,7 +27,7 @@ public class DistributionTablePageVO {
     /**
      * 渠道名称
      */
-    private Integer channelName;
+    private String channelName;
     /**
      * 基金id
      */

service-base/src/main/resources/mapper/daq/DistributionMapper.xml

@@ -4,6 +4,7 @@
     <resultMap id="BaseMap" type="com.simuwang.base.pojo.dos.DistributionDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>
+        <result column="channel_id" property="channelId"/>
         <result column="distribute_date" property="distributeDate"/>
         <result column="distribute_type" property="distributeType"/>
         <result column="distribution" property="distribution"/>
@@ -31,10 +32,10 @@
         <result column="updaterid" property="updaterId"/>
         <result column="updatetime" property="updateTime"/>
         <result column="channel_id" property="channelId"/>
-        <result column="channelName" property="channelName"/>
+        <result column="channel_name" property="channelName"/>
     </resultMap>
     <insert id="saveDistribution" parameterType="com.simuwang.base.pojo.dos.DistributionDO">
-        insert into distribution(fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid,channle_id)
+        insert into distribution(fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid,channel_id)
         values (#{fundId},#{distributeDate},#{distributeType},#{distribution},#{isvalid},#{creatorId},#{createTime},#{updateTime},#{updaterId},#{channelId})
     </insert>
     <update id="updateDistributionById" parameterType="com.simuwang.base.pojo.dos.DistributionDO">
@@ -49,7 +50,7 @@
     </delete>
     <select id="searchDistributionList" resultMap="BasePageMap"
             parameterType="com.simuwang.base.pojo.dto.query.DistributionPageQuery">
-        SELECT DISTINCT
+        SELECT
             d.id,
             d.fund_id,
             info.fund_name,
@@ -93,7 +94,7 @@
             and d.distribute_date >= #{startDate}
         </if>
         <if test="channelName != null and channelName !=''">
-            and ci.channelName = #{channelName}
+            and ci.channel_name = #{channelName}
         </if>
         <if test="endDate != null and endDate !=''">
             and d.distribute_date <![CDATA[ <= ]]> #{endDate}
@@ -133,7 +134,7 @@
             and d.distribute_type = #{distributeType}
         </if>
         <if test="channelName != null and channelName !=''">
-            and ci.channelName = #{channelName}
+            and ci.channel_name = #{channelName}
         </if>
         <if test="startDate != null and startDate !=''">
             and d.distribute_date >= #{startDate}
@@ -156,17 +157,9 @@
         from distribution where isvalid =1 and fund_id=#{fundId} and distribute_type=#{distributeType} and channel_id=#{channelId}
     </select>
     <select id="getSumDistributeByFundId" resultType="java.math.BigDecimal" parameterType="java.lang.String">
-        select sum(distribution) from distribution where isvalid =1 and fund_id=#{fundId} and distribute_date <![CDATA[ <= ]]> #{distributeDate}
+        select sum(distribution) from distribution where isvalid =1 and fund_id=#{fundId} and distribute_date <![CDATA[ <= ]]> #{distributeDate} and channel_id=#{channelId}
     </select>
     <select id="countDistributionTotal" resultType="java.lang.Long">
         select count(1) from distribution where isvalid =1
     </select>
-    <select id="selectDistributeListByTime" resultMap="BaseMap">
-        select id,fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid
-        from distribution where updatetime <![CDATA[ <= ]]> #{endDate}
-        <if test="startDate != null and startDate !=''">
-            and updatetime >= #{startDate}
-        </if>
-        order by updatetime desc
-    </select>
 </mapper>

service-manage/src/main/java/com/simuwang/manage/service/impl/DeletionServiceImpl.java

@@ -211,7 +211,7 @@ public class DeletionServiceImpl implements DeletionService {
         for(int navIdx=0;navIdx < navDOList.size() ;navIdx++){
             NavDO navDO = navDOList.get(navIdx);
             //获取当前净值日期下的分红总和
-            BigDecimal sumDistribute = distributionMapper.getSumDistributeByFundId(navDO.getFundId(),DateUtils.format(navDO.getPriceDate(),DateUtils.YYYY_MM_DD));
+            BigDecimal sumDistribute = distributionMapper.getSumDistributeByFundId(channelId,navDO.getFundId(),DateUtils.format(navDO.getPriceDate(),DateUtils.YYYY_MM_DD));
             BigDecimal nav = navDO.getNav();
             BigDecimal cumulativeNavWithdrawal  = navDO.getCumulativeNavWithdrawal();
             if(sumDistribute == null){

service-manage/src/main/java/com/simuwang/manage/service/impl/DistributionServiceImpl.java

@@ -80,6 +80,7 @@ public class DistributionServiceImpl implements DistributionService {
         NavDO navDO = new NavDO();
         navDO.setFundId(distributionVO.getFundId());
         navDO.setNav(distributionVO.getNav());
+        navDO.setChannelId(distributionVO.getChannelId());
         navDO.setCreatorId(UserUtils.getLoginUser().getUserId());
         navDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
         navDO.setCumulativeNavWithdrawal(distributionVO.getCumulativeNavWithdrawal());
@@ -94,6 +95,7 @@ public class DistributionServiceImpl implements DistributionService {
         }
         DistributionDO distributionDO = new DistributionDO();
         distributionDO.setFundId(distributionVO.getFundId());
+        distributionDO.setChannelId(distributionVO.getChannelId());
         distributionDO.setDistribution(distributionVO.getDistribution());
         distributionDO.setDistributeDate(DateUtils.parse(distributionVO.getDistributeDate(),DateUtils.YYYY_MM_DD));
         distributionDO.setDistributeType(distributionVO.getDistributeType());