盖码自动获取幅面逻辑

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/wx/WxQrPackageController.java

@@ -0,0 +1,39 @@
+package com.abi.qms.platform.controller.wx;
+
+import com.abi.qms.platform.dto.req.ListQrPackageWxReq;
+import com.abi.qms.platform.dto.res.ListQrPackageWxRes;
+import com.abi.qms.platform.service.QrPackageService;
+import com.abi.task.common.api.base.BaseResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/08 19:05
+ * @description: 小程序码包管理
+ */
+@Slf4j
+@RestController
+@RequestMapping("/wxQrPackage")
+@Api(tags = "码包管理")
+public class WxQrPackageController {
+
+    @Autowired
+    private QrPackageService qrPackageService;
+
+    @ApiOperation("码包列表")
+    @GetMapping("listWxQrPackage")
+    public BaseResponse<ListQrPackageWxRes> listWxQrPackage(@Validated ListQrPackageWxReq listQrPackageWxReq) {
+        //查询码包列表
+        ListQrPackageWxRes result = qrPackageService.listWxQrPackage(listQrPackageWxReq);
+        //包装出参
+        return BaseResponse.create(result);
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/09 09:53
+ * @description:
+ */
+@Data
+@ApiModel
+public class ListQrPackageWxReq implements Serializable {
+
+    @ApiModelProperty(value = "码包ID")
+    private Long packageId;
+
+    @ApiModelProperty(value = "活动名称")
+    private String activeName;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
+    private Integer activeStatus;
+
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrPackageWxRes.java

@@ -0,0 +1,17 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/09 09:57
+ * @description:
+ */
+@Data
+@ApiModel
+public class ListQrPackageWxRes implements Serializable {
+
+}

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

@@ -2,8 +2,26 @@ package com.abi.qms.platform.service;
 
 
 import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.*;
+import com.abi.qms.platform.dto.req.DeleteQrPackageReq;
+import com.abi.qms.platform.dto.req.DownloadQrPackageReq;
+import com.abi.qms.platform.dto.req.GetPackageCodeReq;
+import com.abi.qms.platform.dto.req.GetQrPackageDetailReq;
+import com.abi.qms.platform.dto.req.GetQrSingleCheckDetailCodeReq;
+import com.abi.qms.platform.dto.req.InvalidQrPackageReq;
+import com.abi.qms.platform.dto.req.InvalidQrSingleReq;
+import com.abi.qms.platform.dto.req.ListQrPackageReq;
+import com.abi.qms.platform.dto.req.ListQrPackageWxReq;
+import com.abi.qms.platform.dto.req.PassQrPackageReq;
+import com.abi.qms.platform.dto.req.RefuseQrPackageReq;
+import com.abi.qms.platform.dto.req.SaveQrPackageReq;
+import com.abi.qms.platform.dto.req.SendMobileMsgReq;
+import com.abi.qms.platform.dto.req.ValidSAPOrderNoAndMaterialReq;
+import com.abi.qms.platform.dto.res.GetPackageCodeRes;
+import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
+import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
+import com.abi.qms.platform.dto.res.ListQrPackageRes;
+import com.abi.qms.platform.dto.res.ListQrPackageWxRes;
+import com.abi.qms.platform.dto.res.ValidSAPOrderNoAndMaterialRes;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -103,8 +121,17 @@ public interface QrPackageService {
 
     /**
      * 根据物料ID获取码包code
+     *
      * @param req
      * @return
      */
     GetPackageCodeRes getPackageCodeType(GetPackageCodeReq req);
+
+    /**
+     * 微信小程序查询码包列表
+     *
+     * @param listQrPackageWxReq
+     * @return
+     */
+    ListQrPackageWxRes listWxQrPackage(ListQrPackageWxReq listQrPackageWxReq);
 }

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

@@ -209,6 +209,7 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
     @Override
     public void deleteQrPackageBookingOrder(DeleteQrPackageBookingOrderReq deleteQrPackageBookingOrderReq) {
         QrPackageBookingOrder qrPackageBookingOrder = qrPackageBookingOrderMapper.selectById(deleteQrPackageBookingOrderReq.getId());
+        AssertUtil.isNull(qrPackageBookingOrder,"预订单ID不存在");
         qrPackageBookingOrder.setIsDelete(1);
         qrPackageBookingOrderMapper.updateById(qrPackageBookingOrder);
     }