|
|
|
@ -1,10 +1,14 @@
|
|
|
|
|
package com.hchbox.module.service.impl;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
|
|
import com.hchbox.api.RequestCore;
|
|
|
|
|
import com.hchbox.constant.DefaultNumberConstants;
|
|
|
|
|
import com.hchbox.model.param.CommonResult;
|
|
|
|
|
import com.hchbox.module.dao.PayTwoOrderRepository;
|
|
|
|
|
import com.hchbox.module.entity.PayTwoOrder;
|
|
|
|
|
import com.hchbox.module.service.SynchronizedAmountService;
|
|
|
|
|
import com.hchbox.vo.SubAccountsVo;
|
|
|
|
@ -30,6 +34,8 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService
|
|
|
|
|
private Double budgetAmount;
|
|
|
|
|
@Resource
|
|
|
|
|
private RequestCore requestCore;
|
|
|
|
|
@Resource
|
|
|
|
|
private PayTwoOrderRepository payTwoOrderRepository;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public CommonResult<Object> synchronizedAmount(SubAccountsVo subAccountsVo) {
|
|
|
|
@ -68,4 +74,30 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService
|
|
|
|
|
}
|
|
|
|
|
return new CommonResult<>().success(payTwoOrder);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public CommonResult<Object> freeSync(PayTwoOrder payTwoOrder) {
|
|
|
|
|
|
|
|
|
|
JSONObject jsonObject2 = requestCore.updateSellerAccount(payTwoOrder);
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) {
|
|
|
|
|
log.error("+++++++++++++免费开通同步淘宝历史订单失败,id:{}++++++++++++", payTwoOrder.getMasterUserId());
|
|
|
|
|
return new CommonResult<>().error("免费开通失败");
|
|
|
|
|
}
|
|
|
|
|
payTwoOrder.setPayType(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
payTwoOrder.setIdenticalAmount(null);
|
|
|
|
|
payTwoOrder.setAnticipateNum(NumberUtil.div(payTwoOrder.getAmount(), BigDecimal.valueOf(amount)).longValue());
|
|
|
|
|
payTwoOrder.setStatus(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
payTwoOrder.setPayTime(DateUtil.date());
|
|
|
|
|
PayTwoOrder save = payTwoOrderRepository.save(payTwoOrder);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(save)) {
|
|
|
|
|
JSONObject jsonObject = requestCore.savePayTwoOrder(save);
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject.get("code")) {
|
|
|
|
|
log.error("==========免费开通订单同步,同步到聚石塔错误,{}", jsonObject);
|
|
|
|
|
return new CommonResult<>().error("同步错误");
|
|
|
|
|
}
|
|
|
|
|
return CommonResult.successfulOperation();
|
|
|
|
|
}
|
|
|
|
|
log.error("+++++++++++++免费开通同步淘宝历史订单,保存订单失败,{}", save);
|
|
|
|
|
return new CommonResult<>().error("保存订单失败");
|
|
|
|
|
}
|
|
|
|
|
}
|