Merge branch 'dev' into dev-g

This commit is contained in:
Guoqs
2025-03-04 15:56:41 +08:00

View File

@@ -8,15 +8,13 @@ import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.PileBasicInfo;
import com.jsowell.pile.dto.BatchCreatePileDTO;
import com.jsowell.pile.dto.QueryPileDTO;
import com.jsowell.pile.dto.ReplaceMerchantStationDTO;
import com.jsowell.pile.dto.ThirdPartySnRelationDTO;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.IThirdpartySnRelationService;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.service.PileMemberRelationService;
@@ -265,4 +263,27 @@ public class PileBasicInfoController extends BaseController {
logger.info("生成桩密钥 result:{}", response);
return response;
}
/**
* 用户解绑个人桩
* @param dto
* @return
*/
@PostMapping("/userUnbindPile")
public RestApiResponse<?> userUnbindPile(@RequestBody PileMemberBindingDTO dto) {
logger.info("后管解绑个人桩信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
int i = pileService.userUnbindPile(dto);
response = new RestApiResponse<>(i);
} catch (BusinessException e) {
logger.error("后管解绑个人桩 error, ", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("后管解绑个人桩 error, ", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_UNBIND_PILE_ERROR);
}
logger.info("后管解绑个人桩 result:{}", response);
return response;
}
}