diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 39bc8d1fe..b03a7d268 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -393,6 +393,7 @@ public class MemberController extends BaseController { */ @PostMapping("/updateMemberInvoiceTitle") public RestApiResponse updateMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) { + logger.info("修改会员发票抬头 param:{}", JSONObject.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -409,6 +410,31 @@ public class MemberController extends BaseController { return response; } + /** + * 删除会员发票抬头 + * @param request + * @param dto + * @return + */ + @PostMapping("/deleteMemberInvoiceTitle") + public RestApiResponse deleteMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) { + logger.info("修改会员发票抬头 param:{}", JSONObject.toJSONString(dto)); + RestApiResponse response = null; + try { + String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); + memberService.deleteMemberInvoiceTitle(dto); + response = new RestApiResponse<>(); + } catch (BusinessException e) { + logger.error("修改会员发票抬头 error", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e) { + logger.error("修改会员发票抬头 error", e); + response = new RestApiResponse<>(e); + } + return response; + } + /** * 查询会员发票抬头列表 * http://localhost:8080/uniapp/member/queryMemberInvoiceTitles diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 46146de06..05512ee75 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -404,6 +404,8 @@ public class MemberService { public void updateMemberInvoiceTitle(InvoiceTitleDTO dto) { MemberInvoiceTitle title = new MemberInvoiceTitle(); BeanUtils.copyProperties(dto, title); + title.setId(Long.valueOf(dto.getTitleId())); + title.setName(dto.getTitleName()); if (StringUtils.isEmail(dto.getReception())) { title.setEmail(dto.getReception()); } else { @@ -412,6 +414,14 @@ public class MemberService { int i = memberInvoiceTitleService.updateMemberInvoiceTitle(title); } + /** + * 删除会员发票抬头 + * @param dto + */ + public void deleteMemberInvoiceTitle(InvoiceTitleDTO dto) { + memberInvoiceTitleService.deleteMemberInvoiceTitleById(Long.valueOf(dto.getTitleId())); + } + public Map rechargeBalance(WeixinPayDTO dto) throws Exception { PaymentScenarioDTO paymentScenarioDTO = new PaymentScenarioDTO(); paymentScenarioDTO.setType(ScenarioEnum.BALANCE.getValue()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java index 93be96457..bfd6731b9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java @@ -28,7 +28,7 @@ public class InvoiceTitleDTO { /** * 单位名称 */ - private String name; + private String titleName; /** * 税号