| @@ -70,8 +70,29 @@ public class WxVtwoActivityOrderController extends BaseController { | |||||
| if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ | if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ | ||||
| throw new MallinkException(Result.ERROR,"订单状态不允许修改"); | 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(""); | 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.setCreateBy(getMerchantBUserId()); | ||||
| activityOrder.setMerchantId(getLoginBUser().getMerchantId()); | activityOrder.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| activityOrder.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); | activityOrder.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); | ||||
| @@ -634,6 +634,19 @@ public class WxUserGrantController extends BaseController { | |||||
| return new ResultData(userVo); | 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("当前用户名下是否有车") | @ApiOperation("当前用户名下是否有车") | ||||
| @GetMapping("/carCount") | @GetMapping("/carCount") | ||||
| @@ -269,4 +269,7 @@ public class WxVtwoActivityOrder extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal orderRatio; | private BigDecimal orderRatio; | ||||
| @TableField(exist = false) | |||||
| private Long notInId; | |||||
| } | } | ||||
| @@ -44,4 +44,6 @@ public interface WxCUserMapper extends CommonMapper<WxCUser, Long> { | |||||
| List<UserStructureVo> findCountData(WxCUserBasicInfoDto dto); | List<UserStructureVo> findCountData(WxCUserBasicInfoDto dto); | ||||
| void updateAuthorizeStateByOpenId(WxCUser updCuser); | void updateAuthorizeStateByOpenId(WxCUser updCuser); | ||||
| void delByOpenId( @Param("openId")String openId,@Param("tenantId")String tenantId); | |||||
| } | } | ||||
| @@ -53,4 +53,6 @@ public interface CUserServiceApapter { | |||||
| List<UserStructureVo> findCountData(WxCUserBasicInfoDto dto); | List<UserStructureVo> findCountData(WxCUserBasicInfoDto dto); | ||||
| Long findCuserId(Long basicUserId,String tenantId); | Long findCuserId(Long basicUserId,String tenantId); | ||||
| void cancelUser(CUser user); | |||||
| } | } | ||||
| @@ -293,4 +293,10 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| setCache(token,baseUser); | setCache(token,baseUser); | ||||
| } | } | ||||
| @Override | |||||
| public void cancelUser(CUser user) { | |||||
| // TODO Auto-generated method stub | |||||
| } | |||||
| } | } | ||||
| @@ -392,4 +392,10 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| setCache(token,baseUser); | setCache(token,baseUser); | ||||
| } | } | ||||
| @Override | |||||
| public void cancelUser(CUser user) { | |||||
| // TODO Auto-generated method stub | |||||
| } | |||||
| } | } | ||||
| @@ -340,4 +340,10 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| setCache(token,baseUser); | setCache(token,baseUser); | ||||
| } | } | ||||
| @Override | |||||
| public void cancelUser(CUser user) { | |||||
| // TODO Auto-generated method stub | |||||
| } | |||||
| } | } | ||||
| @@ -440,4 +440,15 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| setCache(token,baseUser); | 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()); | |||||
| } | |||||
| } | } | ||||
| @@ -447,4 +447,8 @@ | |||||
| and `open_id` = #{openId} | and `open_id` = #{openId} | ||||
| and `authorize_state` != #{authorizeState} | and `authorize_state` != #{authorizeState} | ||||
| </update> | </update> | ||||
| <delete id="delByOpenId" parameterType="hashmap"> | |||||
| delete from wx_c_user where `open_id` = #{openId} and tenant_id = #{tenantId} | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||
| @@ -55,6 +55,9 @@ | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and `id` = #{id} | and `id` = #{id} | ||||
| </if> | </if> | ||||
| <if test=" null != notInId "> | |||||
| and `id` != #{notInId} | |||||
| </if> | |||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||