Merge remote-tracking branch 'origin/master'

order-application-service/pom.xml

@@ -327,12 +327,12 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.9.9.RELEASE</version>
+            <version>2.9.10.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.6.RELEASE</version>
+            <version>2.6.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2715,6 +2715,7 @@ public class OrderServiceImpl implements Orderservice {
         request.setStationId("2");
         request.setOperatorId("2");
         request.setVer("2");
+        request.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
         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) {
             // 需要把2种特殊情况抛给用户
@@ -2863,6 +2864,7 @@ public class OrderServiceImpl implements Orderservice {
         request.setStationId("1");
         request.setOperatorId("1");
         request.setVer("2");
+        request.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
         SVCCardAmountRequest svcRequest = new SVCCardAmountRequest();
         svcRequest.setPartnerId(partnerId);
         svcRequest.setCardCodes(Arrays.asList(cardCode));