Explorar el Código

//activity v.

release_toaliyun_real
xiaohu hace 9 meses
padre
commit
4594b169d6
Se han modificado 5 ficheros con 68 adiciones y 7 borrados
  1. +56
    -6
      mallinkSchedule/src/main/java/com/iformall/schedule/WxVtwoActivityGrantExportTwoSchedule.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantAwardMapper.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantMapper.java
  4. +7
    -0
      mallinkService/src/main/resources/mapper/WxVtwoActivityGrantMapper.xml
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantMapper.xml

+ 56
- 6
mallinkSchedule/src/main/java/com/iformall/schedule/WxVtwoActivityGrantExportTwoSchedule.java Ver fichero

@@ -2,10 +2,7 @@ package com.iformall.schedule;


import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumYesOrNo;
import com.iformall.mapper.WxVtwoActivityGrantOrderMapper;
import com.iformall.mapper.WxVtwoActivityGrantSettlementMapper;
import com.iformall.mapper.WxVtwoCashBackGrantAwardMapper;
import com.iformall.mapper.WxVtwoCashBackGrantMapper;
import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ public class WxVtwoActivityGrantExportTwoSchedule {
@Autowired @Autowired
private WxVtwoCashBackGrantMapper wxVtwoCashBackGrantMapper; private WxVtwoCashBackGrantMapper wxVtwoCashBackGrantMapper;


@Autowired
private WxVtwoActivityGrantMapper wxVtwoActivityGrantMapper;

@Autowired @Autowired
private WxVtwoActivityGrantSettlementMapper wxVtwoActivityGrantSettlementMapper; private WxVtwoActivityGrantSettlementMapper wxVtwoActivityGrantSettlementMapper;


@@ -39,6 +39,9 @@ public class WxVtwoActivityGrantExportTwoSchedule {
@Autowired @Autowired
private WxVtwoCashBackGrantAwardMapper wxVtwoCashBackGrantAwardMapper; private WxVtwoCashBackGrantAwardMapper wxVtwoCashBackGrantAwardMapper;


@Autowired
private WxVtwoActivityGrantAwardMapper wxVtwoActivityGrantAwardMapper;

@Autowired @Autowired
private WxVtwoActivityGrantExportTwoService wxVtwoActivityGrantExportTwoService; private WxVtwoActivityGrantExportTwoService wxVtwoActivityGrantExportTwoService;


@@ -49,8 +52,8 @@ public class WxVtwoActivityGrantExportTwoSchedule {
@Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次 @Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次
public void wxVtwoCashBackGrantSchedule() { public void wxVtwoCashBackGrantSchedule() {
logger.info("*************************************************************************************"); logger.info("*************************************************************************************");
// String tenantId = "789";
String tenantId = "1095";
String tenantId = "789";
// String tenantId = "1095";
List<WxVtwoCashBackGrant> todoList = wxVtwoCashBackGrantMapper.findTodoList(tenantId); List<WxVtwoCashBackGrant> todoList = wxVtwoCashBackGrantMapper.findTodoList(tenantId);
if(todoList != null && !todoList.isEmpty()) { if(todoList != null && !todoList.isEmpty()) {


@@ -82,6 +85,53 @@ public class WxVtwoActivityGrantExportTwoSchedule {
grantSettlementQ.updateTenantInfo(todo); grantSettlementQ.updateTenantInfo(todo);
grantSettlementQ.setGrantId(todo.getId()); grantSettlementQ.setGrantId(todo.getId());
List<WxVtwoActivityGrantSettlement> grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ); List<WxVtwoActivityGrantSettlement> grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ);

wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList);
}catch(Exception ignored){}

});
}
}


