|
|
@@ -68,6 +68,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.checkerframework.checker.units.qual.A;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.aop.framework.AopContext;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.fs.course.mapper.FsUserVipOrderMapper;
|
|
|
@@ -257,8 +258,8 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
|
|
|
}
|
|
|
|
|
|
if (order.getPayMoney().compareTo(new BigDecimal(0)) <= 0) {
|
|
|
- this.payConfirm(order.getOrderCode(),"","","",2,null,null);
|
|
|
- handleVipPurchaseCallback(param.getUserId(),order.getPackageId(),order.getOrderId());
|
|
|
+ IFsUserVipOrderService vipOrderService = (IFsUserVipOrderService) AopContext.currentProxy();
|
|
|
+ vipOrderService.payConfirm(order.getOrderCode(),"","","",2,null,null);
|
|
|
return R.ok().put("isPay",1);
|
|
|
}
|
|
|
|
|
|
@@ -474,7 +475,8 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
|
|
|
|
|
|
if(user!=null&& StringUtils.isNotEmpty(openId)) {
|
|
|
if (order.getPayMoney().compareTo(new BigDecimal(0)) == 0) {
|
|
|
- this.payConfirm(order.getOrderCode(), "", "", "", 2,null,null);
|
|
|
+ IFsUserVipOrderService vipOrderService = (IFsUserVipOrderService) AopContext.currentProxy();
|
|
|
+ vipOrderService.payConfirm(order.getOrderCode(), "", "", "", 2,null,null);
|
|
|
return R.ok().put("isPay", 1);
|
|
|
} else {
|
|
|
String payCode = OrderCodeUtils.getOrderSn();
|
|
|
@@ -704,7 +706,8 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
|
|
|
}
|
|
|
}
|
|
|
else{
|
|
|
- this.payConfirm(order.getOrderCode(),"","","",2,null,null);
|
|
|
+ IFsUserVipOrderService vipOrderService = (IFsUserVipOrderService) AopContext.currentProxy();
|
|
|
+ vipOrderService.payConfirm(order.getOrderCode(),"","","",2,null,null);
|
|
|
return R.ok().put("isPay",1);
|
|
|
}
|
|
|
}
|