update

src/main/java/com/gogirl/application/order/mall/impl/MallOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.gogirl.domain.product.mall.MallProduct;
 import com.gogirl.domain.user.customer.Customer;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.SpringBeanUtils;
+import com.gogirl.infrastructure.common.util.SpringContextHolder;
 import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderAddressMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
@@ -78,7 +79,6 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
                 .selectBatchIds(settleMallOrderItemQryList.stream()
                         .map(SettleMallOrderItemQuery::getProductId)
                         .collect(Collectors.toList()));
-
         List<MallOrderDetailDTO> mallOrderDTODetailList = productList.stream()
                 .map(product -> {
 
@@ -190,6 +190,9 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         if (mallOrder.getTransportMode().equals(1)) {
             //运输设置运费
             mallOrder.setFreight(mallOrder.getTotalAmount().compareTo(new BigDecimal(100)) > 0 ? new BigDecimal("0.00") : new BigDecimal("6.00"));
+            if (!SpringContextHolder.getActiveProfile().equals("prod")) {
+                mallOrder.setFreight(BigDecimal.ZERO);
+            }
         } else {
             mallOrder.setFreight(BigDecimal.ZERO);
             if (!StringUtils.isPhone(mallOrder.getSelfTakePhone())) {
@@ -280,6 +283,9 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         if (mallOrder.getTransportMode().equals(1)) {
             //运输设置运费
             mallOrder.setFreight(mallOrder.getTotalAmount().compareTo(new BigDecimal(100)) > 0 ? new BigDecimal("0.00") : new BigDecimal("6.00"));
+            if (!SpringContextHolder.getActiveProfile().equals("prod")) {
+                mallOrder.setFreight(BigDecimal.ZERO);
+            }
         } else {
             mallOrder.setFreight(BigDecimal.ZERO);
             if (!StringUtils.isPhone(mallOrder.getSelfTakePhone())) {

src/main/java/com/gogirl/infrastructure/common/util/SpringContextHolder.java

+package com.gogirl.infrastructure.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/6/10 11:27 上午
+ */
+
+@Slf4j
+public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
+
+    private static ApplicationContext applicationContext = null;
+
+    /**
+     * 取得存储在静态变量中的ApplicationContext.
+     */
+    public static ApplicationContext getApplicationContext() {
+        assertContextInjected();
+        return applicationContext;
+    }
+
+    /**
+     * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
+     */
+    public static <T> T getBean(String name) {
+        assertContextInjected();
+        return (T) applicationContext.getBean(name);
+    }
+
+    /**
+     * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
+     */
+    public static <T> T getBean(Class<T> requiredType) {
+        assertContextInjected();
+        return applicationContext.getBean(requiredType);
+    }
+
+    /**
+     * 检查ApplicationContext不为空.
+     */
+    private static void assertContextInjected() {
+        if (applicationContext == null) {
+            throw new IllegalStateException("applicaisetApplicationContexttonContext属性未注入, 请在applicationContext" +
+                    ".xml中定义SpringContextHolder或在SpringBoot启动类中注册SpringContextHolder.");
+        }
+    }
+
+    /**
+     * 获取当前环境
+     *
+     * @return
+     */
+    public static String getActiveProfile() {
+        return applicationContext.getEnvironment().getActiveProfiles()[0];
+    }
+
+    /**
+     * 清除SpringContextHolder中的ApplicationContext为Null.
+     */
+    public static void clearHolder() {
+        log.debug("清除SpringContextHolder中的ApplicationContext:"
+                + applicationContext);
+        applicationContext = null;
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        SpringContextHolder.clearHolder();
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        if (SpringContextHolder.applicationContext != null) {
+            log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
+        }
+        SpringContextHolder.applicationContext = applicationContext;
+    }
+}
+

src/main/java/com/gogirl/infrastructure/config/GlobalCorsConfig.java → src/main/java/com/gogirl/infrastructure/config/config/GlobalCorsConfig.java

-package com.gogirl.infrastructure.config;
+package com.gogirl.infrastructure.config.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/gogirl/infrastructure/config/MvcInterceptorConfig.java → src/main/java/com/gogirl/infrastructure/config/config/MvcInterceptorConfig.java

-package com.gogirl.infrastructure.config;
+package com.gogirl.infrastructure.config.config;
 
 import com.gogirl.infrastructure.interceptor.AuthHandlerInterceptor;
 import com.gogirl.infrastructure.interceptor.LoginHandlerInterceptor;

src/main/java/com/gogirl/infrastructure/config/MybatisPlusConfig.java → src/main/java/com/gogirl/infrastructure/config/config/MybatisPlusConfig.java

-package com.gogirl.infrastructure.config;
+package com.gogirl.infrastructure.config.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

src/main/java/com/gogirl/infrastructure/config/Swagger2Config.java → src/main/java/com/gogirl/infrastructure/config/config/Swagger2Config.java

-package com.gogirl.infrastructure.config;
+package com.gogirl.infrastructure.config.config;
 
 
 import org.springframework.context.annotation.Bean;

src/main/java/com/gogirl/infrastructure/config/WxMaConfiguration.java → src/main/java/com/gogirl/infrastructure/config/config/WxMaConfiguration.java

-package com.gogirl.infrastructure.config;
+package com.gogirl.infrastructure.config.config;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

src/main/java/com/gogirl/infrastructure/config/WxPayConfiguration.java → src/main/java/com/gogirl/infrastructure/config/config/WxPayConfiguration.java

-package com.gogirl.infrastructure.config;
+package com.gogirl.infrastructure.config.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;

src/main/java/com/gogirl/infrastructure/config/property/GogirlProperties.java

@@ -64,4 +64,5 @@ public class GogirlProperties {
     private String adminBackendAchievementsUrl;
 
     private String enterpriseWechatWebhook;
+
 }