## 调整部分三方注释;
This commit is contained in:
parent
07ff5cd199
commit
c8d446ad8b
|
@ -30,27 +30,22 @@ import java.util.List;
|
|||
public class MemberSettleBonusProvider implements IMemberSettleBonusApi {
|
||||
|
||||
@Autowired
|
||||
private ICuMemberMonthAchieveService cuMemberMonthAchieveService;
|
||||
|
||||
private ICuMemberMonthAchieveService iCuMemberMonthAchieveService;
|
||||
@Autowired
|
||||
private IBonusSettleService bonusSettleService;
|
||||
|
||||
private IBonusSettleService iBonusSettleService;
|
||||
@Autowired
|
||||
private ICuMemberBonusService cuMemberBonusService;
|
||||
|
||||
private IBonusGrantService iBonusGrantService;
|
||||
@Autowired
|
||||
private IBonusGrantService bonusGrantService;
|
||||
|
||||
private ICuMemberBonusService iCuMemberBonusService;
|
||||
@Autowired
|
||||
private ICuMemberAchieveService cuMemberAchieveService;
|
||||
|
||||
private ICuMemberAchieveService iCuMemberAchieveService;
|
||||
@Autowired
|
||||
private ICuMemberRetailLogService cuMemberRetailLogService;
|
||||
private ICuMemberRetailLogService iCuMemberRetailLogService;
|
||||
|
||||
@Override
|
||||
public R<Boolean> calculateCumberBonusBySecond(String orderCode) {
|
||||
try {
|
||||
bonusSettleService.calculateCumberBonusBySecond(orderCode);
|
||||
iBonusSettleService.calculateCumberBonusBySecond(orderCode);
|
||||
} catch (Exception e) {
|
||||
return R.fail();
|
||||
}
|
||||
|
@ -69,7 +64,7 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi {
|
|||
|
||||
@Override
|
||||
public void backupsSettleBonusEveryday() {
|
||||
cuMemberBonusService.backupsSettleBonusEveryday();
|
||||
iCuMemberBonusService.backupsSettleBonusEveryday();
|
||||
}
|
||||
|
||||
class BonusCalculateBonus extends Thread {
|
||||
|
@ -82,55 +77,53 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi {
|
|||
|
||||
@Override
|
||||
public void run() {
|
||||
if (DateUtils.compareDateBefore(settleDate, DateUtils.parseStringToDate("2023-09-04"))) {
|
||||
return;
|
||||
}
|
||||
Date settleEndDate = DateUtils.afterDate(1, ChronoUnit.DAYS, settleDate);
|
||||
log.info("奖金结算完成,结算时间:{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate));
|
||||
log.info("奖金结算开始, 结算时间:{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate));
|
||||
// 奖金结算
|
||||
try {
|
||||
cuMemberBonusService.autoCalculateBonus(settleDate, settleEndDate);
|
||||
iCuMemberBonusService.autoCalculateBonus(settleDate, settleEndDate);
|
||||
log.info("奖金结算结束");
|
||||
} catch (Exception e) {
|
||||
log.info("BonusCalculateBonus error: ", e);
|
||||
log.error("奖金结算异常,结算时间:{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertCuMemberAchieveByEveryDay() {
|
||||
cuMemberMonthAchieveService.insertCuMemberAchieveByEveryDay(DateUtils.beforeDate(1, ChronoUnit.DAYS));
|
||||
iCuMemberMonthAchieveService.insertCuMemberAchieveByEveryDay(DateUtils.beforeDate(1, ChronoUnit.DAYS));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void autoPublishBonus() {
|
||||
bonusGrantService.publishBonusByPeriodEveryDay();
|
||||
iBonusGrantService.publishBonusByPeriodEveryDay();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void autoGrantBonus() {
|
||||
bonusGrantService.grantWithdrawBonusByPeriodEveryDay();
|
||||
iBonusGrantService.grantWithdrawBonusByPeriodEveryDay();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean chargeBackSaOrder(SaOrder saOrder) {
|
||||
return cuMemberAchieveService.chargeBackSaOrder(saOrder);
|
||||
return iCuMemberAchieveService.chargeBackSaOrder(saOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void calculateCuMemberRetailRangeBonusBySaOrder() {
|
||||
List<CuMemberRetailLog> cuMemberRetailLogs = cuMemberRetailLogService.queryCuMemberRetailLog();
|
||||
List<CuMemberRetailLog> cuMemberRetailLogs = iCuMemberRetailLogService.queryCuMemberRetailLog();
|
||||
if (cuMemberRetailLogs.size() > 0) {
|
||||
List<CuMemberRetailLog> successLogList = new ArrayList<>();
|
||||
try {
|
||||
for (CuMemberRetailLog cuMemberRetailLog : cuMemberRetailLogs) {
|
||||
bonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(cuMemberRetailLog.getOrderCode());
|
||||
iBonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(cuMemberRetailLog.getOrderCode());
|
||||
successLogList.add(cuMemberRetailLog);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if (successLogList.size() > 0) {
|
||||
cuMemberRetailLogService.updateCuMemberRetailLogByList(successLogList);
|
||||
iCuMemberRetailLogService.updateCuMemberRetailLogByList(successLogList);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -138,6 +131,6 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi {
|
|||
|
||||
@Override
|
||||
public R<CuMemberRetail> queryValidateBoxOrAchieve(Long pkMember) {
|
||||
return R.ok(bonusSettleService.queryValidateBoxOrAchieve(pkMember));
|
||||
return R.ok(iBonusSettleService.queryValidateBoxOrAchieve(pkMember));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,9 +15,6 @@ import java.util.Date;
|
|||
|
||||
/**
|
||||
* 短信发送记录
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-03-08
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
|
|
|
@ -6,19 +6,13 @@ import com.xxl.job.core.handler.annotation.XxlJob;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @description: 每日奖金计算定时任务
|
||||
* @author: sui q
|
||||
* @time: 2023/4/10 14:19
|
||||
* @classname: BonusSettleJob
|
||||
* @package_name: com.hzs.third.job
|
||||
* version 1.0.0
|
||||
* 每日奖金计算定时任务
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
|
@ -26,173 +20,124 @@ import java.util.Date;
|
|||
public class BonusSettleJob {
|
||||
|
||||
@DubboReference
|
||||
private IMemberSettleBonusApi memberBonusSettleApi;
|
||||
IMemberSettleBonusApi iMemberSettleBonusApi;
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("backSettleBonus")
|
||||
// @Scheduled(cron = "10 8 10 * * ?")
|
||||
public void backupsSettleBonusEveryday() {
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.backupsSettleBonusEveryday();
|
||||
iMemberSettleBonusApi.backupsSettleBonusEveryday();
|
||||
}
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus")
|
||||
// @Scheduled(cron = "10 8 10 * * ?")
|
||||
public void autoSettleBonusEveryday() {
|
||||
Date startDate = DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus1")
|
||||
public void autoSettleBonusEveryday1() {
|
||||
Date startDate = DateUtils.beforeDate(6, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus2")
|
||||
public void autoSettleBonusEveryday2() {
|
||||
Date startDate = DateUtils.beforeDate(5, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus3")
|
||||
public void autoSettleBonusEveryday3() {
|
||||
Date startDate = DateUtils.beforeDate(4, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus4")
|
||||
// @Scheduled(cron = "10 6 11 * * ?")
|
||||
public void autoSettleBonusEveryday4() {
|
||||
Date startDate = DateUtils.beforeDate(3, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus5")
|
||||
public void autoSettleBonusEveryday5() {
|
||||
Date startDate = DateUtils.beforeDate(2, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 奖金每天自动结算,计算前一天奖金
|
||||
*
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/4 13:48
|
||||
*/
|
||||
@XxlJob("autoSettleBonus6")
|
||||
public void autoSettleBonusEveryday6() {
|
||||
Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||
log.info("开始进行奖金结算");
|
||||
memberBonusSettleApi.autoCalculateBonus(startDate);
|
||||
iMemberSettleBonusApi.autoCalculateBonus(startDate);
|
||||
}
|
||||
|
||||
/*
|
||||
* @description: 自动公布奖金
|
||||
* @author: sui q
|
||||
* @date: 2023/4/24 14:26
|
||||
* @param: null null
|
||||
* 自动公布奖金
|
||||
**/
|
||||
@XxlJob("autoPublishBonus")
|
||||
public void autoPublishBonusEveryday() {
|
||||
log.info("开始进行奖金公布");
|
||||
memberBonusSettleApi.autoPublishBonus();
|
||||
iMemberSettleBonusApi.autoPublishBonus();
|
||||
log.info("奖金公布完成");
|
||||
}
|
||||
|
||||
/*
|
||||
* @description: 自动发放奖金
|
||||
* @author: sui q
|
||||
* @date: 2023/4/24 14:26
|
||||
* @param: null null
|
||||
* 自动发放奖金
|
||||
**/
|
||||
@XxlJob("autoGrantBonus")
|
||||
// @Scheduled(cron = "10 42 13 * * ?")
|
||||
public void autoGrantBonusEveryday() {
|
||||
log.info("开始进行奖金发放");
|
||||
memberBonusSettleApi.autoGrantBonus();
|
||||
iMemberSettleBonusApi.autoGrantBonus();
|
||||
log.info("奖金发放完成");
|
||||
}
|
||||
|
||||
/*
|
||||
* @description: 自动结算每日业绩,每月业绩,用于统计分析
|
||||
* @author: sui q
|
||||
* @date: 2023/9/1 9:53
|
||||
* @param: null null
|
||||
* 自动结算每日业绩,每月业绩,用于统计分析
|
||||
**/
|
||||
@XxlJob("autoSettleMember")
|
||||
// @Scheduled(cron = "50 55 15 * * ?")
|
||||
public void autoSettleMemberAchieveEveryday() {
|
||||
log.info("开始进行会员业绩计算");
|
||||
memberBonusSettleApi.insertCuMemberAchieveByEveryDay();
|
||||
iMemberSettleBonusApi.insertCuMemberAchieveByEveryDay();
|
||||
}
|
||||
|
||||
/*
|
||||
* @description: 自动结算每日业绩,每月业绩,用于统计分析
|
||||
* @author: sui q
|
||||
* @date: 2023/9/1 9:53
|
||||
* @param: null null
|
||||
* 自动结算每日业绩,每月业绩,用于统计分析
|
||||
**/
|
||||
@XxlJob("autoSecondBonus")
|
||||
public void autoSettleMemberBonusBySecond() {
|
||||
log.info("开始进行会员业绩计算");
|
||||
memberBonusSettleApi.calculateCuMemberRetailRangeBonusBySaOrder();
|
||||
iMemberSettleBonusApi.calculateCuMemberRetailRangeBonusBySaOrder();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -9,12 +9,6 @@ import org.springframework.stereotype.Component;
|
|||
|
||||
/**
|
||||
* 会员模块定时任务
|
||||
*
|
||||
* @Description:
|
||||
* @Author: ljc
|
||||
* @Time: 2023/4/11 19:11
|
||||
* @Classname: CuMemberJob
|
||||
* @Package_name: com.hzs.member.job
|
||||
*/
|
||||
@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true")
|
||||
@Component
|
||||
|
@ -22,23 +16,22 @@ import org.springframework.stereotype.Component;
|
|||
public class CuMemberJob {
|
||||
|
||||
@DubboReference
|
||||
IMemberJobServiceApi memberJobServiceApi;
|
||||
IMemberJobServiceApi iMemberJobServiceApi;
|
||||
|
||||
/**
|
||||
* 定时插入账户详情数据
|
||||
*/
|
||||
@XxlJob("insertAccountDetail")
|
||||
public void insertAccountDetail() {
|
||||
memberJobServiceApi.insertAccountDetail();
|
||||
iMemberJobServiceApi.insertAccountDetail();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 自动提现
|
||||
*/
|
||||
@XxlJob("automaticWithdrawal")
|
||||
public void automaticWithdrawal() {
|
||||
memberJobServiceApi.automaticWithdrawal();
|
||||
iMemberJobServiceApi.automaticWithdrawal();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@ import com.hzs.member.statis.ICuBonusStatisServiceApi;
|
|||
import com.hzs.member.statis.ICuBonusVertexStatisServiceApi;
|
||||
import com.hzs.report.stat.IMemberReportServiceApi;
|
||||
import com.hzs.retail.member.IMemberRetailApi;
|
||||
import com.hzs.system.config.IBdBarCodeServiceApi;
|
||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
|
@ -20,32 +19,22 @@ import org.springframework.stereotype.Component;
|
|||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @BelongsProject: hzs_cloud
|
||||
* @BelongsPackage: com.hzs.third.job
|
||||
* @Author: yh
|
||||
* @CreateTime: 2023-04-27 09:31
|
||||
* @Description:
|
||||
* @Version: 1.0
|
||||
*/
|
||||
@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true")
|
||||
@Component
|
||||
@Slf4j
|
||||
public class MemberJob {
|
||||
|
||||
@DubboReference
|
||||
IMemberServiceApi memberServiceApi;
|
||||
IMemberServiceApi iMemberServiceApi;
|
||||
@DubboReference
|
||||
IMemberRetailApi iMemberRetailApi;
|
||||
@DubboReference
|
||||
ICuBonusStatisServiceApi iCuBonusStatisServiceApi;
|
||||
@DubboReference
|
||||
ICuBonusVertexStatisServiceApi iCuBonusVertexStatisServiceApi;
|
||||
@DubboReference
|
||||
IBdBarCodeServiceApi iBdBarCodeServiceApi;
|
||||
@DubboReference
|
||||
ICuMemberRetailRegionServiceApi iCuMemberRetailRegionServiceApi;
|
||||
@DubboReference
|
||||
IMemberRetailApi iMemberRetailApi;
|
||||
@DubboReference
|
||||
IAcRetailPickLogServiceApi iAcRetailPickLogServiceApi;
|
||||
@DubboReference
|
||||
IMemberReportServiceApi iMemberReportServiceApi;
|
||||
|
@ -83,11 +72,7 @@ public class MemberJob {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 重算7天内奖金拨比
|
||||
* @author: zhang jing
|
||||
* @date: 2023/12/11 10:45
|
||||
* @param: []
|
||||
* @return: void
|
||||
* 重算7天内奖金拨比
|
||||
**/
|
||||
@XxlJob("rerun-bonus-statis")
|
||||
public void rerunCuBonusStatis() {
|
||||
|
@ -109,11 +94,7 @@ public class MemberJob {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 7天重算顶点奖金拨比统计
|
||||
* @author: zhang jing
|
||||
* @date: 2024/8/15 10:29
|
||||
* @param: []
|
||||
* @return: void
|
||||
* 7天重算顶点奖金拨比统计
|
||||
**/
|
||||
@XxlJob("rerun-bonus-vertex-statis")
|
||||
public void rerunCuBonusVertexStatis() {
|
||||
|
@ -134,35 +115,18 @@ public class MemberJob {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 定时清除未使用的会员编号
|
||||
*/
|
||||
@XxlJob("clear-member-empty-code")
|
||||
public void clearMemberEmptyCode() {
|
||||
log.info("clear-member-empty-code 开始执行!");
|
||||
Integer dataCount = memberServiceApi.clearMemberEmptyCode().getData();
|
||||
Integer dataCount = iMemberServiceApi.clearMemberEmptyCode().getData();
|
||||
log.info("clear-member-empty-code 开始结束! 共处理:{}", dataCount);
|
||||
}
|
||||
|
||||
/**
|
||||
* 定时初始化条形码配置
|
||||
*/
|
||||
@XxlJob("updatWarehouseLogJob")
|
||||
public void updatWarehouseLogJob() {
|
||||
/**
|
||||
* 查询初始化条形码配置,将当前尾号初始化为初始尾号
|
||||
*/
|
||||
iBdBarCodeServiceApi.updatWarehouseLog();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @description: 定时修改到期的零售区域
|
||||
* @author: zhang jing
|
||||
* @date: 2024/12/30 14:25
|
||||
* @param: []
|
||||
* @return: void
|
||||
* 定时修改到期的零售区域
|
||||
**/
|
||||
@XxlJob("retail-region")
|
||||
public void retailRegion() {
|
||||
|
@ -191,11 +155,7 @@ public class MemberJob {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 每月10号处理上个月提货赠送活动满足活动规则的数据
|
||||
* @author: zhang jing
|
||||
* @date: 2025/2/6 10:59
|
||||
* @param: []
|
||||
* @return: void
|
||||
* 每月10号处理上个月提货赠送活动满足活动规则的数据
|
||||
**/
|
||||
@XxlJob("deliveryLog")
|
||||
public void deliveryLog() {
|
||||
|
@ -203,11 +163,7 @@ public class MemberJob {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 统计直推会员金额业绩盒数
|
||||
* @author: zhang jing
|
||||
* @date: 2025/2/12 16:09
|
||||
* @param: []
|
||||
* @return: void
|
||||
* 统计直推会员金额业绩盒数
|
||||
**/
|
||||
@XxlJob("sta-smount-box")
|
||||
public void pushAmountBoxmethod() {
|
||||
|
@ -215,11 +171,7 @@ public class MemberJob {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 重算7天统计直推会员金额业绩盒数
|
||||
* @author: zhang jing
|
||||
* @date: 2023/12/11 10:45
|
||||
* @param: []
|
||||
* @return: void
|
||||
* 重算7天统计直推会员金额业绩盒数
|
||||
**/
|
||||
@XxlJob("repeat-sta-smount-box")
|
||||
public void repeatPushAmountBoxmethod() {
|
||||
|
@ -231,9 +183,7 @@ public class MemberJob {
|
|||
String startDateStr = (DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate));
|
||||
//重算前6天的数据
|
||||
iMemberReportServiceApi.repeatPushAmountBoxmethod(startDateStr, endDateStr);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package com.hzs.third.job;
|
||||
|
||||
import com.hzs.member.account.IMemberJobServiceApi;
|
||||
import com.hzs.sale.order.ISaOrderServiceApi;
|
||||
import com.hzs.system.base.ICurrencyServiceApi;
|
||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
|
@ -15,14 +13,14 @@ import org.springframework.stereotype.Component;
|
|||
public class OrderJob {
|
||||
|
||||
@DubboReference
|
||||
ISaOrderServiceApi orderServiceApi;
|
||||
ISaOrderServiceApi iSaOrderServiceApi;
|
||||
|
||||
/**
|
||||
* 定时关单 订单三十分钟未支付自动关闭
|
||||
*/
|
||||
@XxlJob("autoCloseOrder")
|
||||
public void timingCloseOrder() {
|
||||
orderServiceApi.closeOrder();
|
||||
iSaOrderServiceApi.closeOrder();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,12 +8,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @description: 供应链定时任务
|
||||
* @author: sui q
|
||||
* @time: 2024/2/21 15:45
|
||||
* @classname: ScmJob
|
||||
* @package_name: com.hzs.third.job
|
||||
* version 1.0.0
|
||||
* 供应链定时任务
|
||||
*/
|
||||
@Slf4j
|
||||
@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true")
|
||||
|
@ -21,14 +16,13 @@ import org.springframework.stereotype.Component;
|
|||
public class ScmJob {
|
||||
|
||||
@DubboReference
|
||||
private IScmBillServiceApi scmBillServiceApi;
|
||||
IScmBillServiceApi iScmBillServiceApi;
|
||||
|
||||
/**
|
||||
* 更新单据号初始化值
|
||||
*/
|
||||
// @Scheduled(cron = "0 54 15 * * ?")
|
||||
@XxlJob("updateBillNo")
|
||||
public void updateBillNo() {
|
||||
scmBillServiceApi.updateScmBillNoNextValue();
|
||||
iScmBillServiceApi.updateScmBillNoNextValue();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,76 +0,0 @@
|
|||
package com.hzs.third.job;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.hzs.common.core.constant.MagicNumberConstants;
|
||||
import com.hzs.common.core.constant.SystemFieldConstants;
|
||||
import com.hzs.common.core.enums.ESmsSendResult;
|
||||
import com.hzs.common.core.enums.ESmsSendStatus;
|
||||
import com.hzs.common.core.enums.ESmsSendType;
|
||||
import com.hzs.common.domain.third.sms.TSmsRecord;
|
||||
import com.hzs.third.sms.service.ITSmsRecordService;
|
||||
import com.hzs.third.sms.util.SmsUtil;
|
||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 短信定时任务
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/3/11 16:22
|
||||
* @Classname: SmsJob
|
||||
* @PackageName: com.hzs.third.job
|
||||
*/
|
||||
@Slf4j
|
||||
@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true")
|
||||
@Component
|
||||
public class SmsJob {
|
||||
|
||||
@Autowired
|
||||
private ITSmsRecordService itSmsRecordService;
|
||||
|
||||
/**
|
||||
* 定时发送短信
|
||||
*/
|
||||
// @Scheduled(cron = "0 * * * * ?")
|
||||
@XxlJob("sendSms")
|
||||
public void sendSms() {
|
||||
log.info("定时发送短信任务开始!");
|
||||
|
||||
Date date = new Date();
|
||||
|
||||
QueryWrapper<TSmsRecord> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("SEND_TYPE", ESmsSendType.SCHEDULED.getValue());
|
||||
queryWrapper.eq("SEND_STATUS", ESmsSendStatus.NOT_SEND.getValue());
|
||||
queryWrapper.le("SEND_TIME", date);
|
||||
queryWrapper.orderByAsc(SystemFieldConstants.CREATION_TIME);
|
||||
List<TSmsRecord> list = itSmsRecordService.list(queryWrapper);
|
||||
if (CollectionUtil.isNotEmpty(list)) {
|
||||
log.info("本次共需要发送短信{}条", list.size());
|
||||
|
||||
for (TSmsRecord tSmsRecord : list) {
|
||||
String str = SmsUtil.sendSms(tSmsRecord.getPhone(), tSmsRecord.getContent());
|
||||
if (null == str) {
|
||||
// 发送成功
|
||||
tSmsRecord.setSendResult(ESmsSendResult.SUCCESS.getValue());
|
||||
} else {
|
||||
tSmsRecord.setSendResult(ESmsSendResult.FAIL.getValue());
|
||||
}
|
||||
tSmsRecord.setSendStatus(ESmsSendStatus.SEND.getValue());
|
||||
tSmsRecord.setPkModified(MagicNumberConstants.PK_ADMIN);
|
||||
tSmsRecord.setModifiedTime(date);
|
||||
itSmsRecordService.updateById(tSmsRecord);
|
||||
}
|
||||
} else {
|
||||
log.info("本次没有需要发送的短信");
|
||||
}
|
||||
|
||||
log.info("定时发送短信任务结束!");
|
||||
}
|
||||
|
||||
}
|
|
@ -4,27 +4,18 @@ import com.hzs.sale.wares.IWaresServiceApi;
|
|||
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @BelongsProject: hzs_cloud
|
||||
* @BelongsPackage: com.hzs.third.job
|
||||
* @Author: yh
|
||||
* @CreateTime: 2023-06-01 10:44
|
||||
* @Description: TODO
|
||||
* @Version: 1.0
|
||||
*/
|
||||
@Slf4j
|
||||
@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true")
|
||||
@Component
|
||||
public class WaresJob {
|
||||
|
||||
@DubboReference
|
||||
private IWaresServiceApi waresServiceApi;
|
||||
IWaresServiceApi iWaresServiceApi;
|
||||
|
||||
/**
|
||||
* 商品自动上下架
|
||||
|
@ -32,14 +23,12 @@ public class WaresJob {
|
|||
@XxlJob("waresAutoLoadingJob")
|
||||
public void waresAutoLoadingJob() {
|
||||
// 修改符合 时间条件商品上架
|
||||
/**
|
||||
* 获取当前时间
|
||||
*/
|
||||
// 获取当前时间
|
||||
Date currentTime = new Date();
|
||||
// 自动上架
|
||||
waresServiceApi.updateByAutoStartAndAutoStart(currentTime);
|
||||
iWaresServiceApi.updateByAutoStartAndAutoStart(currentTime);
|
||||
// 定时自动下架
|
||||
waresServiceApi.updateByAutoStartAndAutoEnd(currentTime);
|
||||
iWaresServiceApi.updateByAutoStartAndAutoEnd(currentTime);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -48,6 +37,6 @@ public class WaresJob {
|
|||
@XxlJob("waresPreSaleJob")
|
||||
public void waresPreSaleJob() {
|
||||
// 修改商品预售状态
|
||||
waresServiceApi.waresPreSale();
|
||||
iWaresServiceApi.waresPreSale();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,11 +20,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 短信发送记录
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/3/9 16:10
|
||||
* @Classname: SmsRecordController
|
||||
* @PackageName: com.hzs.third.sms.controller
|
||||
* 短信发送记录
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/manage/sms-record/")
|
||||
|
|
|
@ -10,9 +10,6 @@ import java.util.List;
|
|||
|
||||
/**
|
||||
* 短信发送记录 Mapper 接口
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-03-08
|
||||
*/
|
||||
public interface TSmsRecordMapper extends BaseMapper<TSmsRecord> {
|
||||
|
||||
|
|
|
@ -10,9 +10,6 @@ import java.util.List;
|
|||
|
||||
/**
|
||||
* 短信发送记录 服务类
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-03-08
|
||||
*/
|
||||
public interface ITSmsRecordService extends IService<TSmsRecord> {
|
||||
|
||||
|
|
|
@ -26,9 +26,6 @@ import java.util.*;
|
|||
|
||||
/**
|
||||
* 短信发送记录 服务实现类
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-03-08
|
||||
*/
|
||||
@Service
|
||||
public class TSmsRecordServiceImpl extends ServiceImpl<TSmsRecordMapper, TSmsRecord> implements ITSmsRecordService {
|
||||
|
@ -37,9 +34,9 @@ public class TSmsRecordServiceImpl extends ServiceImpl<TSmsRecordMapper, TSmsRec
|
|||
private ITSmsTemplateService itSmsTemplateService;
|
||||
|
||||
@DubboReference
|
||||
private IMemberServiceApi iMemberServiceApi;
|
||||
IMemberServiceApi iMemberServiceApi;
|
||||
@DubboReference
|
||||
private ISaOrderServiceApi iSaOrderServiceApi;
|
||||
ISaOrderServiceApi iSaOrderServiceApi;
|
||||
|
||||
@Override
|
||||
public List<TSmsRecordExt> queryList(SmsRecordQueryParam param, Integer pkCountry) {
|
||||
|
|
Loading…
Reference in New Issue