From 6497e0daf1d0afc3da65a11d389c740e79427a78 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 24 七月 2024 14:08:11 +0800 Subject: [PATCH] 2024-07-24 朱宝民 整点报历史记录查询、管理卡创建 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java index 5cb744f..c0d55cf 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java @@ -10,6 +10,7 @@ import com.dy.pipIrrGlobal.pojoBa.BaClient; import com.dy.pipIrrGlobal.pojoSe.SeCardOperate; import com.dy.pipIrrGlobal.pojoSe.SeClientCard; +import com.dy.pipIrrGlobal.pojoSe.SeManagerCard; import com.dy.pipIrrGlobal.util.AmountToChinese; import com.dy.pipIrrGlobal.voSe.VoActiveCard; import com.dy.pipIrrGlobal.voSe.VoOperate; @@ -31,6 +32,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; @@ -55,6 +57,8 @@ private final CardOperateSv cardOperateSv; private final ClientCardSv clientCardSv; + @Value("${project.divisionCode}") + private String divisionCode; /** * 寮�鍗� * @param po 寮�鍗′紶鍏ュ璞� @@ -748,6 +752,57 @@ } /** + * 鍒涘缓绠$悊鍗� + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "create_manager_card", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + @SsoAop() + public BaseResponse<Boolean> createManagerCard(@RequestBody @Valid ManagerCard po, BindingResult bindingResult){ + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + /** + * 鏍规嵁琛屾斂鍖哄垝涓诧紙divisionCode锛夊湪绠$悊鍗¤〃涓拡瀵瑰崱鐗囩紪鍙凤紙cardNum锛夎繘琛屾ā绯婃煡璇� + * 濡傛灉椤哄簭鍙峰凡缁忚揪鍒版渶澶у�硷紝鎻愮ず鐢ㄦ埛鑱旂郴绯荤粺绠$悊鍛� + * 濡傛灉椤哄簭鍙锋湭杈惧埌鏈�澶у�硷紝鍒欏姞1 + * cardNum涓烘柊鐨勫崱鍙� + */ + String cardNum = Optional.ofNullable(cardOperateSv.getManagerCardNumOfMax(divisionCode)).orElse(""); + if(cardNum != null && cardNum.trim().length() > 0) { + Integer number = Integer.parseInt(cardNum.substring(12)); + number = number + 1; + if(number > 65535) { + return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_OVERRUN.getMessage()); + } + cardNum = cardNum.substring(0, 12) + String.format("%05d", number); + } else { + cardNum = divisionCode + "00001"; + } + + SeManagerCard seManagerCard = new SeManagerCard(); + seManagerCard.setCardAddr(po.getCardAddr()); + seManagerCard.setCardNum(cardNum); + seManagerCard.setCardType(po.getCardType()); + seManagerCard.setCreateTime(new Date()); + seManagerCard.setRemarks(po.getRemarks()); + Long managerCardId = cardOperateSv.addManagerCard(seManagerCard); + if(managerCardId == 0) { + return BaseResponseUtils.buildErrorMsg(SellResultCode.CREATE_MANAGER_CARD_ERROR.getMessage()); + } + + return BaseResponseUtils.buildSuccess(cardNum); + + //Map map = new HashMap(); + //map.put("cardNum", cardNum); + //return BaseResponseUtils.buildSuccess(map) ; + } + + + /** * 鑾峰彇鍏呭�艰褰� * @param vo * @return -- Gitblit v1.8.0