新增预订单删除

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrPackageBookingOrderController.java

@@ -1,9 +1,6 @@
 package com.abi.qms.platform.controller.console;
 
-import com.abi.qms.platform.dto.req.AssociateSapOrderReq;
-import com.abi.qms.platform.dto.req.QueryOrderFormDetailReq;
-import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
-import com.abi.qms.platform.dto.req.SaveOrderFormReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.QueryOrderFormDetailRes;
 import com.abi.qms.platform.dto.res.QueryOrderFormLimitRes;
 import com.abi.qms.platform.dto.res.ReservationOrderQueryRes;
@@ -64,4 +61,18 @@ public class QrPackageBookingOrderController {
         ReservationOrderQueryRes res = qrPackageBookingOrderService.reservationOrderQuery();
         return BaseResponse.create(res);
     }
+
+    /**
+     * 根据预订单ID删除
+     * @author lu
+     * @date 2021/6/8 19:06
+     * @param deleteQrPackageBookingOrderReq
+     * @return com.abi.task.common.api.base.BaseResponse
+     */
+    @ApiOperation("删除预订单")
+    @PostMapping("/deleteQrPackageBookingOrder")
+    public BaseResponse deleteQrPackageBookingOrder(@Validated @RequestBody DeleteQrPackageBookingOrderReq deleteQrPackageBookingOrderReq) {
+        qrPackageBookingOrderService.deleteQrPackageBookingOrder(deleteQrPackageBookingOrderReq);
+        return BaseResponse.create();
+    }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/DeleteQrPackageBookingOrderReq.java

