DemandReleaseOrderDao.xml(update)

src/main/java/com/mmc/oms/controller/demand/DemandReleaseOrderController.java

@@ -17,10 +17,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
@@ -70,6 +67,12 @@ public class DemandReleaseOrderController extends BaseController {
     }
 
 
+     @ApiOperation(value = "通过id删除订单")
+     @GetMapping("/getDelete")
+    public ResultBody getDelete(@ApiParam(value = "requirementsInfoId", required = true) @RequestParam Integer requirementsInfoId ){
+        return releaseOrderService.getDelete(requirementsInfoId);
+    }
+
 
 
 

src/main/java/com/mmc/oms/controller/demand/commit/NotRepeatSubmitConfig.java

@@ -92,15 +92,18 @@ public class NotRepeatSubmitConfig extends BaseController {
         if (tryLock) {
             try {
               String orderNumber = commonPaymentsVO.getOrderNumber();
-                String json = stringRedisTemplate.opsForValue().get(orderNumber);
-                GetOrderNumberDTO getOrderNumberDTO = JSONObject.parseObject(json, GetOrderNumberDTO.class);
-                GetOrderNumberDO getOrderNumberDO = new GetOrderNumberDO(getOrderNumberDTO);
-                if (getOrderNumberDTO.getRequirementsInfoId()!=null){
-                    int i = releaseOrderDao.selectOrderNumberDO(getOrderNumberDO.getRequirementsInfoId());
-                    if (i!=0){
-                        return ResultBody.error("当前需求已有人支付");
+                if ( orderNumber!=null){
+                    String json = stringRedisTemplate.opsForValue().get(orderNumber);
+                    GetOrderNumberDTO getOrderNumberDTO = JSONObject.parseObject(json, GetOrderNumberDTO.class);
+                    GetOrderNumberDO getOrderNumberDO = new GetOrderNumberDO(getOrderNumberDTO);
+                    if (getOrderNumberDTO.getRequirementsInfoId()!=null){
+                        int i = releaseOrderDao.selectOrderNumberDO(getOrderNumberDO.getRequirementsInfoId());
+                        if (i!=0){
+                            return ResultBody.error("当前需求已有人支付");
+                        }
                     }
                 }
+
                 // 查询订单库存判断是否大于0
                 //                大于0表示还有库存可以更新订单库存将库存数字减一更新到数据库中
                 //        不大于0表示没有库存了本次请求就终止

src/main/java/com/mmc/oms/dao/demand/DemandReleaseOrderDao.java

 package com.mmc.oms.dao.demand;
 
+import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.entity.demand.DemandReleaseOrderDO;
 import com.mmc.oms.entity.demand.GetOrderNumberDO;
 import com.mmc.oms.model.vo.demand.UserPayInfoVO;
@@ -25,4 +26,6 @@ public interface DemandReleaseOrderDao {
     void insertService(GetOrderNumberDO getOrderNumberDO);
 
     int selectOrderNumberDO(Integer requirementsInfoId);
+
+    ResultBody getDelete(Integer requirementsInfoId);
 }

src/main/java/com/mmc/oms/service/demand/DemandReleaseOrderService.java

@@ -19,4 +19,6 @@ public interface DemandReleaseOrderService {
     ResultBody orderPayment(CommonPaymentVO commonPaymentVO, HttpServletRequest request, Integer userAccountId);
 
     ResultBody getPublishPhone(CommonPaymentVO commonPaymentVO, HttpServletRequest request, Integer userAccountId);
+
+    ResultBody getDelete(Integer requirementsInfoId);
 }

src/main/java/com/mmc/oms/service/demand/Impl/DemandReleaseOrderServiceImpl.java

@@ -193,6 +193,11 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody getDelete(Integer requirementsInfoId) {
+        return releaseOrderDao.getDelete(requirementsInfoId);
+    }
+
     public ResultBody releaseOrder(OrderRequestParamsVO orderRequestParamsVO, String token) {
         boolean emoji = EmojiUtils.containsEmoji(orderRequestParamsVO.getDescription());
         if (emoji == true) {

src/main/resources/mapper/demand/DemandReleaseOrderDao.xml

@@ -52,4 +52,10 @@
         WHERE
             requirements_info_id =#{requirementsInfoId}
     </select>
+
+    <delete id="getDelete">
+        delete
+        from service_demand_order
+        where requirements_info_id = #{requirementsInfoId}
+    </delete>
 </mapper>