优化

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

@@ -28,6 +28,8 @@ public class WxUnBindApply {
     private String text;
     @TableField("applytime")
     private Date applytime;
+    @TableField("endTime")
+    private Date endTime;
     @TableField("managerWXID")
     private String managerWXID;
     @TableField(exist = false)

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

@@ -438,6 +438,7 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
         UpdateWrapper<WxUnBindApply> updateWrapper = new UpdateWrapper<>();
         UpdateWrapper<VehicleWxBind> upWrapper = new UpdateWrapper<>();
         UpdateWrapper<VehicleWxBind> upWrapper2 = new UpdateWrapper<>();
+        Date nowDate = new Date();
         //2-通过，3-不通过
         if (approved && StringUtils.isBlank(managerWXID)) {
             updateWrapper.eq("vehicleid", wx.getVehicleid())
@@ -449,11 +450,8 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
         } else if (approved && StringUtils.isNotBlank(managerWXID)) {
             updateWrapper.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor())
-                    .set("applyType", 2);
-            if(StringUtils.isNotBlank(wx.getText()) && StringUtils.isNotBlank(wx.getText().trim())){
-                updateWrapper.set("text", wx.getText().trim());
-            }
-            count = wxUnBindApplyMapper.update(null, updateWrapper);
+                    .eq("wxid", wxid);
+            count = wxUnBindApplyMapper.delete(updateWrapper);
             upWrapper2.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor())
                     .eq("wxid", wxid);
@@ -466,7 +464,9 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
         } else if(applyType==0 && !approved){
             updateWrapper.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor())
-                    .set("applyType", 3);
+                    .eq("wxid", wxid)
+                    .set("applyType", 3)
+                    .set("endTime", nowDate);
             if(StringUtils.isNotBlank(wx.getText()) && StringUtils.isNotBlank(wx.getText().trim())){
                 updateWrapper.set("text", wx.getText().trim());
             }
@@ -474,7 +474,9 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
         }else if(applyType==1 && !approved){
             updateWrapper.eq("vehicleid", wx.getVehicleid())
                     .eq("vehiclecolor", wx.getVehiclecolor())
-                    .set("applyType", 4);
+                    .eq("wxid", wxid)
+                    .set("applyType", 4)
+                    .set("endTime", nowDate);
             if(StringUtils.isNotBlank(wx.getText()) && StringUtils.isNotBlank(wx.getText().trim())){
                 updateWrapper.set("text", wx.getText().trim());
             }

FreeCarRegistration/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -14,6 +14,7 @@ com\nmgs\config\ErrorConfig.class
 com\nmgs\util\TokenUtil.class
 com\nmgs\util\PathUtil.class
 com\nmgs\FreeCarRegistrationApplication.class
+com\nmgs\mapper\VehicleWxBindMapper.class
 com\nmgs\mapper\WxVehicleWxDataMapper.class
 com\nmgs\util\PropertiesUtil.class
 com\nmgs\mapper\VehicleImagesMapper.class
@@ -25,6 +26,7 @@ com\nmgs\mapper\TypeTextMapper.class
 com\nmgs\util\DateUtils.class
 com\nmgs\config\MybatisConfig.class
 com\nmgs\mapper\FreeTypeTextMapper.class
+com\nmgs\entity\VehicleWxBind.class
 com\nmgs\mapper\WxUnBindApplyMapper.class
 com\nmgs\util\UuidUtil.class
 com\nmgs\config\FilterConfig.class

FreeCarRegistration/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -4,6 +4,7 @@ D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\n
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\mapper\FreeTypeTextMapper.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\util\UuidUtil.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\config\CorsConfig.java
+D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\VehicleWxBind.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\service\WxVehicleBindService.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\config\ErrorConfig.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\config\ThreadPoolConfig.java
@@ -12,6 +13,7 @@ D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\n
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\FreeTypeText.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\WxVehicleWxData.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\controller\WxVehicleBindController.java
+D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\mapper\VehicleWxBindMapper.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\mapper\WxVehicleWxDataMapper.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\TypeText.java
 D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\util\TokenUtil.java