|
@@ -4,6 +4,8 @@ import java.math.BigDecimal;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
|
+import cn.hutool.db.sql.Order;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.utils.DateUtils;
|
|
import com.fs.common.utils.DateUtils;
|
|
import com.fs.company.constant.PaymentStatus;
|
|
import com.fs.company.constant.PaymentStatus;
|
|
@@ -17,6 +19,7 @@ import com.fs.company.mapper.CompanyRechargeOrderMapper;
|
|
import com.fs.company.service.CompanyRechargeOrderService;
|
|
import com.fs.company.service.CompanyRechargeOrderService;
|
|
import com.fs.company.vo.CompanyRechargeExportVO;
|
|
import com.fs.company.vo.CompanyRechargeExportVO;
|
|
import com.fs.company.vo.CompanyRechargeVO;
|
|
import com.fs.company.vo.CompanyRechargeVO;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import com.fs.company.mapper.CompanyRechargeMapper;
|
|
import com.fs.company.mapper.CompanyRechargeMapper;
|
|
@@ -31,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
* @author fs
|
|
* @author fs
|
|
* @date 2021-10-04
|
|
* @date 2021-10-04
|
|
*/
|
|
*/
|
|
|
|
+@Slf4j
|
|
@Service
|
|
@Service
|
|
public class CompanyRechargeServiceImpl implements ICompanyRechargeService
|
|
public class CompanyRechargeServiceImpl implements ICompanyRechargeService
|
|
{
|
|
{
|
|
@@ -153,9 +157,13 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
|
|
private CompanyRechargeOrderMapper companyRechargeOrderMapper;
|
|
private CompanyRechargeOrderMapper companyRechargeOrderMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public R payNotify(String orderNo,String transactionId) {
|
|
|
|
|
|
+ public synchronized R payNotify(String orderNo,String transactionId) {
|
|
CompanyRechargeOrder order = companyRechargeOrderMapper.selectByOrderNo(orderNo);
|
|
CompanyRechargeOrder order = companyRechargeOrderMapper.selectByOrderNo(orderNo);
|
|
|
|
|
|
|
|
+ if(ObjectUtil.equal(order.getPayStatus(),PaymentStatus.SUCCESS.getCode())){
|
|
|
|
+ log.info("订单已支付!重复付款 {} {}", orderNo,transactionId);
|
|
|
|
+ R.ok();
|
|
|
|
+ }
|
|
//修改状态
|
|
//修改状态
|
|
order.setPayStatus(PaymentStatus.SUCCESS.getCode());
|
|
order.setPayStatus(PaymentStatus.SUCCESS.getCode());
|
|
order.setTransactionId(transactionId);
|
|
order.setTransactionId(transactionId);
|