@Async
@Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次
public void wxVtwoActivityGrantSchedule() {
logger.info("*************************************************************************************");
String tenantId = "789";
// String tenantId = "1095";
List<WxVtwoActivityGrant> todoList = wxVtwoActivityGrantMapper.findTodoList(tenantId);
if(todoList != null && !todoList.isEmpty()) {

MallUserInfo userInfoQ = new MallUserInfo();
userInfoQ.setTenantId(tenantId);
Map<Long,MallUserInfo> userMap = mallUserInfoService.getUserMap(userInfoQ);
todoList.forEach(todo ->{
try{
if(todo.getCreateBy() != null){
todo.setCreateByName(userMap.get(todo.getCreateBy()).getName());
}

WxVtwoActivityGrantOrder grantOrderQ = new WxVtwoActivityGrantOrder();
grantOrderQ.updateTenantInfo(todo);
grantOrderQ.setGrantId(todo.getId());
List<WxVtwoActivityGrantOrder> grantOrderList = wxVtwoActivityGrantOrderMapper.findList(grantOrderQ);
List<Long> orderIds = grantOrderList.stream().map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList());
List<Long> filterIdList = grantOrderList.stream().filter(grantOrder -> grantOrder.getIsAmount().equals(EnumYesOrNo.YES.getCode())).map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList());
List<WxVtwoActivityOrder> grantOrder = wxVtwoActivityOrderService.findGrantOrder(todo, orderIds, filterIdList);
todo.setOrderList(grantOrder);

WxVtwoActivityGrantAward grantAwardQ = new WxVtwoActivityGrantAward();
grantAwardQ.updateTenantInfo(todo);
grantAwardQ.setGrantId(todo.getId());
List<WxVtwoActivityGrantAward> grantAwardList = wxVtwoActivityGrantAwardMapper.findList(grantAwardQ);
todo.setGrantAwardList(grantAwardList);

WxVtwoActivityGrantSettlement grantSettlementQ = new WxVtwoActivityGrantSettlement();
grantSettlementQ.updateTenantInfo(todo);
grantSettlementQ.setGrantId(todo.getId());
List<WxVtwoActivityGrantSettlement> grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ);

wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList); wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList);
}catch(Exception ignored){} }catch(Exception ignored){}




+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantAwardMapper.java Ver fichero

@@ -25,6 +25,7 @@ public interface WxVtwoActivityGrantAwardMapper extends CommonMapper<WxVtwoActiv


List<WxVtwoAwardGrantStatistics> awardItemStatistics(WxVtwoActivityGrantAward grantAward); List<WxVtwoAwardGrantStatistics> awardItemStatistics(WxVtwoActivityGrantAward grantAward);


List<WxVtwoActivityGrantAward> findList(WxVtwoActivityGrantAward grantAward);
} }






+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantMapper.java Ver fichero

@@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxVtwoActivityGrant; import com.iformall.domain.po.WxVtwoActivityGrant;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.iformall.domain.vo.WxVtwoAwardStatistics; import com.iformall.domain.vo.WxVtwoAwardStatistics;
import io.lettuce.core.dynamic.annotation.Param;


import java.util.List; import java.util.List;


@@ -18,6 +19,8 @@ public interface WxVtwoActivityGrantMapper extends CommonMapper<WxVtwoActivityGr
WxVtwoAwardStatistics activityAwardStatistics(WxVtwoActivityGrant activityGrant); WxVtwoAwardStatistics activityAwardStatistics(WxVtwoActivityGrant activityGrant);


List<WxVtwoAwardStatistics> activityAwardStatisticsChart(WxVtwoActivityGrant activityGrant); List<WxVtwoAwardStatistics> activityAwardStatisticsChart(WxVtwoActivityGrant activityGrant);

List<WxVtwoActivityGrant> findTodoList(@Param("tenantId")String tenantId);
} }






+ 7
- 0
mallinkService/src/main/resources/mapper/WxVtwoActivityGrantMapper.xml Ver fichero

@@ -111,4 +111,11 @@
group by xTime group by xTime
</select> </select>


<select id="findTodoList" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_vtwo_activity_grant
where tenant_id=#{tenantId}
and id not in (select id from wx_vtwo_activity_grant_export_two)
limit 111
</select>

</mapper> </mapper>

+ 1
- 1
mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantMapper.xml Ver fichero

@@ -119,6 +119,6 @@
select <include refid="allColumns" /> from wx_vtwo_cash_back_grant select <include refid="allColumns" /> from wx_vtwo_cash_back_grant
where tenant_id=#{tenantId} where tenant_id=#{tenantId}
and id not in (select id from wx_vtwo_activity_grant_export_two) and id not in (select id from wx_vtwo_activity_grant_export_two)
limit 100
limit 111
</select> </select>
</mapper> </mapper>

Cargando…
Cancelar
Guardar