Merge branch 'develop' of…

Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

 Conflicts:
	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.2.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1196,7 +1196,7 @@ public class OrderSdkAdapter {
         if (CollectionUtils.isNotEmpty(orderInfoReqs.getOrderPayItemCreateReqList())) {
             data.setOrderPayItem(this.getOrderItemPayList(orderInfoReqs.getOrderPayItemCreateReqList()));
         }
-
+        data.setPayChannelType(orderInfoReqs.getPayChannelType());
         //订单类型回传
         if (orderInfoReqs.getMarketingType() != null) {
             data.setMarketingType(ClassUtils.toByte(orderInfoReqs.getMarketingType()));

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -44,7 +44,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @EnableSwagger2
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud", "com.freemud"})
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3754,4 +3754,22 @@ public class OrderAdapter {
         }
         return responseDto;
     }
+
+
+    public MultiOrderRefundRequest getMultiOrderPayRefundRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, Long refundId) {
+        MultiOrderRefundRequest multiQueryRequest = new MultiOrderRefundRequest();
+        multiQueryRequest.setStationId("1");
+        multiQueryRequest.setPartnerId(orderBean.getCompanyId());
+        multiQueryRequest.setStoreId(orderBean.getShopId());
+        multiQueryRequest.setFmId("");
+        multiQueryRequest.setRefundAmount(orderBean.getAmount());
+        multiQueryRequest.setRefundTradeNo(String.valueOf(refundId));
+        multiQueryRequest.setStoreId(orderBean.getShopId());
+        multiQueryRequest.setNotifyUrl(refundNotifyCallback);
+        multiQueryRequest.setVer("V1");
+        multiQueryRequest.setVer3(false);
+        multiQueryRequest.setOutOrderNo(orderBean.getOid());
+        return multiQueryRequest;
+    }
+
 }

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

@@ -157,6 +157,8 @@ public class OrderServiceImpl implements Orderservice {
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
 
+    public final static String RESPONSE_SUCCESS_STR = "100";
+
     private static Gson gson = new Gson();
 
     @Value("${saas.reverseNotifyiDcUrl}")
@@ -1753,7 +1755,7 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         int state = PayRefundStatus.SUCCESS.getCode();
         if (orderBean.getAmount() != 0) {
-            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
                 //调用支付退款
                 MultiOrderRefundRequest multiOrderRefundRequest = orderAdapter.getMultiOrderPayRefundRequest(orderBean, refundId);
                 MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.9-SNAPSHOT</version>
+            <version>2.2.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -177,12 +177,6 @@
             <version>2.7.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>cn.freemud</groupId>
-            <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.9-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -142,20 +142,19 @@ public class PaymentHandle {
         return payRefundResponse;
     }
 
-    public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
-        PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
+    public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
         MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean);
-        MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
+        MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, orderBean.getCompanyId());
         if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
             throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
         }
         List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
         refundPlatformResponseList = refundPlatformResponseList.stream().filter(m -> !m.getEbcode().equalsIgnoreCase("10102")).collect(Collectors.toList());
-        if(null != refundPlatformResponseList && refundPlatformResponseList.size()>0){
-            redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
+        if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
+            redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
         }
 
-        return handlePayRefundResponse(refundStatus,multiOrderRefundRequest.getRefundTradeNo());
-        return null;
+        return handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
     }
 }

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -128,7 +128,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
                 refundResponse = paymentHandle.multiRefund(orderBean);
             }else{
                 refundResponse = paymentHandle.refund(request, orderBean);
@@ -162,7 +162,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
                 refundResponse = paymentHandle.multiRefund(orderBean);
             }else{
                 refundResponse = paymentHandle.refund(request, orderBean);