Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java

@@ -58,6 +58,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private WxUserTagMapper wxUserTagMapper;
 
+    @Autowired
+    private WxUserMemberMapper wxUserMemberMapper;
+
     @Override
     public List<WxInstrument> bindingInstrumentList() {
         return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
@@ -113,7 +116,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Override
     @Transactional
     public void binding(String serial, String serialImage) {
-        WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember();
+        WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberById(SecurityUtils.getLoginUser().getWxUserMember().getId());
         /* 1、获取序列号信息 */
         WxInstrumentSerial wxInstrumentSerial = getInstrumentInfoBySerial(serial);
 
@@ -207,6 +210,12 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 wxUserInstrumentLog.setCreateTime(DateUtils.getNowDate());
                 wxUserInstrumentLogMapper.insertWxUserInstrumentLog(wxUserInstrumentLog);
 
+                // 会员信息中的仪器数量加1
+                WxUserMember updateDevicesNum = new WxUserMember();
+                updateDevicesNum.setId(wxUserMember.getId());
+                updateDevicesNum.setDevicesNum(wxUserMember.getDevicesNum() + 1);
+                wxUserMemberMapper.updateWxUserMember(updateDevicesNum);
+
                 /**
                  * TODO: 仪器绑定获取积分
                  */