优化

FreeCarRegistration/src/main/java/com/nmgs/entity/VehicleWxBind.java

@@ -0,0 +1,25 @@
+package com.nmgs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author: shuguang
+ * @date: 2023年10月27日 14:38
+ * @description:
+ */
+@Data
+@TableName("wx_vehiclewx_bind")
+public class VehicleWxBind {
+    @TableField("vehicleid")
+    private String vehicleid;
+    @TableField("vehiclecolor")
+    private Integer vehiclecolor;
+    @TableField("wxid")
+    private String wxid;
+    @TableField("ismanager")
+    private Integer ismanager;
+}

FreeCarRegistration/src/main/java/com/nmgs/mapper/VehicleWxBindMapper.java

@@ -0,0 +1,14 @@
+package com.nmgs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nmgs.entity.VehicleWxBind;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author: shuguang
+ * @date: 2023年11月29日 11:42
+ * @description:
+ */
+@Mapper
+public interface VehicleWxBindMapper extends BaseMapper<VehicleWxBind> {
+}

FreeCarRegistration/src/main/java/com/nmgs/service/impl/WxVehicleBindServiceImpl.java

@@ -10,6 +10,7 @@ import com.nmgs.entity.ATtypeText;
 import com.nmgs.entity.FreeTypeText;
 import com.nmgs.entity.TypeText;
 import com.nmgs.entity.VehicleImages;
+import com.nmgs.entity.VehicleWxBind;
 import com.nmgs.entity.WxUnBindApply;
 import com.nmgs.entity.WxVehicleBind;
 import com.nmgs.entity.WxVehicleWxData;
@@ -17,6 +18,7 @@ import com.nmgs.mapper.ATtypeTextMapper;
 import com.nmgs.mapper.FreeTypeTextMapper;
 import com.nmgs.mapper.TypeTextMapper;
 import com.nmgs.mapper.VehicleImagesMapper;
+import com.nmgs.mapper.VehicleWxBindMapper;
 import com.nmgs.mapper.WxUnBindApplyMapper;
 import com.nmgs.mapper.WxVehicleBindMapper;
 import com.nmgs.mapper.WxVehicleWxDataMapper;
@@ -60,6 +62,8 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
     private WxVehicleWxDataMapper wxVehicleWxDataMapper;
     @Resource
     private WxUnBindApplyMapper wxUnBindApplyMapper;
+    @Resource
+    private VehicleWxBindMapper vehicleWxBindMapper;
 
     /**
      * 初始分页查询
@@ -428,14 +432,20 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
         log.info("[uuid:{}]-开始处理通过申请和不通过申请{}", uuid, wx);
         int count =0;
         Boolean approved = wx.getApproved();
+        String wxid = wx.getWxid();
         String managerWXID = wx.getManagerWXID();
         Integer applyType = wx.getApplyType();
         UpdateWrapper<WxUnBindApply> updateWrapper = new UpdateWrapper<>();
+        UpdateWrapper<VehicleWxBind> upWrapper = new UpdateWrapper<>();
+        UpdateWrapper<VehicleWxBind> upWrapper2 = new UpdateWrapper<>();
         //2-通过，3-不通过
         if (approved && StringUtils.isBlank(managerWXID)) {
             updateWrapper.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor());
+            upWrapper.eq("vehicleid", wx.getVehicleid())
+                    .eq("vehiclecolor", wx.getVehiclecolor());
             count = wxUnBindApplyMapper.delete( updateWrapper);
+            vehicleWxBindMapper.delete(upWrapper);
         } else if (approved && StringUtils.isNotBlank(managerWXID)) {
             updateWrapper.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor())
@@ -444,6 +454,15 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
                 updateWrapper.set("text", wx.getText().trim());
             }
             count = wxUnBindApplyMapper.update(null, updateWrapper);
+            upWrapper2.eq("vehicleid", wx.getVehicleid())
+                    .eq("vehiclecolor", wx.getVehiclecolor())
+                    .eq("wxid", wxid);
+            vehicleWxBindMapper.delete(upWrapper2);
+            upWrapper.eq("vehicleid", wx.getVehicleid())
+                    .eq("vehiclecolor", wx.getVehiclecolor())
+                    .eq("wxid", managerWXID)
+                    .set("ismanager", 1);
+            vehicleWxBindMapper.update(null, upWrapper);;
         } else if(applyType==0 && !approved){
             updateWrapper.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor())