From 8a088b4e1a411e5da44fba598797911f66652044 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 28 六月 2024 10:31:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 14 +++++++++++---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java | 7 +++++++
2 files changed, 18 insertions(+), 3 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 66d88c3..bb54a18 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
@@ -73,6 +73,11 @@
return BaseResponseUtils.buildErrorMsg(SellResultCode.AREA_CODE_MISTAKE.getMessage());
}
+ // p206V1_0_1鍗忚锛屽皢鍓�6浣嶈鏀垮尯鍒掓敼涓�100000
+ if(po.getProtocol().trim().equals("p206V1_0_1")) {
+ areaCode = "100000" + areaCode.substring(6);
+ }
+
/**
* 鏍规嵁琛屾斂鍖哄垝涓诧紙areaCode锛夊湪姘村崱琛ㄤ腑閽堝姘村崱缂栧彿锛坈ardNum锛夎繘琛屾ā绯婃煡璇�
* 濡傛灉4浣嶉『搴忓彿宸茬粡杈惧埌鏈�澶у�硷紝鎻愮ず鐢ㄦ埛鑱旂郴绯荤粺绠＄悊鍛�
@@ -86,7 +91,7 @@
if(number > 65535) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_OVERRUN.getMessage());
}
- cardNum = cardNum.substring(0, 12) + String.format("%04d", number);
+ cardNum = cardNum.substring(0, 12) + String.format("%05d", number);
} else {
cardNum = areaCode + "00001";
}
@@ -172,9 +177,12 @@
}
}
- Map map = new HashMap();
+ if(po.getProtocol().trim().equals("p206V1_0_1")) {
+ cardNum = cardNum.substring(6,12) + cardNum.substring(13);
+ }
- map.put("projectNo", String.format("%04x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ Map map = new HashMap();
+ map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
map.put("orderNumber", cardId);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
index d32a48d..0a5e3a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
@@ -21,6 +21,13 @@
@Schema(name = "寮�鍗′紶鍏ュ璞�")
public class DtoActiveCard {
public static final long serialVersionUID = 202401181945001L;
+
+ /**
+ * 鍗忚鍚嶇О
+ */
+ @NotBlank(message = "鎮ㄥ繀椤婚�夋嫨涓�涓崗璁�")
+ private String protocol;
+
/**
* 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟
*/
--
Gitblit v1.8.0