|
@@ -49,9 +49,10 @@ public class PayServiceImpl implements PayService {
|
|
*/
|
|
*/
|
|
String merNo = "10001720";
|
|
String merNo = "10001720";
|
|
|
|
|
|
|
|
+ JsonModel model = JsonModel.newInstance();
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public JsonModel checkoutCounter(Integer orderId) {
|
|
public JsonModel checkoutCounter(Integer orderId) {
|
|
- JsonModel model = JsonModel.newInstance();
|
|
|
|
if (null == orderId) {
|
|
if (null == orderId) {
|
|
return model.error("参数异常");
|
|
return model.error("参数异常");
|
|
}
|
|
}
|
|
@@ -87,7 +88,6 @@ public class PayServiceImpl implements PayService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public synchronized JsonModel pay(Payment payment, HttpServletRequest request) {
|
|
public synchronized JsonModel pay(Payment payment, HttpServletRequest request) {
|
|
- JsonModel model = JsonModel.newInstance();
|
|
|
|
JSONObject result = null;
|
|
JSONObject result = null;
|
|
OrderVo order = payDao.findOrder(payment.getOrderId());
|
|
OrderVo order = payDao.findOrder(payment.getOrderId());
|
|
if (null == order) {
|
|
if (null == order) {
|
|
@@ -238,6 +238,8 @@ public class PayServiceImpl implements PayService {
|
|
//(收款买家)收款状态:1待收款、2部分收款、3已收款
|
|
//(收款买家)收款状态:1待收款、2部分收款、3已收款
|
|
order.setReceiptStatus("2");
|
|
order.setReceiptStatus("2");
|
|
}
|
|
}
|
|
|
|
+ //更新付款次数
|
|
|
|
+ order.setPaySuccessCounter(order.getPaySuccessCounter() + 1);
|
|
payDao.updateSelective(order);
|
|
payDao.updateSelective(order);
|
|
//修改支付链接状态
|
|
//修改支付链接状态
|
|
OrderPayLinkVo orderPayLink = payDao.findOrderPayLink(order.getOrderID(), amount);
|
|
OrderPayLinkVo orderPayLink = payDao.findOrderPayLink(order.getOrderID(), amount);
|
|
@@ -289,7 +291,6 @@ public class PayServiceImpl implements PayService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public JsonModel payLink(OrderPayLinkVo orderPayLink) {
|
|
public JsonModel payLink(OrderPayLinkVo orderPayLink) {
|
|
- JsonModel model = JsonModel.newInstance();
|
|
|
|
if (null == orderPayLink) {
|
|
if (null == orderPayLink) {
|
|
return model.error("参数异常");
|
|
return model.error("参数异常");
|
|
}
|
|
}
|
|
@@ -360,4 +361,16 @@ public class PayServiceImpl implements PayService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public JsonModel payWhetherSuccess(Integer orderId, Integer paySuccessCounter) {
|
|
|
|
+ OrderVo order = payDao.findOrder(orderId);
|
|
|
|
+ if (order.getPaySuccessCounter().equals(paySuccessCounter)) {
|
|
|
|
+ return model.error(-2, "支付失败");
|
|
|
|
+ } else if (order.getPaySuccessCounter() > paySuccessCounter) {
|
|
|
|
+ return model.success("支付成功");
|
|
|
|
+ } else {
|
|
|
|
+ return model.error("支付异常>>>>>>>" + order);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|