Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/QuartzEnum.java

@@ -14,7 +14,8 @@ public enum QuartzEnum {
     /**
      * 话务任务逾期提醒
      */
-    TEL_TASK_LATE_REMIND("telTaskLateRemind", "com.gic.haoban.task.manage.api.service.ITelTaskCallApiService", "telTaskLateRemind", "0 0 15 * * *", "-1");
+    TEL_TASK_LATE_REMIND("telTaskLateRemind", "com.gic.haoban.task.manage.api.service.ITelTaskCallApiService", "telTaskLateRemind", "0 0 15 * * *", "-1"),
+    TEL_TASK_INVALID_REMIND("telTaskInvalidRemind", "com.gic.haoban.task.manage.api.service.ITelTaskCallApiService", "telTaskInvalidRemind", "0 0 15 * * *", "-1");
     private String key;
     private String serviceName;
     private String method;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/PendingTaskApiService.java

@@ -23,6 +23,14 @@ public interface PendingTaskApiService {
      */
     public ServiceResponse<Boolean> addPendingTask(PendingTaskQDTO qdto);
 
+
+    /**
+     * 待办批量
+     *
+     * @param qdto
+     */
+    public ServiceResponse<Boolean> addPendingTaskBatch(List<PendingTaskQDTO> qdto);
+
     /**
      * 待办列表查询分页
      *
@@ -92,4 +100,13 @@ public interface PendingTaskApiService {
      */
     public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime);
 
+    /**
+     * 更新失效或者结束时间
+     *
+     * @param relationId
+     * @param endTime
+     * @return
+     */
+    public ServiceResponse<Boolean> updateInvalidTimeByBusinessId(String businessId, Date endTime);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PendingTaskMapper.java

@@ -4,6 +4,7 @@ import com.gic.haoban.manage.service.entity.TabPendingTask;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -76,4 +77,12 @@ public interface PendingTaskMapper {
      */
     public int deleteByRelationIds(@Param("enterpriseId") String enterpriseId, @Param("relationIds") List<String> relationIds);
 
+    /**
+     * 更新失效时间
+     *
+     * @param enterpriseId 企业id
+     * @return
+     */
+    public int updateInvalidTimeByBusinessId(@Param("businessId") String businessId, @Param("") Date invalidTime);
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/PendingTaskService.java

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.service.pojo.bo.PendingTaskBO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,5 +55,14 @@ public interface PendingTaskService {
      */
     public boolean deletePendingTask(List<String> relationIds);
 
+    /**
+     * 更新失效时间
+     *
+     * @param businessId
+     * @param time
+     * @return
+     */
+    public boolean updateInvalidTimeByBusinessId(String businessId, Date time);
+
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/PendingTaskServiceImpl.java

@@ -64,4 +64,10 @@ public class PendingTaskServiceImpl implements PendingTaskService {
         pendingTaskMapper.deleteByRelationIds(null, relationIds);
         return true;
     }
+
+    @Override
+    public boolean updateInvalidTimeByBusinessId(String businessId, Date time) {
+        pendingTaskMapper.updateInvalidTimeByBusinessId(businessId, time);
+        return true;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -44,6 +44,18 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         return ServiceResponse.success(true);
     }
 
+    @Override
+    public ServiceResponse<Boolean> addPendingTaskBatch(List<PendingTaskQDTO> qdto) {
+        //后续优化
+        if (CollectionUtils.isEmpty(qdto)) {
+            return ServiceResponse.success(true);
+        }
+
+        qdto.forEach(mid -> {
+            this.addPendingTask(mid);
+        });
+        return ServiceResponse.success(true);
+    }
 
     @Override
     public ServiceResponse<Page<PendingTaskDetailDTO>> pagePendingTask(PendingListQDTO listQDTO, BasePageInfo pageInfo) {
@@ -166,4 +178,10 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
         return ServiceResponse.success(b);
     }
+
+    @Override
+    public ServiceResponse<Boolean> updateInvalidTimeByBusinessId(String businessId, Date endTime) {
+        boolean b = pendingTaskService.updateInvalidTimeByBusinessId(businessId, endTime);
+        return ServiceResponse.success(b);
+    }
 }

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -255,7 +255,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_pending_task
-        where enterprise_id = #{enterpriseId} and store_id =#{storeId}
+        where enterprise_id = #{enterpriseId} and store_id =#{storeId} and task_status_flag=0
         <if test="finishFlag != -1">
             and finish_flag = #{finishFlag}
         </if>
@@ -277,6 +277,7 @@
         from tab_haoban_pending_task
         where enterprise_id = #{enterpriseId}
         and store_id =#{storeId}
+        and task_status_flag=0
         <if test="clerkId != null">
             and clerk_id = #{clerkId}
         </if>
@@ -299,4 +300,12 @@
             #{item}
         </foreach>
     </update>
+
+    <update id="updateInvalidTimeByBusinessId">
+        update tab_haoban_pending_task
+        set
+        update_time = now(),
+        invalid_time = #{invalidTime}
+        where business_id = #{businessId}
+    </update>
 </mapper>
\ No newline at end of file

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>