添加是否展示可退款字段

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

@@ -49,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;
@@ -160,11 +162,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);
@@ -4121,14 +4126,12 @@ public class OrderAdapter {
     /**
      * 获取是否支持订单退款
      */
-    public Integer getPayTurnoffRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
-        Integer payTurnoffRefund = 0;
+    public String getPayTurnoffRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
+        String payTurnoffRefund = "0";
         try {
-            String configValue = redisCache.getValue(RedisKeyConstant.SAAS_ORDER_PAYMENT_PARTNERKEY_ + orderBean.getCompanyId() + RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND1);
-            if (StringUtils.isNotEmpty(configValue)) {
-                log.info("getPayTurnoffRefund:{}", JSONObject.parseObject(configValue));
-                JSONObject jsonObject = JSONObject.parseObject(configValue);
-                payTurnoffRefund = StringUtils.isNotEmpty(jsonObject.getString("partnerValue")) ? 0 : Integer.valueOf(jsonObject.getString("partnerValue"));
+            AssortmentOpenPlatformPartnerConfig assortmentOpenPlatformPartnerConfig = assortmentOpenPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey(orderBean.getCompanyId(),RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1);
+            if (null != assortmentOpenPlatformPartnerConfig) {
+                payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
             }
         }catch (Exception e){
             log.error("getPayTurnoffRefund error:{}", e.getMessage());

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

@@ -77,7 +77,7 @@ public class RedisKeyConstant {
     /**
      * 支付是否可以退款后缀
      */
-    public final static String PARTNER_PAY_TURNOFF_REFUND1 = "partner_pay_turnoff_refund1";
+    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

@@ -171,7 +171,7 @@ public class QueryOrderResponseVo {
     /**
      * 是否支持退款
      */
-    private Integer payTurnoffRefund ;
+    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("2239",RedisKeyConstant.PARTNER_PAY_TURNOFF_REFUND,1);
+            if (null != assortmentOpenPlatformPartnerConfig) {
+                payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
+            }
+        }catch (Exception e){
 
+        }
+        System.out.println(payTurnoffRefund);
+    }
 }