|
|
|
@@ -7,10 +7,12 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.config.PayProperty; |
|
|
|
import com.iformall.domain.po.WxAppinfo; |
|
|
|
import com.iformall.domain.po.WxCUser; |
|
|
|
import com.iformall.domain.po.WxOrder; |
|
|
|
import com.iformall.domain.po.WxPayOrder; |
|
|
|
import com.iformall.enums.EnumPayStatus; |
|
|
|
import com.iformall.enums.EnumPayWay; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxOrderService; |
|
|
|
import com.iformall.service.WxPayOrderService; |
|
|
|
import com.iformall.utils.IPUtil; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -38,6 +40,9 @@ public class WxPayOrderController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxPayOrderService wxPayOrderService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxOrderService wxOrderService; |
|
|
|
|
|
|
|
@ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}") |
|
|
|
@RequestMapping(value = "/create", method = RequestMethod.POST) |
|
|
|
public ResultData _create(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws Exception { |
|
|
|
@@ -108,13 +113,17 @@ public class WxPayOrderController extends BaseController { |
|
|
|
payOrder.setOrderId(orderId); |
|
|
|
payOrder.setPayOrderStatus(status); |
|
|
|
payOrder.setFailReason(reasonStr); |
|
|
|
|
|
|
|
WxOrder order = null; |
|
|
|
|
|
|
|
try { |
|
|
|
if(status.equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()) && !payOrderIdStr.equals("0")) { |
|
|
|
// 前端提示支付成功, 不作为支付成功标志,只检查支付订单状态 |
|
|
|
// 有价券不走update, callback更新 |
|
|
|
payOrder = wxPayOrderService.getById(payOrderId); |
|
|
|
if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功"); |
|
|
|
order = wxOrderService.getById(orderId); |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功", order); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!"); |
|
|
|
} |
|
|
|
|