Merge branch 'feature-dict-mall-order-setting' into developer

haoban-manage3-wx/pom.xml

@@ -230,6 +230,23 @@
             <artifactId>haoban-app-customer-api</artifactId>
             <version>${haoban-app-customer-api}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-mall-api</artifactId>
+            <version>${gic-mall-api}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-codec</artifactId>
+                    <groupId>commons-codec</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
     <build>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/DictController.java

 package com.gic.haoban.manage.web.controller;
 
+import com.gic.api.base.commons.RpcResult;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -7,6 +8,8 @@ import com.gic.haoban.manage.api.dto.DictDTO;
 import com.gic.haoban.manage.api.service.DictApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.DictVo;
+import com.gic.mall.api.service.MallSettingService;
+import com.gic.mall.api.vo.MallOrderSettingVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Created 2020/3/26.
@@ -25,17 +29,38 @@ public class DictController extends WebBaseController {
 
     @Autowired
     private DictApiService dictApiService;
+    @Autowired
+    private MallSettingService mallSettingService;
 
     @RequestMapping("/dict-list")
-    public HaobanResponse queryDictList(String dictKeys) {
+    public HaobanResponse queryDictList(String dictKeys, String enterpriseId) {
         if (StringUtils.isBlank(dictKeys)) {
             return resultResponse(HaoBanErrCode.ERR_5);
         }
         String[] split = dictKeys.split(",");
         List<DictDTO> ret = dictApiService.queryList(Arrays.asList(split));
+        // 添加订单提现说明
+        addOrderAfterSaleTimeDict(enterpriseId, ret);
         return resultResponse(HaoBanErrCode.ERR_1, EntityUtil.changeEntityListByOrika(DictVo.class, ret));
     }
 
+    private void addOrderAfterSaleTimeDict(String enterpriseId, List<DictDTO> ret) {
+        String orderAfterSaleTimeKey = "order_after_sale_time";
+        RpcResult<MallOrderSettingVo> orderSetting = mallSettingService.queryOrderSetting(enterpriseId);
+        int day;
+        if (Objects.isNull(orderSetting) || Objects.isNull(orderSetting.getData())) {
+            // 默认7
+            day = 7;
+        } else {
+            day =  orderSetting.getData().getAfterSaleTime();
+        }
+        DictDTO dictDTO = new DictDTO();
+        dictDTO.setDictName("提现说明");
+        dictDTO.setDictKey(orderAfterSaleTimeKey);
+        dictDTO.setDictContent(String.format("订单确认收货后%s天可以提现", day));
+        ret.add(dictDTO);
+    }
+
     /**
      * 根据key查询一条数据
      *

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -87,4 +87,6 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.WxApplicationApiService"
 					 id="wxApplicationApiService"/>
 
+	<dubbo:reference id="mallSettingService" interface="com.gic.mall.api.service.MallSettingService" timeout="10000" retries="0" check="false"/>
+
 </beans>