From 469b0eacbc45dc5fd4d947c1636651629a286f6b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 18 十月 2024 08:42:53 +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 | 696 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 445 insertions(+), 251 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 cb6bb55..cdd3d2d 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
@@ -7,15 +7,12 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-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;
-import com.dy.pipIrrGlobal.voSe.VoRecharge;
-import com.dy.pipIrrGlobal.voSe.VoReissueCard;
-import com.dy.pipIrrSell.cardOperate.converter.RechargeDtoMapper;
+import com.dy.pipIrrGlobal.voRm.VoExpend;
+import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.*;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.cardOperate.qo.*;
@@ -32,6 +29,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;
@@ -50,48 +48,57 @@
@Slf4j
@Tag(name = "姘村崱鎿嶄綔绠＄悊", description = "姘村崱鍚勭鎿嶄綔")
@RestController
-@RequestMapping(path="card")
+@RequestMapping(path = "card")
@RequiredArgsConstructor
public class CardOperateCtrl {
private final CardOperateSv cardOperateSv;
private final ClientCardSv clientCardSv;
+ @Value("${project.divisionCode}")
+ private String divisionCode;
+
+ @Value("${project.projectNo}")
+ private Integer projectNo;
+
/**
* 寮�鍗�
- * @param po 寮�鍗′紶鍏ュ璞�
+ *
+ * @param po 寮�鍗′紶鍏ュ璞�
* @param bindingResult
* @return 姘村崱缂栧彿
*/
@PostMapping(path = "active", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_active(@RequestBody @Valid DtoActiveCard po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_active(@RequestBody @Valid ActiveCard po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ // 渚濇嵁姘村崱鍦板潃鍒ゆ柇璇ュ崱鏄惁鍙互寮�鍗★紝鏈紑杩囧崱鎴栦笉鏄甯哥姸鎬併�佹寕澶辩姸鎬佺殑鍙紑鍗�
+ if (!cardOperateSv.canActiveCard(po.getCardAddr())) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_CARD_ESIST.getMessage());
+ }
+
+ Long clientId = po.getClientId();
// 鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode
- String areaCode = cardOperateSv.getAreaCodeByNum(po.getClientNum());
- if(areaCode.trim().length() == 0) {
+ Long areaCodeL = cardOperateSv.getAreaCodeById(clientId);
+ if (areaCodeL == null) {
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);
- }
+ String areaCode = String.valueOf(areaCodeL);
/**
* 鏍规嵁琛屾斂鍖哄垝涓诧紙areaCode锛夊湪姘村崱琛ㄤ腑閽堝姘村崱缂栧彿锛坈ardNum锛夎繘琛屾ā绯婃煡璇�
- * 濡傛灉4浣嶉『搴忓彿宸茬粡杈惧埌鏈�澶у�硷紝鎻愮ず鐢ㄦ埛鑱旂郴绯荤粺绠＄悊鍛�
- * 濡傛灉4浣嶉『搴忓彿鏈揪鍒版渶澶у�硷紝鍒欏姞1
+ * 濡傛灉椤哄簭鍙峰凡缁忚揪鍒版渶澶у�硷紝鎻愮ず鐢ㄦ埛鑱旂郴绯荤粺绠＄悊鍛�
+ * 濡傛灉椤哄簭鍙锋湭杈惧埌鏈�澶у�硷紝鍒欏姞1
* cardNum涓烘柊鐨勫崱鍙�
*/
String cardNum = Optional.ofNullable(cardOperateSv.getCardNumOfMax(areaCode)).orElse("");
- if(cardNum != null && cardNum.trim().length() > 0) {
+ if (cardNum != null && cardNum.trim().length() > 0) {
Integer number = Integer.parseInt(cardNum.substring(12));
number = number + 1;
- if(number > 65535) {
+ if (number > 65535) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_OVERRUN.getMessage());
}
cardNum = cardNum.substring(0, 12) + String.format("%05d", number);
@@ -101,8 +108,8 @@
/**
* cardAddr 姘村崱鍦板潃锛堜粎浠呭啓鍏ワ紝鏃犱笟鍔★級
- * clientNum 鍐滄埛缂栧彿
* cardCost 鍗＄墖璐圭敤
+ * originalCardId 鍘熸按鍗D
* amount 鍏呭�奸噾棰濓紝鍏呭�兼帴鍙ｄ负杈撳叆鍙傛暟锛岃ˉ鍗℃帴鍙ｄ负鍘熷崱閫�杩橀噾棰�
* reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
@@ -110,8 +117,8 @@
* operator 鎿嶄綔浜虹紪鍙�
* activeTime 寮�鍗℃椂闂�
*/
+ String protocol = po.getProtocol();
String cardAddr = po.getCardAddr();
- String clientNum = po.getClientNum();
Integer cardCost = po.getCardCost();
Long originalCardId = po.getOriginalCardId();
Float amount = po.getAmount();
@@ -121,47 +128,54 @@
Date activeTime = new Date();
/**
- * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID
- */
- Long clientId = cardOperateSv.getClientIdByNum(clientNum);
- if(clientId == null) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.CLIENT_NUM_ERROR.getMessage());
- }
-
- /**
* 娣诲姞鍐滄埛鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄綋鍓嶄綑棰�
*/
SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setProtocol(protocol);
seClientCard.setCardaddr(cardAddr);
seClientCard.setCardnum(cardNum);
seClientCard.setClientid(clientId);
seClientCard.setMoney(amount);
- seClientCard.setState(CardStateENUM.NORMAL.getCode());
- if(originalCardId != null) {
+ // 寮�鍗℃椂鍗＄墖鐘舵�佷负鏃犳晥
+ seClientCard.setState(CardStateENUM.INVALID.getCode());
+ if (originalCardId != null) {
+ // 琛ュ崱
seClientCard.setOriginalCardId(originalCardId);
+ seClientCard.setLastoper(LastOperateENUM.REPLACE.getCode());
+ seClientCard.setReplacedt(activeTime);
+ } else {
+ // 寮�鏂板崱
+ seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ seClientCard.setCreatedt(activeTime);
}
- seClientCard.setCreatedt(activeTime);
- seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
- Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
- if(cardId == 0) {
+ Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L);
+ if (cardId == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
- * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
+ * 娣诲姞寮�鍗℃搷浣滆褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
seCardOperate.setClientId(clientId);
- seCardOperate.setMoney(amount);
+ seCardOperate.setMoney(0f);
seCardOperate.setCardCost(cardCost);
seCardOperate.setPaymentId(paymentId);
- seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ if (originalCardId != null) {
+ // 琛ュ崱
+ seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
+ seCardOperate.setNoTradeAmount(amount);
+ } else {
+ // 寮�鏂板崱
+ seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ }
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(activeTime);
+ seCardOperate.setOperateValid((byte) 1);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR.getMessage());
}
@@ -169,32 +183,32 @@
* 濡傛灉鎿嶄綔浜哄憳寮�鍗℃椂杈撳叆浜嗗厖鍊奸噾棰濓紝鍒欏紑鍗″悗璋冪敤鍏呭�煎姛鑳�
* 琛ュ崱闄ゅ锛岃ˉ鍗＄殑閫�杩橀噾棰濇槸浠庢寕澶卞崱涓浆绉昏繃鏉ョ殑锛屾病鏈夊疄闄呴噾閽变氦鏄�
*/
- po.setCardNum(Long.parseLong(cardNum));
- if(amount != null && amount > 0 && originalCardId == null) {
- po.setClientId(clientId);
- DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po);
+ if (amount != null && amount > 0 && originalCardId == null) {
+ DtoRecharge dtoRecharge = new DtoRecharge();
+ dtoRecharge.setCardNum(Long.parseLong(cardNum));
+ dtoRecharge.setAmount(amount);
+ dtoRecharge.setPaymentId(paymentId);
+ dtoRecharge.setRemarks(remarks);
+ dtoRecharge.setOperator(operator);
dtoRecharge.setMoney(0f);
dtoRecharge.setGift(0f);
dtoRecharge.setPrice(0f);
BaseResponse<Boolean> job = cardOperateSv.addRecharge(dtoRecharge);
- if(!job.getCode().equals("0001")) {
+ if (!job.getCode().equals("0001")) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_RECHARGE_EXCEPTION.getMessage());
}
}
- if(po.getProtocol().trim().equals("p206V1_0_1")) {
- cardNum = cardNum.substring(6,12) + cardNum.substring(13);
- }
-
Map map = new HashMap();
- map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
- map.put("orderNumber", cardId);
+ map.put("projectNo", String.format("%02x", projectNo));
+ map.put("orderNumber", rec);
map.put("cardNum", cardNum);
- return BaseResponseUtils.buildSuccess(map) ;
+ return BaseResponseUtils.buildSuccess(map);
}
/**
* 琛ュ崱
+ *
* @param po
* @param bindingResult
* @return
@@ -202,9 +216,9 @@
@PostMapping(path = "reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_reissue(@RequestBody @Valid DtoReissue po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_reissue(@RequestBody @Valid DtoReissue po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
@@ -220,8 +234,10 @@
* operator 鎿嶄綔浜虹紪鍙�
*/
+ String protocol;
String cardAddr = po.getCardAddr();
String clientNum = "";
+ Long clientId = 0L;
Long cardNum = po.getCardNum();
Long cardId = 0L;
Integer cardCost = Optional.ofNullable(po.getCardCost()).orElse(0);
@@ -229,25 +245,16 @@
Long paymentId = po.getPaymentId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
- String protocol = null;
-
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- String cardNumS = String.valueOf(cardNum).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- protocol = "p206V1_0_1";
- }
- cardNum = Long.valueOf(cardNumS);
// 鍒ゆ柇褰撳墠姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏈ˉ鍗★紝浠呭凡缁忔寕澶变笖鏈ˉ鍗＄殑鍙互琛ュ崱
- if(!cardOperateSv.isLostAndUnreplaced(cardNum)) {
+ if (!cardOperateSv.isLostAndUnreplaced(cardNum)) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
// 濡傛灉浼犲叆浜嗛��杩橀噾棰濓紝闇�瑕佸垽鏂�佸崱锛堣鎸傚け鐨勬按鍗★級鎸傚け鏃舵槸鍚﹀凡缁忛��娆撅紝鏃犺閫�娆惧灏戦兘鎻愮ず鐢ㄦ埛鎸傚け鏃跺凡閫�娆�
- if(reissueAmount != null) {
+ if (reissueAmount != null && reissueAmount > 0) {
Double tradeAmount = cardOperateSv.getTradeAmountByCardNo(cardNum);
- if(tradeAmount != null) {
+ if (tradeAmount != null && tradeAmount > 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.THE_FEE_CANNOT_BE_REFUNDED.getMessage());
}
}
@@ -256,43 +263,45 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
clientNum = map.get("clientNum").toString();
cardId = Long.parseLong(map.get("cardId").toString());
+ clientId = Long.parseLong(map.get("clientId").toString());
+ protocol = map.get("protocol").toString();
/**
* 濡傛灉鏄ˉ鍗¤皟鐢ㄧ殑寮�鍗′笖杞Щ浜嗛��杩橀噾棰濓紝闇�淇敼鎸傚け鍗′綑棰濅负0
+ * 閫氱煡琛ュ崱鎴愬姛鏃跺啀澶勭悊
+ if(reissueAmount != null) {
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setId(cardId);
+ seClientCard.setMoney(0f);
+ cardOperateSv.updateClientCard(seClientCard);
+ }
*/
- if(reissueAmount != null) {
- SeClientCard seClientCard = new SeClientCard();
- seClientCard.setId(cardId);
- seClientCard.setMoney(0f);
- cardOperateSv.updateClientCard(seClientCard);
- }
/**
* 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濆啿鍒版柊鍗′腑
*/
- DtoActiveCard dtoActiveCard = new DtoActiveCard();
- dtoActiveCard.setProtocol(protocol);
- dtoActiveCard.setCardAddr(cardAddr);
- dtoActiveCard.setClientNum(clientNum);
- dtoActiveCard.setOriginalCardId(cardId);
- //dtoActiveCard.setOriginalCardId(cardNum);
- dtoActiveCard.setCardCost(cardCost);
- dtoActiveCard.setAmount(reissueAmount);
- dtoActiveCard.setPaymentId(paymentId);
- dtoActiveCard.setRemarks(remarks);
- dtoActiveCard.setOperator(operator);
- BaseResponse<java.lang.Boolean> baseResponse_addActive = add_active(dtoActiveCard, null);
+ ActiveCard activeCard = new ActiveCard();
+ activeCard.setProtocol(protocol);
+ activeCard.setCardAddr(cardAddr);
+ activeCard.setClientId(clientId);
+ activeCard.setOriginalCardId(cardId);
+ activeCard.setCardCost(cardCost);
+ activeCard.setAmount(reissueAmount);
+ activeCard.setPaymentId(paymentId);
+ activeCard.setRemarks(remarks);
+ activeCard.setOperator(operator);
+ BaseResponse<java.lang.Boolean> baseResponse_addActive = add_active(activeCard, null);
- if(!baseResponse_addActive.getCode().equals("0001")) {
+ if (!baseResponse_addActive.getCode().equals("0001")) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
}
- JSONObject job_content = (JSONObject) JSON.toJSON( baseResponse_addActive.getContent());
+ JSONObject job_content = (JSONObject) JSON.toJSON(baseResponse_addActive.getContent());
cardNum = job_content.getLong("cardNum");
String orderNumber = job_content.getString("orderNumber");
String projectNo = job_content.getString("projectNo");
@@ -301,27 +310,30 @@
map_response.put("projectNo", projectNo);
map_response.put("orderNumber", orderNumber);
map_response.put("cardNum", cardNum);
- return BaseResponseUtils.buildSuccess(map_response) ;
+ map_response.put("protocol", protocol);
+ return BaseResponseUtils.buildSuccess(map_response);
}
/**
* 鍏呭��
- * @param po 鍏呭�间紶杈撳璞�
+ *
+ * @param po 鍏呭�间紶杈撳璞�
* @param bindingResult
* @return
*/
@PostMapping(path = "recharge", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_recharge(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_recharge(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
return cardOperateSv.addRecharge(po);
}
/**
* 閿�鍗�
+ *
* @param po
* @param bindingResult
* @return
@@ -329,9 +341,9 @@
@PostMapping(path = "cancel", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_cancel(@RequestBody @Valid DtoCancel po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_cancel(@RequestBody @Valid DtoCancel po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
@@ -348,21 +360,14 @@
Long clientId = 0L;
Long cardNum = po.getCardNum();
Float refund = po.getRefund();
- Byte refundType = po.getRefundType();
+ Long refundType = po.getRefundType();
String remarks = po.getRemarks();
Long operator = po.getOperator();
Date cancelTime = new Date();
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- String cardNumS = String.valueOf(cardNum).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- }
- cardNum = Long.valueOf(cardNumS);
-
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
- if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
+ if (stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -370,52 +375,59 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
clientId = Long.parseLong(map.get("clientId").toString());
/**
- * 淇敼鍐滄埛鍗′俊鎭細
+ * 淇敼鍐滄埛鍗′俊鎭紝閫氱煡鏃跺啀澶勭悊
* 娉ㄩ攢鏃堕棿
* 鏈�鍚庢搷浣滅被鍨�-4
+
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setId(cardId);
+ seClientCard.setCanceldt(cancelTime);
+ seClientCard.setMoney(0f);
+ seClientCard.setState(CardStateENUM.CANCELLED.getCode());
+ seClientCard.setLastoper(LastOperateENUM.CANCEL.getCode());
+ Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
+ if(rec_updateClientCard == 0) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.CANCEL_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
+ }
*/
- SeClientCard seClientCard = new SeClientCard();
- seClientCard.setId(cardId);
- seClientCard.setCanceldt(cancelTime);
- seClientCard.setMoney(0f);
- seClientCard.setState(CardStateENUM.CANCELLED.getCode());
- seClientCard.setLastoper(LastOperateENUM.CANCEL.getCode());
- Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
- if(rec_updateClientCard == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.CANCEL_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
- }
/**
- * 娣诲姞娉ㄩ攢璁板綍
+ * 娣诲姞娉ㄩ攢鎿嶄綔璁板綍
* 鏀粯鏂瑰紡涓虹幇閲�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
seCardOperate.setClientId(clientId);
seCardOperate.setTradeAmount(-refund);
- seCardOperate.setPaymentId(1L);
+ seCardOperate.setPaymentId(refundType);
seCardOperate.setOperateType(OperateTypeENUM.CANCEL.getCode());
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(cancelTime);
+ seCardOperate.setOperateValid((byte) 1);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CANCEL_FAIL_WRITE_CANCELL_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", projectNo));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response);
}
/**
- * 鎸傚け
+ * 鎸傚け锛屼笉闇�瑕佷簩娆￠�氱煡
+ *
* @param po
* @param bindingResult
* @return
@@ -423,9 +435,9 @@
@PostMapping(path = "loss", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_loss(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_loss(@RequestBody @Valid DtoLoss po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
@@ -447,16 +459,9 @@
Long operator = po.getOperator();
Date lossTime = new Date();
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- String cardNumS = String.valueOf(cardNum).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- }
- cardNum = Long.valueOf(cardNumS);
-
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
- if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
+ if (stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -464,7 +469,7 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
@@ -477,6 +482,7 @@
* 鐘舵��
* 鏈�鍚庢搷浣滅被鍨�-6
*/
+
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
seClientCard.setMoney(money);
@@ -484,9 +490,10 @@
seClientCard.setState(CardStateENUM.LOSS.getCode());
seClientCard.setLastoper(LastOperateENUM.LOSS.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
- if(rec_updateClientCard == 0) {
+ if (rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.LOSS_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
+
/**
* 娣诲姞鎸傚け璁板綍
@@ -502,16 +509,22 @@
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(lossTime);
+ seCardOperate.setOperateValid((byte) 2);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.LOSS_FAIL_WRITE_LOSS_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", projectNo));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response);
}
/**
- * 鍐叉
+ * 鍐叉锛�2024-09-30 浣滃簾锛屽啿姝ｅ姛鑳界敱鍏呭�煎姛鑳戒唬鏇�
+ *
* @param po
* @param bindingResult
* @return
@@ -519,9 +532,9 @@
@PostMapping(path = "reversal", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_reversal(@RequestBody @Valid DtoReversal po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_reversal(@RequestBody @Valid DtoReversal po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
@@ -543,16 +556,9 @@
Long operator = po.getOperator();
Date reversalTime = new Date();
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- String cardNumS = String.valueOf(cardNum).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- }
- cardNum = Long.valueOf(cardNumS);
-
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
- if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
+ if (stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -560,7 +566,7 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
@@ -568,8 +574,8 @@
/**
* 淇敼鍐滄埛鍗′俊鎭細
- * 鎸傚け鏃堕棿
- * 鏈�鍚庢搷浣滅被鍨�-4
+ * 鍐叉鏃堕棿
+ * 鏈�鍚庢搷浣滅被鍨�-7
*/
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
@@ -577,7 +583,7 @@
seClientCard.setMoney(cardBalance);
seClientCard.setLastoper(LastOperateENUM.REVERSAL.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
- if(rec_updateClientCard == 0) {
+ if (rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
@@ -593,16 +599,23 @@
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(reversalTime);
+ seCardOperate.setOperateValid((byte) 2);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.REVERSAL_FAIL_WRITE_REVERSAL_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", projectNo));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response);
+
}
/**
* 琛ユ墸
+ *
* @param po
* @param bindingResult
* @return
@@ -610,9 +623,9 @@
@PostMapping(path = "refund", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_refund(@RequestBody @Valid DtoRefund po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_refund(@RequestBody @Valid DtoRefund po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
@@ -634,16 +647,9 @@
Long operator = po.getOperator();
Date refundTime = new Date();
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- String cardNumS = String.valueOf(cardNum).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- }
- cardNum = Long.valueOf(cardNumS);
-
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
- if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
+ if (stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -651,50 +657,52 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
clientId = Long.parseLong(map.get("clientId").toString());
/**
- * 淇敼鍐滄埛鍗′俊鎭細
- * 鎸傚け鏃堕棿
- * 鏈�鍚庢搷浣滅被鍨�-4
+ * 淇敼鍐滄埛鍗′俊鎭紝閫氱煡鏃跺鐞�
+ * 琛ユ墸鏃堕棿
+ * 鏈�鍚庢搷浣滅被鍨�-5
+
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setId(cardId);
+ seClientCard.setRefunddt(refundTime);
+ seClientCard.setMoney(money + refund);
+ seClientCard.setLastoper(LastOperateENUM.REFUND.getCode());
+ Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
+ if(rec_updateClientCard == 0) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
+ }
*/
- SeClientCard seClientCard = new SeClientCard();
- seClientCard.setId(cardId);
- seClientCard.setRefunddt(refundTime);
- seClientCard.setMoney(money + refund);
- seClientCard.setLastoper(LastOperateENUM.REFUND.getCode());
- Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
- if(rec_updateClientCard == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
- }
/**
- * 娣诲姞琛ユ墸璁板綍
+ * 娣诲姞琛ユ墸鎿嶄綔璁板綍
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
seCardOperate.setClientId(clientId);
seCardOperate.setMoney(money);
- //seCardOperate.setNoTradeAmount(refund);
seCardOperate.setRefundAmount(refund);
seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode());
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(refundTime);
+ seCardOperate.setOperateValid((byte) 1);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.REFUND_FAIL_WRITE_REFUND_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildSuccess(true);
}
/**
- * 瑙ｉ攣
+ * 瑙ｉ攣锛屼笉闇�瑕佷簩娆￠�氱煡
+ *
* @param po
* @param bindingResult
* @return
@@ -702,9 +710,9 @@
@PostMapping(path = "unlock", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_unlock(@RequestBody @Valid DtoUnlock po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ public BaseResponse<Boolean> add_unlock(@RequestBody @Valid DtoUnlock po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
@@ -724,15 +732,8 @@
Long operator = po.getOperator();
Date unlockTime = new Date();
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- String cardNumS = String.valueOf(cardNum).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- }
- cardNum = Long.valueOf(cardNumS);
-
// 鍒ゆ柇褰撳墠姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏈ˉ鍗★紝浠呭凡缁忔寕澶卞叾鏈ˉ鍗＄殑鍙互瑙ｉ攣
- if(!cardOperateSv.isLostAndUnreplaced(cardNum)) {
+ if (!cardOperateSv.isLostAndUnreplaced(cardNum)) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -740,7 +741,7 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
@@ -758,7 +759,7 @@
seClientCard.setState(CardStateENUM.NORMAL.getCode());
seClientCard.setLastoper(LastOperateENUM.UNLOCK.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
- if(rec_updateClientCard == 0) {
+ if (rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.UNLOCK_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
@@ -773,16 +774,172 @@
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(unlockTime);
+ seCardOperate.setOperateValid((byte) 2);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.UNLOCK_FAIL_WRITE_UNLOCK_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", projectNo));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response);
}
/**
+ * 鎿嶄綔鎵ц鍥炶皟
+ *
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "call_back", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> callBack(@RequestBody @Valid CallBack po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String cardAddr = po.getCardAddr();
+ Integer operateType = po.getOperateType();
+
+ // 姝ゆ椂鏃犻渶鍒ゆ柇鍗＄墖鐘舵��
+ Long cardId = cardOperateSv.getCardIdByAddr(cardAddr);
+ if (cardId == null || cardId.equals(0)) {
+ return BaseResponseUtils.buildErrorMsg("鎮ㄦ寚瀹氱殑姘村崱涓嶅瓨鍦�");
+ }
+
+ if (operateType == 1) {
+ /**
+ * 寮�鍗℃搷浣滄墽琛岄�氱煡
+ * 1.渚濇嵁姘村崱鍦板潃灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鎸囧畾鎿嶄綔璁板綍鏀逛负鏈夋晥
+ * 2.渚濇嵁姘村崱ID灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑姘村崱璁板綍鏀逛负鏈夋晥
+ * 3.濡傛灉寮�鍗″悓姝ュ厖鍊�
+ * 淇敼鍏呭�兼搷浣滆褰曚负鏈夋晥
+ * 淇敼鍏呭�煎巻鍙茶褰曚负鏈夋晥
+ * 淇敼姘村崱琛ㄧ殑鎿嶄綔淇℃伅
+ */
+ Integer rec_card = Optional.ofNullable(cardOperateSv.turnCardValidByAddr(cardAddr, operateType)).orElse(0);
+ Integer rec_ope = Optional.ofNullable(cardOperateSv.turnOperateValidByCardId(cardId, operateType)).orElse(0);
+ if (rec_card == 0 || rec_ope == 0) {
+ return BaseResponseUtils.buildErrorMsg("涓嶅瓨鍦ㄦ湭鐢熸晥鐨勬按鍗�");
+ }
+
+ Boolean isMergeRecharge = cardOperateSv.isMergeRecharge(cardId);
+ if (isMergeRecharge) {
+ cardOperateSv.turnOperateValidByCardId(cardId, 2);
+ cardOperateSv.turnRechargeHistoryValidByCardId(cardId);
+ cardOperateSv.updateCard(cardId);
+ }
+
+ } else if (operateType == 2) {
+ /**
+ * 鍏呭�兼搷浣滄墽琛岄�氱煡
+ * 1.鎿嶄綔璁板綍鏀逛负鏈夋晥-cardId
+ * 2.鍏呭�煎巻鍙茶褰曟敼涓烘湁鏁�-cardId
+ * 3.浼戞按鍗¤〃鐨勬搷浣滀俊鎭強浣欓-cardId銆侊紙mondy銆乤mount銆乬ift浠庡厖鍊煎巻鍙茶〃涓幏鍙栵級
+ */
+
+ Integer rec_ope = Optional.ofNullable(cardOperateSv.turnOperateValidByCardId(cardId, operateType)).orElse(0);
+ Integer rec_recharge = cardOperateSv.turnRechargeHistoryValidByCardId(cardId);
+ if (rec_recharge == 0 || rec_ope == 0) {
+ return BaseResponseUtils.buildErrorMsg("涓嶅瓨鍦ㄦ湭鐢熸晥鐨勬按鍗�");
+ }
+ cardOperateSv.updateCard(cardId);
+
+ } else if (operateType == 3) {
+ /**
+ * 閿�鍗℃搷浣滄墽琛岄�氱煡
+ * 1.鎿嶄綔璁板綍鏀逛负鏈夋晥-cardId
+ * 2.淇敼姘村崱琛ㄧ殑璁板綍鍙婁綑棰濓紙0锛�
+ */
+ cardOperateSv.turnOperateValidByCardId(cardId, operateType);
+ cardOperateSv.updateCancels(operateType, cardId);
+ } else if (operateType == 4) {
+ /**
+ * 琛ュ崱鎿嶄綔鎵ц閫氱煡
+ * 1.鏂版按鍗¤褰曟敼涓烘湁鏁�-cardId
+ * 2.寮�鍗℃搷浣滆褰曟敼涓烘湁鏁�-cardId
+ * 3.濡傛灉瀛樺湪閫�杩橀噾棰�
+ * 娓呯┖鍘熷崱浣欓
+ */
+ Integer rec_card = Optional.ofNullable(cardOperateSv.turnCardValidByAddr(cardAddr, operateType)).orElse(0);
+ Integer rec_ope = Optional.ofNullable(cardOperateSv.turnOperateValidByCardId(cardId, operateType)).orElse(0);
+ if (rec_card == 0 || rec_ope == 0) {
+ return BaseResponseUtils.buildErrorMsg("涓嶅瓨鍦ㄦ湭鐢熸晥鐨勬按鍗�");
+ }
+ cardOperateSv.emptyCardBalance(operateType, cardId);
+
+ } else if (operateType == 5) {
+ /**
+ * 琛ユ墸鎿嶄綔鎵ц閫氱煡
+ * 1.鎿嶄綔璁板綍鏀逛负鏈夋晥
+ * 2.淇敼姘村崱琛ㄧ殑鎿嶄綔淇℃伅鍙婁綑棰�-浠庢搷浣滆褰曚腑鍙杕oney銆乺efund
+ */
+ cardOperateSv.turnOperateValidByCardId(cardId, operateType);
+ cardOperateSv.updateRefund(operateType, cardId);
+ }
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鍒涘缓绠＄悊鍗�
+ *
+ * @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
*/
@@ -797,53 +954,90 @@
})
@GetMapping(path = "/getRecharges")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QoRecharge vo){
- // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
- if(vo != null && vo.getCardNum() != null) {
- String cardNumS = String.valueOf(vo.getCardNum()).trim();
- if(cardNumS.length() == 10) {
- cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
- vo.setCardNum(Long.parseLong(cardNumS));
- }
- }
-
+ public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QoRecharge vo) {
try {
QueryResultVo<List<VoRecharge>> res = cardOperateSv.getRecharges(vo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇鍏呭�艰褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�
+ *
+ * @param vo
+ * @return
+ */
+ @GetMapping(path = "/getRechargesNew")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoRechargeNew>>> getRechargesNew(QoRecharge vo) {
+ try {
+ QueryResultVo<List<VoRechargeNew>> res = cardOperateSv.getRechargesNew(vo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鍏呭�艰褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇杩旇繕璁板綍锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�
+ *
+ * @param vo
+ * @return
+ */
+ @GetMapping(path = "/refunds")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoRefund>>> getRefunds(QoRecharge vo) {
+ try {
+ QueryResultVo<List<VoRefund>> res = cardOperateSv.getRefunds(vo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇杩旇繕璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇姘村崱娑堣垂璁板綍锛岀鐞嗗钩鍙颁娇鐢�
+ *
+ * @param vo
+ * @return
+ */
+ @GetMapping(path = "/expends")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoExpend>>> getExpends(QoRecharge vo) {
+ try {
+ QueryResultVo<List<VoExpend>> res = cardOperateSv.getExpends(vo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇娑堣垂璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗鏄庣粏
+ *
* @param vo
* @return
*/
- @Operation(summary = "鑾峰緱浜ゆ槗璁板綍鏄庣粏", description = "杩斿洖浜ゆ槗璁板綍鏄庣粏")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = BaClient.class))}
- )
- })
@GetMapping(path = "getTransactions")
@SsoAop()
- public BaseResponse<Map> getOperates(QoTransaction vo){
+ public BaseResponse<Map> getOperates(QoTransaction vo) {
try {
- Map res = cardOperateSv.getTransactions(vo);
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(cardOperateSv.getTransactions(vo));
} catch (Exception e) {
log.error("鏌ヨ浜ゆ槗璁板綍寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�
+ *
* @param vo
* @return
*/
@@ -858,21 +1052,22 @@
})
@GetMapping(path = "/getActiveCards")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo){
+ public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo) {
try {
QueryResultVo<List<VoActiveCard>> res = cardOperateSv.getActiveCards(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.No_ActiveCards.getMessage());
- }
+// if(res.itemTotal == 0) {
+// return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ActiveCards.getMessage());
+// }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍
+ *
* @param vo
* @return
*/
@@ -887,16 +1082,16 @@
})
@GetMapping(path = "/getReissueCards")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoReissueCard>>> getReissueCards(QoReissueCard vo){
+ public BaseResponse<QueryResultVo<List<VoReissueCard>>> getReissueCards(QoReissueCard vo) {
try {
QueryResultVo<List<VoReissueCard>> res = cardOperateSv.getReissueCards(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.No_ReissueCards.getMessage());
- }
+// if(res.itemTotal == 0) {
+// return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ReissueCards.getMessage());
+// }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇琛ュ崱璁板綍寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
@@ -904,6 +1099,7 @@
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍
* 娉ㄩ攢銆佹寕澶便�佸啿姝ｃ�佽В閿侀�氱敤
* 娉ㄩ攢-3锛屾寕澶�-6锛屽啿姝�-7锛岃В閿�-8
+ *
* @param vo
* @return
*/
@@ -918,27 +1114,28 @@
})
@GetMapping(path = "/getOptions")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoOperate>>> getCommonOperations(QoCommonOperate vo){
+ public BaseResponse<QueryResultVo<List<VoOperate>>> getCommonOperations(QoCommonOperate vo) {
// 楠岃瘉鎿嶄綔绫诲瀷鏄惁姝ｇ‘
Integer operateType = Optional.ofNullable(vo.getOperateType()).orElse(0);
- if(operateType != 3 && operateType != 6 && operateType != 7 && operateType != 8) {
- return BaseResponseUtils.buildFail(SellResultCode.PARAMS_ERROR.getMessage());
+ if (operateType != 3 && operateType != 6 && operateType != 7 && operateType != 8) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.PARAMS_ERROR.getMessage());
}
try {
QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.No_CANCELS.getMessage());
- }
+// if(res.itemTotal == 0) {
+// return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
+// }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃
+ *
* @param vo
* @return
*/
@@ -953,21 +1150,18 @@
})
@GetMapping(path = "/get_receipts")
@SsoAop()
- public BaseResponse<Map> getReceipts(QoReceipt vo){
+ public BaseResponse<Map> getReceipts(QoReceipt vo) {
try {
- Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
- if(res.size() == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.No_RECEIPTS.getMessage());
- }
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(cardOperateSv.getReceipts(vo));
} catch (Exception e) {
log.error("鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 閲戦杞ぇ鍐�
+ *
* @param amount
* @return
*/
@@ -977,9 +1171,9 @@
try {
AmountToChinese amountToChinese = new AmountToChinese();
String chinese = amountToChinese.toChinese(amount);
- return BaseResponseUtils.buildSuccess(chinese) ;
+ return BaseResponseUtils.buildSuccess(chinese);
} catch (Exception e) {
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
--
Gitblit v1.8.0