Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -64,6 +64,10 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "任务纬度", example = "44.344324")
     private Double latitude;
 
+
+    @ApiModelProperty(value = "当前订单状态")
+    private Integer serviceFlowId;
+
     @ApiModelProperty(value = "订单的父订单id")
     private Integer fatherRequireId;
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 95b8d8b1a18f2bef7f33b593eb6a595f51c9d735
+  newTag: e3eef4e3db93af56ce838d17bace47d371ff8afe

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -79,8 +79,22 @@ public interface RequirementsDao {
 
     void requirementsDao(Integer id);
 
+
+    /**
+     * 取消的订单或者被抢完的订单就不展示
+     * @param requirementsInfoQO 排序条件
+     * @return {@link List}<{@link RequirementsInfoDO}>
+     */
     List<RequirementsInfoDO> appPublishList(RequirementsInfoQO requirementsInfoQO);
 
+
+    /**
+     * 所有的订单全部查出来展示到小程序上，后续运营起来请用上面的
+     * @param requirementsInfoQO 排序条件
+     * @return {@link List}<{@link RequirementsInfoDO}>
+     */
+    List<RequirementsInfoDO> appPublishList1(RequirementsInfoQO requirementsInfoQO);
+
     RequirementsInfoDO detailPublish(Integer id);
 
     /**
@@ -341,4 +355,11 @@ public interface RequirementsDao {
     Integer selectServiceFlowIdFromAgreePilot(Integer requireId,Integer userAccountId);
 
     RequirementsServicePilotInfoDO selectPilotInfoByRequireId(Integer requireId);
+
+    /**
+     * 根据流程id查询订单所处状态
+     * @param serviceFlowId
+     * @return {@link String}
+     */
+    String selectOrderStatusByServiceFlowId(Integer serviceFlowId);
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -211,6 +211,7 @@ public class RequirementsInfoDO implements Serializable {
                 .updateOrderAmount(this.updateOrderAmount)
                 .reason(this.reason)
                 .url(this.url)
+                .orderStatus(this.orderStatus)
                 .afterModificationReason(this.afterModificationReason)
                 .afterModificationUrl(this.afterModificationUrl)
                 .pilotCertificationUserId(this.pilotCertificationUserId)
@@ -219,6 +220,7 @@ public class RequirementsInfoDO implements Serializable {
                 .createTime(this.createTime)
                 .repertory(this.repertory)
                 .requireNum(this.requireNum)
+                .serviceFlowId(this.serviceFlowId)
                 .build();
 
     }

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -173,7 +173,7 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody appPublishList(RequirementsInfoQO requirementsInfoQO) {
-        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.appPublishList(requirementsInfoQO);
+        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.appPublishList1(requirementsInfoQO);
         Integer provinceCode = requirementsInfoQO.getProvinceCode();
         if(provinceCode != null) {
             Integer districtCode = requirementsInfoQO.getDistrictCode();
@@ -197,7 +197,10 @@ public class RequirementsServiceImpl implements RequirementsService {
 
         //远程调用服务一级分类
         //  List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
-        List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
+        List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(requirementsInfoDO -> {
+            requirementsInfoDO.setOrderStatus(requirementsDao.selectOrderStatusByServiceFlowId(requirementsInfoDO.getServiceFlowId()));
+            return requirementsInfoDO;
+        }).map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
        /* for (RequirementsInfoVO requirementsInfoVO : collect) {
             for (IndustryTypeDTO industryTypeDTO : industryTypeDTOS) {
                 if (requirementsInfoVO.getServiceId() != null && requirementsInfoVO.getServiceId().equals(industryTypeDTO.getId())) {
@@ -205,6 +208,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 }
             }
         }*/
+
         return ResultBody.success(collect);
     }
 

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1773,6 +1773,55 @@
             ,ra.order_amount DESC
         </if>
     </select>
+
+    <select id="appPublishList1" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
+        SELECT ri.id,
+        ri.task_title,
+        ri.task_start_time,
+        ri.task_end_time,
+        ri.task_address,
+        ri.longitude,
+        ri.latitude,
+        ri.require_url,
+        ri.require_description,
+        ri.requirement_type_id,
+        ri.user_account_id,
+        ra.order_level,
+        ri.service_id,
+        ra.total_amount,
+        ra.order_amount,
+        ra.update_order_amount,
+        ri.insurance,
+        ri.publish,
+        ri.service_name,
+        ri.create_time,
+        ri.repertory,
+        ri.require_num,
+        ri.province_code,
+        ri.city_code,
+        ri.district_code,
+        ri.service_flow_id
+        FROM requirements_info ri
+        left join requirements_amount ra
+        on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
+        WHERE NOT EXISTS(
+        SELECT rs.requirements_info_id FROM requirements_service rs WHERE ri.id = rs.requirements_info_id)
+        AND father_require_id = 0
+        <if test="provinceCode != null">
+            and ri.province_code = #{provinceCode}
+        </if>
+        ORDER BY ri.order_level_amount DESC
+        <if test="isNewRequirements != null and isNewRequirements">
+            ,ri.id DESC
+        </if>
+        <if test="isHighCommission != null and isHighCommission">
+            ,ra.order_amount DESC
+        </if>
+    </select>
+    <select id="selectOrderStatusByServiceFlowId" resultType="java.lang.String">
+        select order_status from service_flow where id = #{serviceFlowId}
+    </select>
+
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>