Commit 35c319b8 by ping.wu

扫脸支付修改

parent 09d25a80
...@@ -2173,7 +2173,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2173,7 +2173,6 @@ public class OrderServiceImpl implements Orderservice {
long totalAmount = 0; long totalAmount = 0;
int cardAmount = 0; int cardAmount = 0;
QueryOrdersResponse.DataBean.OrderBean orderBean = new QueryOrdersResponse.DataBean.OrderBean();
QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean(); QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();
QueryOrdersResponse.DataBean.OrderBean productBeanListOne = new QueryOrdersResponse.DataBean.OrderBean(); QueryOrdersResponse.DataBean.OrderBean productBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();
if (createOrderVo.getBuyMemberCard() != null && StringUtils.isNotEmpty(createOrderVo.getBuyMemberCard().getRuleId()) && StringUtils.isNotEmpty(createOrderVo.getBuyMemberCard().getPaidId())) { if (createOrderVo.getBuyMemberCard() != null && StringUtils.isNotEmpty(createOrderVo.getBuyMemberCard().getRuleId()) && StringUtils.isNotEmpty(createOrderVo.getBuyMemberCard().getPaidId())) {
...@@ -2201,7 +2200,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2201,7 +2200,7 @@ public class OrderServiceImpl implements Orderservice {
} }
fatherBeanListOne = createOrderFlowResponse.getData(); fatherBeanListOne = createOrderFlowResponse.getData();
productBeanListOne = createOrderFlowResponse.getData(); productBeanListOne = createOrderFlowResponse.getData();
totalAmount = orderBean.getAmount(); totalAmount = productBeanListOne.getAmount();
} }
response.setTotalAmount(totalAmount); response.setTotalAmount(totalAmount);
response.setCardAmount(cardAmount); response.setCardAmount(cardAmount);
...@@ -2224,7 +2223,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2224,7 +2223,7 @@ public class OrderServiceImpl implements Orderservice {
throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR); throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
} }
//唤起微信支付 //唤起微信支付
if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isNotBlank(createOrderVo.getFaceCode())) { if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount); orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount);
return orderPayResponse; return orderPayResponse;
} }
......
...@@ -26,7 +26,7 @@ public interface PaymentNewClient { ...@@ -26,7 +26,7 @@ public interface PaymentNewClient {
/** /**
* 扫脸支付 * 扫脸支付
*/ */
@PostMapping("/paymentcenter/face") @PostMapping("paymentcenter/facePay")
com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto); com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment