|
@@ -1,6 +1,5 @@
|
|
|
package com.poteviohealth.ym.ipos.service.impl;
|
|
package com.poteviohealth.ym.ipos.service.impl;
|
|
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
|
import com.poteviohealth.cgp.common.integrated.order.OrderFeignClient;
|
|
import com.poteviohealth.cgp.common.integrated.order.OrderFeignClient;
|
|
@@ -99,7 +98,6 @@ public class PaymentServiceImpl implements IPaymentService {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public VaultsResponse barcodeReverse(RefundReceive refundReceive) {
|
|
public VaultsResponse barcodeReverse(RefundReceive refundReceive) {
|
|
|
- log.info("refundReceive==="+ JSON.toJSONString(refundReceive));
|
|
|
|
|
PayReverse payReverse = new PayReverse();
|
|
PayReverse payReverse = new PayReverse();
|
|
|
payReverse.setPos_id(code);
|
|
payReverse.setPos_id(code);
|
|
|
payReverse.setStore_id(refundReceive.getOperatorId().toString());
|
|
payReverse.setStore_id(refundReceive.getOperatorId().toString());
|
|
@@ -116,10 +114,8 @@ public class PaymentServiceImpl implements IPaymentService {
|
|
|
return VaultsResponse.failed(e.getMessage());
|
|
return VaultsResponse.failed(e.getMessage());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(YmUtil.SUCCESS.equals(back.getResult().getId())){
|
|
|
|
|
- return VaultsResponse.success();
|
|
|
|
|
- }else if(YmUtil.FAIL.equals(back.getResult().getId())){
|
|
|
|
|
- return this.barcodeRefundQuery(refundReceive.getRefundId().toString(),refundReceive.getOperatorId().toString());
|
|
|
|
|
|
|
+ if(YmUtil.SUCCESS.equals(back.getResult().getId()) || YmUtil.FAIL.equals(back.getResult().getId())){
|
|
|
|
|
+ return VaultsResponse.success(back.getResult().getId());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return VaultsResponse.failed(back.getResult().getComment());
|
|
return VaultsResponse.failed(back.getResult().getComment());
|