Explorar el Código

Merge remote-tracking branch 'origin/photo' into private_deployment

private_deployment
xmzhao71 hace 1 año
padre
commit
d7c50ddb57
Se han modificado 3 ficheros con 15 adiciones y 9 borrados
  1. +2
    -1
      suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java
  2. +2
    -2
      suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java
  3. +11
    -6
      suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java

+ 2
- 1
suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java Ver fichero

@@ -220,8 +220,9 @@ public class ProductOrderController extends BaseController {


ResultData resultData = productOrderPayService.handleProductOrderByQuery(appinfo,payAccount,orderPay,payAdapterService); ResultData resultData = productOrderPayService.handleProductOrderByQuery(appinfo,payAccount,orderPay,payAdapterService);
} }
ProductOrder order = productOrderService.getById(orderId);


return new ResultData(orderPay);
return new ResultData(order);
} }






+ 2
- 2
suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java Ver fichero

@@ -168,7 +168,7 @@ public class ProductOrderPayServiceImpl implements ProductOrderPayService {
return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), payResult.getMsg(), payResult.getData()); return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), payResult.getMsg(), payResult.getData());
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
logger.error("创建支付单异常 ",e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(),"支付订单异常"); return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(),"支付订单异常");
} }
} }
@@ -204,7 +204,7 @@ public class ProductOrderPayServiceImpl implements ProductOrderPayService {
return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(),"支付单状态异常"); return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(),"支付单状态异常");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
logger.error("查询支付单异常 ",e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage());
} }
return new ResultData(); return new ResultData();


+ 11
- 6
suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java Ver fichero

@@ -1,5 +1,6 @@
package com.iformall.service.pay.service.pay.ali.page; package com.iformall.service.pay.service.pay.ali.page;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient; import com.alipay.api.AlipayClient;
@@ -62,7 +63,9 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement
//电脑网站支付场景固定传值FAST_INSTANT_TRADE_PAY //电脑网站支付场景固定传值FAST_INSTANT_TRADE_PAY
bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY");


bizContent.put("qr_pay_mode",1);
bizContent.put("qr_pay_mode",4);
bizContent.put("qrcode_width",300);



String after15 = DateUtils.date2String(DateUtils.getSecondsTimeAfter(15 * 60, new Date())); String after15 = DateUtils.date2String(DateUtils.getSecondsTimeAfter(15 * 60, new Date()));


@@ -71,13 +74,15 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement
request.setBizContent(bizContent.toString()); request.setBizContent(bizContent.toString());
try{ try{
AlipayTradePagePayResponse response = alipayClient.pageExecute(request); AlipayTradePagePayResponse response = alipayClient.pageExecute(request);
log.info("创建支付返回{}"+ JSON.toJSONString(response));
PayAdapterResult par = new PayAdapterResult(); PayAdapterResult par = new PayAdapterResult();
if(response.isSuccess()){ if(response.isSuccess()){
if("10000".equals(response.getCode())){
par.setSuccess(true);
par.setTransactionId(response.getTradeNo());
par.setData(response);
}

par.setSuccess(true);
par.setTransactionId(response.getTradeNo());
par.setData(response);
return par;

} }
par.setSuccess(false); par.setSuccess(false);
par.setMsg(response.getMsg()); par.setMsg(response.getMsg());


Cargando…
Cancelar
Guardar