Merge remote-tracking branch 'origin/develop' into develop

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.6.5.SNAPSHOT</version>
+            <version>2.7.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/readme.md

@@ -92,4 +92,5 @@
 | 2.0.24-SNAPSHOT| 农工商添加设备号 | 梁崇福 | 2020-11-09 |
 | 2.1.3-SNAPSHOT| redis工具类添加解锁方法 | 刘鹏飞 | 2020-11-10 |
 | 2.1.6-SNAPSHOT| 升级ordercenter-sdk   | lixixoaer | 2020-11-10 |
-| 2.1.7-SNAPSHOT|  混合支付退款   | lixixoaer | 2020-11-11 |
\ No newline at end of file
+| 2.1.7-SNAPSHOT|  混合支付退款   | lixixoaer | 2020-11-11 |
+| 2.1.8-SNAPSHOT|  退款增加自动退款配置的null判断   | 刘鹏飞 | 2020-11-12 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -557,7 +557,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
      */
     private OrderTaskReq setAfterSalesOrderTimeOutTask(StoreResponse.Configuration configuration) {
 
-        if(configuration != null && (configuration.getTimeTypeOfRefund() != null && 2 == configuration.getTimeTypeOfRefund().intValue()) || configuration.getTimeTypeOfRefund() == null){// 48小时之后
+        if(configuration == null ){
+            return null;
+        }
+
+        if((configuration.getTimeTypeOfRefund() != null && 2 == configuration.getTimeTypeOfRefund().intValue()) || configuration.getTimeTypeOfRefund() == null){// 48小时之后
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(4);
             orderTask.setTimeout(1);
@@ -571,7 +575,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             orderTask.setProcessingTime(DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
 
             return orderTask;
-        }else if(configuration != null && configuration.getTimeTypeOfRefund() != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
+        }else if(configuration.getTimeTypeOfRefund() != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(4);
             orderTask.setTimeout(1);

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.7-SNAPSHOT</version>
+            <version>2.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.6.5.SNAPSHOT</version>
+            <version>2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -104,22 +104,22 @@ public class OrderController {
 
     /**
      * 订单支付成功后通知
-
+     */
     @ApiAnnotation(logMessage = "paySuccessCallback")
     @PostMapping("/paySuccessCallback")
     public String paySuccessCallback(@LogParams @RequestBody PaysuccessNoticeMessage message) {
         return orderAdapterService.paySuccessCallback(message);
     }
-     */
+
     /**
      * 订单支付成功后通知
-
+     */
     @ApiAnnotation(logMessage = "newPaySuccessCallback")
     @PostMapping({"/newPaySuccessCallback","/openStoreQueryPaymentCallback"})
     public String newPaySuccessCallback(@LogParams @RequestBody NewPaysuccessNoticeMessage message) {
         return orderservice.newPaySuccessCallback(message);
     }
-     */
+
     /**
      * 麦咖啡订单支付成功后通知
      */

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

@@ -157,12 +157,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             }
             return orderService.createOrderNew(createOrderVo);
         } catch (Exception e) {
-            log.error("创建订单失败,trackingNo:{}", LogTreadLocal.getTrackingNo());
+            throw e;
         } finally {
-            LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
+            //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
         }
-
-        return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR);
     }
 
 

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

@@ -47,6 +47,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
+import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.*;
 import cn.freemud.service.thirdparty.*;
@@ -135,7 +136,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.util.StringUtil;
 
@@ -258,8 +258,6 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private PaymentApplicationClient paymentApplicationClient;
     @Autowired
-    private RedisTemplate redisTemplate;
-    @Autowired
     private MulitiPaymentClient mulitiPaymentClient;
 
     @Autowired

order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java

 package cn.freemud.service.impl;
 
-import cn.freemud.service.thirdparty.MulitiPaymentClient;
+import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
 import org.junit.Test;

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

@@ -5,7 +5,7 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
-import cn.freemud.management.thirdparty.MulitiOrderPaymentClient;
+import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.management.util.RedisUtil;
 import cn.freemud.redis.RedisCache;
 import com.freemud.application.sdk.api.base.BaseResponse;
@@ -53,7 +53,7 @@ public class PaymentHandle {
     @Autowired
     private OrderSdkService orderSdkService;
     @Autowired
-    private MulitiOrderPaymentClient mulitiOrderPaymentClient;
+    private MulitiPaymentClient mulitiPaymentClient;
     @Autowired
     private RedisCache redisCache;
     /**
@@ -145,7 +145,7 @@ public class PaymentHandle {
     public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
         PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
         MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean);
-        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponse = mulitiOrderPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
+        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> 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);
         }

order-management/src/main/java/cn/freemud/management/thirdparty/MulitiOrderPaymentClient.java

-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @Title: OrderClient
- * @Package cn.freemud.service.thirdparty
- * @Description:
- * @author: liming.guo
- * @date: 2018/8/10 16:06
- * @version V1.0
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-package cn.freemud.management.thirdparty;
-
-
-import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
-import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@FeignClient(name = "payment-center-application-api",url = "${saas.paymentcenter.application.api.feign.url}")
-@RequestMapping(produces = {"application/json;charset=UTF-8"})
-public interface MulitiOrderPaymentClient {
-
-    /**
-     * 统一活动查询接口
-     */
-    @PostMapping("/payment/application/refund")
-    MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, @RequestHeader("partnerId") String partnerId);
-
-}

order-application-service/src/main/java/cn/freemud/service/thirdparty/MulitiPaymentClient.java → order-management/src/main/java/cn/freemud/management/thirdparty/MulitiPaymentClient.java

@@ -10,7 +10,7 @@
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-package cn.freemud.service.thirdparty;
+package cn.freemud.management.thirdparty;
 
 
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;