Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202212

 Conflicts:
	mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java
	mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java
release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
d8c48fbdfa
10 измененных файлов: 21 добавлений и 21 удалений
  1. +1
    -0
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java
  2. +4
    -4
      mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java
  3. +2
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java
  4. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java
  5. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java
  6. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java
  7. +1
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java
  8. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java
  9. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java
  10. +4
    -3
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java

+ 1
- 0
mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java Просмотреть файл

@@ -154,6 +154,7 @@ public class WxPayController extends BaseController {
xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8"));
logger.info(xml);
paramMap = WxPayment.xmlToMap(xml);
paramMap.put("tenantId", tenantId);
String jsonMsg = JSON.toJSONString(paramMap);

FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg();


+ 4
- 4
mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java Просмотреть файл

@@ -60,8 +60,8 @@ public class InvestSchedule {
private static final String TAG_REMIND = "招商定时任务-提醒";


@Async
@Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务
// @Async
// @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务
//@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行
public void messageSchedule() {
log.info("{}: 开始", TAG_MESSAGE);
@@ -72,8 +72,8 @@ public class InvestSchedule {
log.info("{}: 结束", TAG_MESSAGE);
}

@Async
@Scheduled(cron = "0 */5 * * * *?")
// @Async
// @Scheduled(cron = "0 */5 * * * *?")
public void remindSchedule() {
log.info("{}: 开始", TAG_REMIND);
// 提醒新


+ 2
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java Просмотреть файл

@@ -13,7 +13,6 @@ import com.iformall.utils.MaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@@ -43,7 +42,7 @@ public class OrderRefundAuditSchedule {
MaUtil maUtil;

@Async
@Scheduled(cron = "0 */5 * * * ?")//
@Scheduled(cron = "0 0 */1 * * ?")//
//@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
public void orderQueryRefund() {

@@ -131,7 +130,7 @@ public class OrderRefundAuditSchedule {
return wxAppinfoMapper.findList(appinfo);
}

@Async
@Scheduled(cron = "0 30 */1 * * ?")// 每个小时的30分钟
//@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
public void merchantAuditCallback() {


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java Просмотреть файл

@@ -61,8 +61,8 @@ public class PowerBillAutoBuildSchedule {
/**
* 每天5点执行
*/
@Async
@Scheduled(cron = "0 0 5 * * ?")
// @Async
// @Scheduled(cron = "0 0 5 * * ?")
public void powerBillAutoConfigStart() {
logger.info("自动生成电费账单开始....");
int dayOfMonth = LocalDate.now().getDayOfMonth();


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java Просмотреть файл

@@ -48,8 +48,8 @@ public class SharingOrderRedoSchedule {
}
@Async
// @Scheduled(cron = "0 0 2 * * ?") // 每天凌晨02:00分账重试
@Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟
@Scheduled(cron = "0 15 2 * * ?") // 每天凌晨02:00分账重试
// @Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟
// @Scheduled(cron = "0 0/10 * * * ?") // 测试
public void sharingOrderRedoSchedule() {
List<WxMall> malls = getMalls();


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java Просмотреть файл

@@ -35,8 +35,8 @@ public class SharingOrderResultSchedule {
}
@Async
// @Scheduled(cron = "0 0 3 * * ?") // 每天凌晨3:00更新分账结果
@Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟
@Scheduled(cron = "0 15 3 * * ?") // 每天凌晨3:00更新分账结果
// @Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟
// @Scheduled(cron = "* */15 * * * ?") // 测试10秒中一次
public void sharingOrderResultSchedule() {
List<WxMall> malls = getMalls();


+ 1
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java Просмотреть файл

@@ -7,7 +7,6 @@ import com.iformall.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@@ -44,7 +43,7 @@ public class TtMerchantReciverSchedule {
* 每半小时
*/
@Async
@Scheduled(cron = "0 */30 * * * ?")
@Scheduled(cron = "0 33 */1 * * ?")
// @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行
public void updateMerchantReciverSchedule() {
List<WxAppinfo> ttAppInfos = getTTAppInfos();


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java Просмотреть файл

@@ -38,7 +38,7 @@ public class WxCUserTagsSchedule {
@Async
// TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100%
//@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签
@Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次
// @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次
public void wxCUserTagsSchedule() {
WxMall wxMall = new WxMall();


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java Просмотреть файл

@@ -46,7 +46,7 @@ public class WxMsgModelSchedule {
WxMsgConfigMapper wxMsgConfigMapper;

@Async
@Scheduled(cron = "0 0 */1 * * ?") //
@Scheduled(cron = "0 25 */2 * * ?") //
public void querySmsTemplate() {
WxMsgModel msgModel = new WxMsgModel();
msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode());
@@ -91,7 +91,7 @@ public class WxMsgModelSchedule {
}

@Async
@Scheduled(cron = "30 */10 * * * ?") //
@Scheduled(cron = "0 20 */2 * * ?") //
public void querySendDetails() {
WxMsgCallback msgCallback = new WxMsgCallback();
msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode());


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java Просмотреть файл

@@ -208,10 +208,11 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{
}

String out_order_no = result.getString("out_order_no");
if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getId().toString())){
throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getId()+"]");
if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getOrderId().toString())){
throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getOrderId()+"]");
}
return new PayShareQueryResult(true, 200, "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers"))));

return new PayShareQueryResult(true, EnumProfitSharingOrderStatus.PROFIT_SHARING_DONE.getCode(), "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers"))));
}


Загрузка…
Отмена
Сохранить