|
|
@@ -6,6 +6,7 @@ import com.caimei.model.dto.PayVipDto;
|
|
|
import com.caimei.utils.RequestUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
+import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@@ -76,7 +77,7 @@ public class PayApi {
|
|
|
@ApiOperation("开通认证通会员-支付宝线上支付")
|
|
|
@PostMapping("/auth/vip/alipay")
|
|
|
public ResponseJson<String> payAuthVipByAlipay(@RequestBody Map<String,Object> param) throws Exception {
|
|
|
- String url = core + "/order/pay/auth/vip/alipay";
|
|
|
+ String url = core + "/order/pay/auth/vip/scan";
|
|
|
String result = RequestUtil.sendPost(url, param);
|
|
|
return getResponseJson(result);
|
|
|
}
|
|
|
@@ -119,10 +120,13 @@ public class PayApi {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("查询本次支付订单结果")
|
|
|
- @ApiImplicitParam(required = false, name = "mbOrderId", value = "平台唯一流水号")
|
|
|
+ @ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(required = false, name = "mbOrderId", value = "平台唯一流水号"),
|
|
|
+ @ApiImplicitParam(required = false, name = "orderFlag", value = "订单标识：0非订单，1订单")
|
|
|
+ })
|
|
|
@GetMapping("/result/json")
|
|
|
- public ResponseJson<String> getPayOrderResult(String mbOrderId) throws Exception {
|
|
|
- String url = core + "/order/pay/result/json?mbOrderId=" + mbOrderId;
|
|
|
+ public ResponseJson<String> getPayOrderResult(String mbOrderId,Integer orderFlag) throws Exception {
|
|
|
+ String url = core + "/order/pay/result/json?mbOrderId=" + mbOrderId + "&orderFlag=" + orderFlag;
|
|
|
String result = RequestUtil.sendGet(url);
|
|
|
return getResponseJson(result);
|
|
|
}
|
Aslee