From cc1ce4d87e7618acca0a9a6e0007bcee9b5f4dfb Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Sat, 27 Jan 2024 10:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BB=AA=E5=99=A8=E5=90=8E=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=BB=91=E5=AE=9A=E4=BB=AA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WxInstrumentController.java            | 11 +++++++++--
 .../service/impl/WxInstrumentServiceImpl.java         | 11 +++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java
index 9f8c36b..a101d13 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java
@@ -70,6 +70,15 @@ public class WxInstrumentController extends BaseController {
         return R.ok();
     }
 
+    /**
+     * 用户选择仪器后，通过扫码序列号与仪器绑定
+     */
+    @GetMapping(value = "/scanCodeBinding")
+    public R scanCodeBinding(@NotBlank(message = "序列号不能为空") @RequestParam("serial") String serial,
+                             @NotBlank(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId) {
+        return R.ok(wxInstrumentService.scanCodeBinding(serial, instrumentId));
+    }
+
     /**
      * 获取已绑定的仪器列表
      */
@@ -88,8 +97,6 @@ public class WxInstrumentController extends BaseController {
 
     /**
      * 根据序列号获取仪器信息
-     *
-     * @return 当返回 203 时，需要页面跳转到联系客服
      */
     @GetMapping(value = "/getInstrumentInfoBySerial")
     public R getInstrumentInfoBySerial(@NotBlank(message = "序列号不能为空") @RequestParam("serial") String serial) {
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
index de0c837..907c7ea 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
@@ -354,4 +354,15 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         wxInstrumentMode.setStatus(Status.OK.getCode());
         return wxInstrumentModeMapper.selectWxInstrumentModeList(wxInstrumentMode);
     }
+
+    @Override
+    public WxInstrumentSerial scanCodeBinding(String serial, Long instrumentId) {
+        /* 1、获取序列号信息 */
+        WxInstrumentSerial wxInstrumentSerial = getInstrumentInfoBySerial(serial);
+        if (wxInstrumentSerial.getInstrumentId() == instrumentId) {
+            logger.info("用户选择的仪器与序列号对应的仪器不一致，序列号：{}， 仪器ID：{}", serial, instrumentId);
+            throw new ServiceReturnCodeException("用户选择的仪器与序列号对应的仪器不一致", 204);
+        }
+        return wxInstrumentSerial;
+    }
 }