From 45cf7d84f6e589f162f332110ec34a5b080b538e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 23 May 2023 10:59:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8=E6=8A=AC?= =?UTF-8?q?=E5=A4=B4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/MemberController.java | 26 +++++++++++++++++-- .../com/jsowell/service/MemberService.java | 19 +++++++++++--- ...oiceTitleDTO.java => InvoiceTitleDTO.java} | 7 ++++- 3 files changed, 46 insertions(+), 6 deletions(-) rename jsowell-pile/src/main/java/com/jsowell/pile/dto/{CreateInvoiceTitleDTO.java => InvoiceTitleDTO.java} (90%) 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 8831470a4..39bc8d1fe 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 @@ -15,7 +15,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.dto.BindingCarNoDTO; import com.jsowell.pile.dto.BindingCardDTO; -import com.jsowell.pile.dto.CreateInvoiceTitleDTO; +import com.jsowell.pile.dto.InvoiceTitleDTO; import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; import com.jsowell.pile.dto.MemberRegisterDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; @@ -370,7 +370,7 @@ public class MemberController extends BaseController { * http://localhost:8080/uniapp/member/createMemberInvoiceTitle */ @PostMapping("/createMemberInvoiceTitle") - public RestApiResponse createMemberInvoiceTitle(HttpServletRequest request, @RequestBody CreateInvoiceTitleDTO dto) { + public RestApiResponse createMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) { RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -387,6 +387,28 @@ public class MemberController extends BaseController { return response; } + /** + * 修改会员发票抬头 + * http://localhost:8080/uniapp/member/updateMemberInvoiceTitle + */ + @PostMapping("/updateMemberInvoiceTitle") + public RestApiResponse updateMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) { + RestApiResponse response = null; + try { + String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); + memberService.updateMemberInvoiceTitle(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 802394d1c..46146de06 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -28,7 +28,7 @@ import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.BindingCarNoDTO; import com.jsowell.pile.dto.BindingCardDTO; -import com.jsowell.pile.dto.CreateInvoiceTitleDTO; +import com.jsowell.pile.dto.InvoiceTitleDTO; import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; import com.jsowell.pile.dto.MemberRegisterDTO; import com.jsowell.pile.dto.PaymentScenarioDTO; @@ -389,7 +389,7 @@ public class MemberService { return resultList; } - public void createMemberInvoiceTitle(CreateInvoiceTitleDTO dto) { + public void createMemberInvoiceTitle(InvoiceTitleDTO dto) { MemberInvoiceTitle title = new MemberInvoiceTitle(); BeanUtils.copyProperties(dto, title); if (StringUtils.isEmail(dto.getReception())) { @@ -398,7 +398,18 @@ public class MemberService { title.setPhoneNumber(dto.getReception()); } int i = memberInvoiceTitleService.insertMemberInvoiceTitle(title); - log.info("新增{}条发票抬头", i); + // log.info("新增{}条发票抬头", i); + } + + public void updateMemberInvoiceTitle(InvoiceTitleDTO dto) { + MemberInvoiceTitle title = new MemberInvoiceTitle(); + BeanUtils.copyProperties(dto, title); + if (StringUtils.isEmail(dto.getReception())) { + title.setEmail(dto.getReception()); + } else { + title.setPhoneNumber(dto.getReception()); + } + int i = memberInvoiceTitleService.updateMemberInvoiceTitle(title); } public Map rechargeBalance(WeixinPayDTO dto) throws Exception { @@ -438,4 +449,6 @@ public class MemberService { } return null; } + + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java similarity index 90% rename from jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java index a6017d684..93be96457 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/InvoiceTitleDTO.java @@ -9,7 +9,12 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -public class CreateInvoiceTitleDTO { +public class InvoiceTitleDTO { + /** + * 发票抬头id + */ + private String titleId; + /** * 会员id */