chenjianhua 1 неделя назад
Родитель
Сommit
024f80a741

+ 1 - 1
service-base/src/main/resources/mapper/daq/AssetMapper.xml

@@ -80,7 +80,7 @@
         select count(1) from asset where isvalid=1
     </select>
     <select id="selectMaxPriceDate" resultType="java.util.Date">
-        select max(price_date) from asset where fund_id=#{fundId} and price_date=#{priceDate} and isvalid=1
+        select max(price_date) from asset where fund_id=#{fundId} and channel_id=#{channelId} and isvalid=1
     </select>
 
 </mapper>

+ 1 - 1
service-base/src/main/resources/mapper/daq/DeletionInfoMapper.xml

@@ -323,7 +323,7 @@
     <select id="getDistributeDeletionInfo" resultType="com.simuwang.base.pojo.dos.DistributeDeletionInfoDO">
         select id,fund_id as "fundId",deletion_date as "deletionDate" from distribute_first_deletion_info where fund_id=#{fundId} and isvalid=1
     </select>
-    <select id="selectAssetDeletionInfoByFundId" resultMap="BaseResultMap">
+    <select id="selectAssetDeletionInfoByFundId" resultMap="BaseEmailMap">
         select info.fund_id,info.fund_name,c.company_name,d.deletion_type,d.deletion_date,ci.id as channel_id,ci.channel_name
         from deletion_info d
                  join pvn_fund_info info on d.fund_id=info.fund_id

+ 9 - 5
service-manage/src/main/java/com/simuwang/manage/task/SendCompanyEmailTask.java

@@ -65,12 +65,16 @@ public class SendCompanyEmailTask {
                 }
             }
             for(String companyId : companyIdEmailMap.keySet()){
-                List<String> emailList = companyIdEmailMap.get(companyId);
-                StringBuffer emails = new StringBuffer();
-                for(String email : emailList){
-                    emails.append(email).append(";");
+                try{
+                    List<String> emailList = companyIdEmailMap.get(companyId);
+                    StringBuffer emails = new StringBuffer();
+                    for(String email : emailList){
+                        emails.append(email).append(";");
+                    }
+                    companyEmailConfigService.sendEmail(companyId,emails.toString());
+                }catch (Exception e){
+                    log.error(e.getMessage(),e);
                 }
-                companyEmailConfigService.sendEmail(companyId,emails.toString());
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);