Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/RequirementsInfoQO.java

@@ -26,4 +26,7 @@ public class RequirementsInfoQO {
 
     @ApiModelProperty(value = "区编码", example = "802323")
     private Integer districtCode;
+
+//查询订单的时候 sort=1 是订单还未过期的，其他是过期的
+    private Integer sort;
 }

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: 2602630765234af80b90313a299c335910474b6d
+  newTag: 527be45d3e8f50dd23065b99f88457073be87e62

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

 package com.mmc.csf.release.controller;
 
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.*;
 import com.mmc.csf.infomation.vo.*;
@@ -16,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 
 /**
  * @author: zj
@@ -99,6 +101,11 @@ public class RequirementsController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("publisherNumber")
     public ResultBody<GetOrderNumberDTO> publisherNumber(@RequestBody GetOrderNumberVO getOrderNumberVO, HttpServletRequest request) {
+        BigDecimal amount = getOrderNumberVO.getOrderAmount();
+        int result = amount.compareTo(new BigDecimal("100"));
+        if(result<0){
+            return ResultBody.error(ResultEnum.ORDER_AMOUNT_ERROR);
+        }
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
         getOrderNumberVO.setUserAccountId(userAccountId);
         return requirementsService.publisherNumber(getOrderNumberVO, request);

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

@@ -25,7 +25,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class RequirementsInfoDO implements Serializable {
+public class RequirementsInfoDO implements Serializable,Comparable<RequirementsInfoDO> {
     private static final long serialVersionUID = -1811974173256250060L;
     private Integer id;
 
@@ -276,5 +276,8 @@ public class RequirementsInfoDO implements Serializable {
         this.districtCode = requirementsEditVO.getDistrictCode();
     }
 
-
+    @Override
+    public int compareTo(RequirementsInfoDO o) {
+        return -this.taskEndTime.compareTo(o.taskEndTime);
+    }
 }

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

@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
@@ -57,6 +58,7 @@ import static com.mmc.csf.common.util.redis.RedisConstant.createWxToken;
  */
 @Slf4j
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class RequirementsServiceImpl implements RequirementsService {
 
     @Autowired
@@ -184,8 +186,14 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody appPublishList(RequirementsInfoQO requirementsInfoQO) {
+
+
+        requirementsInfoQO.setSort(1);
         List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.appPublishList1(requirementsInfoQO);
+        requirementsInfoQO.setSort(0);
+        List<RequirementsInfoDO> listInfo = requirementsDao.appPublishList1(requirementsInfoQO);
         Integer provinceCode = requirementsInfoQO.getProvinceCode();
+        requirementsInfoDOS.addAll(listInfo);
         if(provinceCode != null) {
             Integer districtCode = requirementsInfoQO.getDistrictCode();
             Integer cityCode = requirementsInfoQO.getCityCode();

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

@@ -1854,54 +1854,6 @@
         </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,
-        ri.project_code
-        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 CASE
-        WHEN ri.service_flow_id != 7
-        THEN ri.order_level_amount
-        END 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>
@@ -2208,6 +2160,62 @@
         WHERE ri.user_account_id = #{userAccountId}
             AND ri.id = #{requirementsInfoId}
     </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,
+        ri.project_code
+        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>
+        <choose>
+            <when test="sort == 1">
+                AND ri.task_end_time >= NOW()
+            </when>
+            <otherwise>
+                AND NOW() > ri.task_end_time
+            </otherwise>
+        </choose>
+        ORDER BY CASE
+        WHEN ri.service_flow_id != 7
+        THEN ri.order_level_amount
+        END DESC
+        <if test="isNewRequirements != null and isNewRequirements">
+            ,ri.id DESC
+        </if>
+        <if test="isHighCommission != null and isHighCommission">
+            ,ra.order_amount DESC
+        </if>
+    </select>
 
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}