From a61cab1c808983006f206a4fdd63d8c1f1664b31 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Wed, 12 Nov 2025 22:09:21 +0800 Subject: [PATCH] fix --- .../WxVtwoActivityOrderController.java | 21 +++++++++++++++++++ .../controller/WxUserGrantController.java | 13 ++++++++++++ .../domain/po/WxVtwoActivityOrder.java | 3 +++ .../com/iformall/mapper/WxCUserMapper.java | 2 ++ .../service/cuser/CUserServiceApapter.java | 2 ++ .../cuser/tt/TtBUserServiceAdapter.java | 6 ++++++ .../cuser/tt/TtCUserServiceAdapter.java | 6 ++++++ .../cuser/wx/WxBUserServiceAdapter.java | 6 ++++++ .../cuser/wx/WxCUserServiceAdapter.java | 11 ++++++++++ .../main/resources/mapper/WxCUserMapper.xml | 4 ++++ .../mapper/WxVtwoActivityOrderMapper.xml | 3 +++ 11 files changed, 77 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java index d4b6ebbcb..341d88441 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java @@ -70,8 +70,29 @@ public class WxVtwoActivityOrderController extends BaseController { if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ throw new MallinkException(Result.ERROR,"订单状态不允许修改"); } + if (null != activityOrder.getFromOrderId()) { + WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder(); + fromOrderQuery.updateTenantInfo(tenantEntity); + fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId()); + fromOrderQuery.setNotInId(activityOrder.getId()); + WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder); + if (null != frecord) { + throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId"); + } + } activityOrder.setAuditRemark(""); + }else { + if (null != activityOrder.getFromOrderId()) { + WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder(); + fromOrderQuery.updateTenantInfo(tenantEntity); + fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId()); + WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder); + if (null != frecord) { + throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId"); + } + } } + activityOrder.setCreateBy(getMerchantBUserId()); activityOrder.setMerchantId(getLoginBUser().getMerchantId()); activityOrder.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 3524e0993..a052fb01d 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -634,6 +634,19 @@ public class WxUserGrantController extends BaseController { return new ResultData(userVo); } + + @ApiOperation("注销用户") + @GetMapping("/cancelUser") + public ResultData cancelUser() { + CUser user = getCUser(); + + try { + cuserFactory.getCUserService(user.getAppPlat()).cancelUser(user); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + return new ResultData(Result.SUCCESS, "注销成功"); + } @ApiOperation("当前用户名下是否有车") @GetMapping("/carCount") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java index 20142993f..dafe00cfe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java @@ -269,4 +269,7 @@ public class WxVtwoActivityOrder extends TenantEntity { @TableField(exist = false) private BigDecimal orderRatio; + + @TableField(exist = false) + private Long notInId; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 118cba1a0..860b0a731 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -44,4 +44,6 @@ public interface WxCUserMapper extends CommonMapper { List findCountData(WxCUserBasicInfoDto dto); void updateAuthorizeStateByOpenId(WxCUser updCuser); + + void delByOpenId( @Param("openId")String openId,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java index a6a614462..5b83da29f 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java @@ -53,4 +53,6 @@ public interface CUserServiceApapter { List findCountData(WxCUserBasicInfoDto dto); Long findCuserId(Long basicUserId,String tenantId); + + void cancelUser(CUser user); } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java index 6de004174..939d7537e 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java @@ -293,4 +293,10 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer setCache(token,baseUser); } + @Override + public void cancelUser(CUser user) { + // TODO Auto-generated method stub + + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index 645422cd1..a4bbbd38e 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -392,4 +392,10 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer setCache(token,baseUser); } + @Override + public void cancelUser(CUser user) { + // TODO Auto-generated method stub + + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java index 7a5147878..ef7e5cc7b 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java @@ -340,4 +340,10 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer setCache(token,baseUser); } + @Override + public void cancelUser(CUser user) { + // TODO Auto-generated method stub + + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index bae8b4630..2f42c11fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -440,4 +440,15 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer setCache(token,baseUser); } + @Override + public void cancelUser(CUser user) { + WxCUser newUser = new WxCUser(); + newUser.updateTenantInfo(user); + newUser.setAppId(user.getAppId()); + newUser.setOpenId(user.getOpenId()); + + wxCUserMapper.delByOpenId(user.getOpenId(),user.getTenantId()); + cleanCuserToken(user.getToken()); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index a6ca4101a..50688d518 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -447,4 +447,8 @@ and `open_id` = #{openId} and `authorize_state` != #{authorizeState} + + + delete from wx_c_user where `open_id` = #{openId} and tenant_id = #{tenantId} + diff --git a/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml index 98f451d26..bf737ac66 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml @@ -55,6 +55,9 @@ and `id` = #{id} + + and `id` != #{notInId} + and `tenant_id` = #{tenantId}