@@ -0,0 +1,22 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author lu
+ * @date 2021年06月08日 19:04
+ */
+@Data
+@ApiModel
+public class DeleteQrPackageBookingOrderReq implements Serializable {
+
+    @NotNull(message = "预订单ID为空")
+    @ApiModelProperty( "预订单ID")
+    private Long id;
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrPackageBookingOrderService.java

@@ -1,9 +1,6 @@
 package com.abi.qms.platform.service;
 
-import com.abi.qms.platform.dto.req.AssociateSapOrderReq;
-import com.abi.qms.platform.dto.req.QueryOrderFormDetailReq;
-import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
-import com.abi.qms.platform.dto.req.SaveOrderFormReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.QueryOrderFormDetailRes;
 import com.abi.qms.platform.dto.res.QueryOrderFormLimitRes;
 import com.abi.qms.platform.dto.res.ReservationOrderQueryRes;
@@ -50,5 +47,11 @@ public interface QrPackageBookingOrderService {
      */
     ReservationOrderQueryRes reservationOrderQuery();
 
-
+    /**
+     * 根据预订单ID删除
+     * @author lu
+     * @date 2021/6/8 19:06
+     * @param deleteQrPackageBookingOrderReq
+     */
+    void deleteQrPackageBookingOrder(DeleteQrPackageBookingOrderReq deleteQrPackageBookingOrderReq);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageBookingOrderServiceImpl.java

@@ -6,10 +6,7 @@ import com.abi.qms.platform.dao.mapper.*;
 import com.abi.qms.platform.dao.vo.result.QueryOrderFormDetailVO;
 import com.abi.qms.platform.dao.vo.result.QueryOrderFormLimitVO;
 import com.abi.qms.platform.dao.vo.result.ReservationOrderQueryVO;
-import com.abi.qms.platform.dto.req.AssociateSapOrderReq;
-import com.abi.qms.platform.dto.req.QueryOrderFormDetailReq;
-import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
-import com.abi.qms.platform.dto.req.SaveOrderFormReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
@@ -40,9 +37,6 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
     @Autowired
     private BaseFactoryMapper baseFactoryMapper;
 
-    @Autowired
-    private BaseMaterialMapper baseMaterialMapper;
-
     @Autowired
     private QrPackageMapper qrPackageMapper;
 
@@ -52,33 +46,42 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
     @Autowired
     private MaterialService materialService;
 
-    @Autowired
-    private FactoryService factoryService;
-
     /**
      * 新增修改预订单
      * @author ludashi
      * @date 2021/6/4 18:50
-     * @param saveOrderFormReq
+     * @param req
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveOrderForm(SaveOrderFormReq saveOrderFormReq) {
-        QrPackageBookingOrder qrPackageBookingOrderCopy = PojoConverterUtils.copy(saveOrderFormReq, QrPackageBookingOrder.class);
-        if(null == qrPackageBookingOrderCopy.getId() &&
-                !ObjectUtils.isEmpty(qrPackageBookingOrderCopy.getBookingOrder())){
-            //新增
-            QueryWrapper<QrPackageBookingOrder> qrFormatQw = new QueryWrapper<>();
-            qrFormatQw.eq("booking_order",qrPackageBookingOrderCopy.getBookingOrder());
+    public void saveOrderForm(SaveOrderFormReq req) {
+        QueryWrapper<QrPackageBookingOrder> qrFormatQw = new QueryWrapper<>();
+        QrPackageBookingOrder qurey = null;
+        if (null != req.getId()) {
+            qurey = qrPackageBookingOrderMapper.selectById(req.getId());
+            AssertUtil.isNull(qurey,"预订单ID不存在");
+        } else {
+            qurey = new QrPackageBookingOrder();
+        }
+        qurey.setBookingOrder(req.getBookingOrder());
+        qurey.setMaterialName(req.getMaterialName());
+        qurey.setPurchaseCount(req.getPurchaseCount());
+        qurey.setQrType(req.getQrType());
+        qurey.setFactoryCoverId(req.getFactoryCoverId());
+        qurey.setDescription(req.getDescription());
+        if (null != req.getId()) {
+            //修改
+            qurey.setBookingOrder(null);
+            qrPackageBookingOrderMapper.updateById(qurey);
+        } else {
+            qrFormatQw.eq("booking_order", req.getBookingOrder());
+            qrFormatQw.eq("is_delete", 0);
             Integer count = qrPackageBookingOrderMapper.selectCount(qrFormatQw);
             if (!count.equals(0)) {
                 throw new BusinessException("预订单号已存在");
             }
-            qrPackageBookingOrderMapper.insert(qrPackageBookingOrderCopy);
-        } else {
-            //修改
-            qrPackageBookingOrderCopy.setBookingOrder(null);
-            qrPackageBookingOrderMapper.updateById(qrPackageBookingOrderCopy);
+            //新增
+            qrPackageBookingOrderMapper.insert(qurey);
         }
     }
 
@@ -195,4 +198,18 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         res.setReservationOrderQueryBean(reservationOrderQueryBeans);
         return res;
     }
+
+
+    /**
+     * 根据预订单ID删除
+     * @author lu
+     * @date 2021/6/8 19:07
+     * @param deleteQrPackageBookingOrderReq  预订单ID
+     */
+    @Override
+    public void deleteQrPackageBookingOrder(DeleteQrPackageBookingOrderReq deleteQrPackageBookingOrderReq) {
+        QrPackageBookingOrder qrPackageBookingOrder = qrPackageBookingOrderMapper.selectById(deleteQrPackageBookingOrderReq.getId());
+        qrPackageBookingOrder.setIsDelete(1);
+        qrPackageBookingOrderMapper.updateById(qrPackageBookingOrder);
+    }
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBookingOrderMapper.xml

@@ -56,8 +56,9 @@
             LEFT JOIN base_material AS material ON material.id = package.material_id
             LEFT JOIN base_factory AS factory ON factory.id = bookingOrder.factory_cover_id
         <where>
+            bookingOrder.is_delete = 0
             <if test="null != queryOrderFormLimitReq.bookingOrder and queryOrderFormLimitReq.bookingOrder !=''">
-                bookingOrder.booking_order = #{queryOrderFormLimitReq.bookingOrder}
+               and bookingOrder.booking_order = #{queryOrderFormLimitReq.bookingOrder}
             </if>
             <if test="null != queryOrderFormLimitReq.sapOrder and queryOrderFormLimitReq.sapOrder != ''">
                 AND package.sap_order_no = #{queryOrderFormLimitReq.sapOrder}