Merge branch 'feature/20210323-添加是否可退款配置-张志恒'

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

@@ -15,6 +15,7 @@ package cn.freemud.adapter;
 import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.CustomerScoreConstant;
+import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
@@ -48,9 +49,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerConfig;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
+import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
 import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
@@ -128,6 +131,10 @@ public class OrderAdapter {
     private String withOrderBuyCardId;
     @Value("${mccafe.universal.coupon.code}")
     private String withOrderBuyCouponCode;
+    @Value("${pay.turnoff.refund}")
+    private String payTurnoffRefund = "0";
+    @Value("${pay.turnoff.refund.partnerId}")
+    private String payTurnoffRefundPartnerId = "0";
 
     /**
      * coco商户
@@ -159,11 +166,14 @@ public class OrderAdapter {
     @Autowired
     private OrderSdkAdapter orderSdkAdapter;
 
-    /**
-     * @param createOrderVo
-     * @param shoppingCartGoodsDto
-     * @return
-     */
+    @Autowired
+    private AssortmentOpenPlatformPartnerConfigManager assortmentOpenPlatformPartnerConfigManager;
+
+        /**
+         * @param createOrderVo
+         * @param shoppingCartGoodsDto
+         * @return
+         */
     public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,StoreResponse.BizVO storeResponseDto) {
 //        UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
         BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
@@ -1419,6 +1429,7 @@ public class OrderAdapter {
             responseVo.setProgress(ordersBean.getProgress());
             responseVo.setQueueIndex(ordersBean.getQueueIndex());
             responseVo.setOrderProgressBarStatus(ordersBean.getOrderProgressBarStatus());
+            responseVo.setPayTurnoffRefund(getPayTurnoffRefund());
             list.add(responseVo);
         });
         return list;
@@ -4115,4 +4126,19 @@ public class OrderAdapter {
         }
         return "下单成功";
     }
+
+    /**
+     * 获取是否支持订单退款
+     */
+    public String getPayTurnoffRefund(){
+        try {
+            AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey(payTurnoffRefundPartnerId,RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1);
+            if (null != assortmentOpenPlatformPartnerConfig) {
+                payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
+            }
+        }catch (Exception e){
+            log.error("getPayTurnoffRefund error:{}", e.getMessage());
+        }
+        return payTurnoffRefund;
+    }
 }

order-application-service/src/main/java/cn/freemud/constant/RedisKeyConstant.java

@@ -69,6 +69,16 @@ public class RedisKeyConstant {
      */
     public final static String KGD_SENDPOINT_ORDERID = "kgd:sendpoint:orderid:";
 
+    /**
+     * 支付是否可以退款前缀
+     */
+    public final static String SAAS_ORDER_PAYMENT_PARTNERKEY_ = "saas:order:payment:partnerkey_";
+
+    /**
+     * 支付是否可以退款后缀
+     */
+    public final static String PARTNER_PAY_TURNOFF_REFUND = "partner_pay_turnoff_refund";
+
 
     private final static String REDIS_KEY_SEP = ":";
 

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -167,6 +167,11 @@ public class QueryOrderResponseVo {
      * 是否展示进度条
      */
     private Integer orderProgressBarStatus ;
+
+    /**
+     * 是否支持退款
+     */
+    private String payTurnoffRefund ;
     /**
      * 申请退款按钮
      */

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

 package cn.freemud.service.impl;
 
+import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
+import cn.freemud.redis.RedisCache;
 import cn.freemud.service.delivery.ThirdDeliveryServiceImpl;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformConfig;
+import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerConfig;
+import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformConfigManager;
+import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
+import org.apache.commons.lang.StringUtils;
 import org.hibernate.validator.HibernateValidator;
 import org.hibernate.validator.HibernateValidatorConfiguration;
 import org.junit.Test;
@@ -37,7 +45,7 @@ import java.util.Set;
 public class MallOrderServiceImplTest {
 
     @Autowired
-    private ThirdDeliveryServiceImpl thirdDeliveryServiceImpl;
+    private AssortmentOpenPlatformPartnerConfigManager assortmentOpenPlatformPartnerConfigManager;
 
 //    @Autowired
 //    private MallOrderServiceImpl mallOrderService;
@@ -106,8 +114,15 @@ public class MallOrderServiceImplTest {
 
     @Test
     public void test() {
-        thirdDeliveryServiceImpl.sendException("19828644895966012600001","异常单子测试","2021-01-22 00:00:00","");
-    }
-
+        String payTurnoffRefund = "0";
+        try {
+            AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey("0",RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1);
+            if (null != assortmentOpenPlatformPartnerConfig) {
+                payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
+            }
+        }catch (Exception e){
 
+        }
+        System.out.println(payTurnoffRefund);
+    }
 }