Commit 2c19cb51 by 张跃

svc支付添加优惠金额

parent 91b6c184
...@@ -327,12 +327,12 @@ ...@@ -327,12 +327,12 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>paymentcenter-sdk</artifactId> <artifactId>paymentcenter-sdk</artifactId>
<version>2.9.9.RELEASE</version> <version>2.9.8.SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-payment-sdk</artifactId> <artifactId>assortment-payment-sdk</artifactId>
<version>2.6.6.RELEASE</version> <version>2.6.8.SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
......
...@@ -3066,6 +3066,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3066,6 +3066,7 @@ public class OrderServiceImpl implements Orderservice {
request.setStationId("2"); request.setStationId("2");
request.setOperatorId("2"); request.setOperatorId("2");
request.setVer("2"); request.setVer("2");
request.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> responseBase = paymentNewService.codePay(request, trackingNo); com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> responseBase = paymentNewService.codePay(request, trackingNo);
if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode()) || responseBase.getData().getData() == null) { if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode()) || responseBase.getData().getData() == null) {
// 需要把2种特殊情况抛给用户 // 需要把2种特殊情况抛给用户
...@@ -3214,6 +3215,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3214,6 +3215,7 @@ public class OrderServiceImpl implements Orderservice {
request.setStationId("1"); request.setStationId("1");
request.setOperatorId("1"); request.setOperatorId("1");
request.setVer("2"); request.setVer("2");
request.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
SVCCardAmountRequest svcRequest = new SVCCardAmountRequest(); SVCCardAmountRequest svcRequest = new SVCCardAmountRequest();
svcRequest.setPartnerId(partnerId); svcRequest.setPartnerId(partnerId);
svcRequest.setCardCodes(Arrays.asList(cardCode)); svcRequest.setCardCodes(Arrays.asList(cardCode));
......
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