Parcourir la source

//tt share

release_toaliyun_real
xhxu il y a 3 ans
Parent
révision
6e9f209ffd
6 fichiers modifiés avec 64 ajouts et 48 suppressions
  1. +2
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java
  2. +3
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java
  3. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java
  4. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/TtOrderQueryCpsSchedule.java
  5. +55
    -41
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java

+ 2
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java Voir le fichier

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


+ 3
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java Voir le fichier

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


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java Voir le fichier

@@ -40,7 +40,7 @@ public class TtMerchantReciverSchedule {


/**
* 每小时
* 每小时
*/
@Scheduled(cron = "0 */30 * * * ?")
// @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/TtOrderQueryCpsSchedule.java Voir le fichier

@@ -43,8 +43,8 @@ public class TtOrderQueryCpsSchedule {
private MaUtil maUtil;

@Async
// @Scheduled(cron = "0 0 */1 * * ?")
@Scheduled(cron = "0 0/5 * * * ?")
@Scheduled(cron = "0 15 */1 * * ?")
// @Scheduled(cron = "0 0/5 * * * ?")
public void OrderPushErrorTaskSchedule() {
WxAppinfo appQ = new WxAppinfo();
appQ.setType(EnumAppType.C.getCode());


+ 55
- 41
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Voir le fichier

@@ -206,21 +206,22 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
PayShareResult shareResult = payServiceFactory.getPayShareAdapterService(dto.getPayWay()).haveReciversShare(appInfo, payAccount, frecord,
sharingOrder.getTransactionId(), JSONArray.parseArray(JSON.toJSONString(receivers)), EnumProfitSharingOrderType.getEnum(sharingOrder.getType()));
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(sharingOrder);
updSharingOrder.setId(sharingOrder.getId());
updSharingOrder.setOutSettleNo(frecord.getOutSettleNo());
if (!shareResult.isSuccess()) {
sharingOrder.setOutSettleNo(frecord.getOutSettleNo());
sharingOrder.setSharingStatus(shareResult.getCode());
sharingOrder.setErrorMsg("REDO:"+shareResult.getMsg());
sharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(sharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),sharingOrder.getErrorMsg());
updSharingOrder.setSharingStatus(shareResult.getCode());
updSharingOrder.setErrorMsg("REDO:"+shareResult.getMsg());
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg());
}

sharingOrder.setOutSettleNo(frecord.getOutSettleNo());
sharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
sharingOrder.setErrorMsg("REDO:重试分账成功");
sharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(sharingOrder);
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
updSharingOrder.setErrorMsg("REDO:重试分账成功");
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
for (WxProfitSharingResult result:resultList) {
wxProfitSharingResultMapper.insert(result);
}
@@ -237,18 +238,23 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId());

PayShareResult shareResult = payServiceFactory.getPayShareAdapterService(dto.getPayWay()).noReciverShare(appInfo,payAccount,sharingOrder,sharingOrder.getTransactionId(),sharingOrder.getPayAmount());

WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(sharingOrder);
updSharingOrder.setId(sharingOrder.getId());
updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo());
if (!shareResult.isSuccess()) {
sharingOrder.setSharingStatus(shareResult.getCode());
sharingOrder.setErrorMsg("REDO:"+shareResult.getMsg());
sharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(sharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),sharingOrder.getErrorMsg());
updSharingOrder.setSharingStatus(shareResult.getCode());
updSharingOrder.setErrorMsg("REDO:"+shareResult.getMsg());
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg());
}
sharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
sharingOrder.setErrorMsg("REDO:重试分账成功");
sharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(sharingOrder);
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
updSharingOrder.setErrorMsg("REDO:重试分账成功");
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(shareResult.getData());
}

@@ -275,17 +281,21 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ

PayShareResult shareResult = payShareAdapterService.haveReciversShare(appInfo, payAccount, record,
sharingOrderDto.getTransactionId(), jsonArray, shareType);
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(record);
updSharingOrder.setId(record.getId());
updSharingOrder.setOutSettleNo(record.getOutSettleNo());
if (!shareResult.isSuccess()) {
record.setSharingStatus(shareResult.getCode());
record.setErrorMsg(shareResult.getMsg());
record.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(record);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),record.getErrorMsg());
updSharingOrder.setSharingStatus(shareResult.getCode());
updSharingOrder.setErrorMsg(shareResult.getMsg());
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg());
}
record.setSharingOrderNo(shareResult.getShareOrderNo());
record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
record.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(record);
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);

final IdWorker idworker = IdWorker.get();
try {
@@ -459,18 +469,22 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ

//分账提交
PayShareResult shareResult = payShareAdapterService.noReciverShare(appInfo,payAccount,record,sharingOrderDto.getTransactionId(),sharingOrderDto.getShareAmount());
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(record);
updSharingOrder.setId(record.getId());
updSharingOrder.setOutSettleNo(record.getOutSettleNo());
if (!shareResult.isSuccess()) {
record.setSharingStatus(shareResult.getCode());
record.setErrorMsg(shareResult.getMsg());
record.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(record);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),record.getErrorMsg());
updSharingOrder.setSharingStatus(shareResult.getCode());
updSharingOrder.setErrorMsg(shareResult.getMsg());
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg());
}

record.setSharingOrderNo(shareResult.getShareOrderNo());
record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
record.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(record);
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
updSharingOrder.setUpdateTime(new Date());
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(shareResult.getData());
}



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Voir le fichier

@@ -154,7 +154,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{
String before3dayStr = DateUtils.getTimeBefore(3, new Date());
Date before3day = DateUtils.stringToDate(before3dayStr);
if(before3day.before(record.getCreateTime())){
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_READY.getCode(),"未满足D+3", null,null);
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode(),"未满足D+3", null,null);
}
try {
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount);


Chargement…
Annuler
Enregistrer