From e1cb03bf866b04589dd5457db1f4517d9e77f42d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 15:45:29 +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 | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 104 insertions(+), 39 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 c0d55cf..0556ce3 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.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.*;
@@ -59,6 +56,9 @@
@Value("${project.divisionCode}")
private String divisionCode;
+
+ @Value("${project.projectNo}")
+ private Integer projectNo;
/**
* 寮�鍗�
* @param po 寮�鍗′紶鍏ュ璞�
@@ -71,6 +71,11 @@
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();
@@ -135,6 +140,13 @@
seClientCard.setOriginalCardId(originalCardId);
}
seClientCard.setCreatedt(activeTime);
+ //if(cardCost == 0) {
+ // // 鎹㈠崱
+ // seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
+ //}else {
+ // // 寮�鍗�
+ // seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ //}
seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
if(cardId == 0) {
@@ -142,7 +154,7 @@
}
/**
- * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
+ * 娣诲姞寮�鍗℃搷浣滆褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -150,7 +162,18 @@
seCardOperate.setMoney(0f);
seCardOperate.setCardCost(cardCost);
seCardOperate.setPaymentId(paymentId);
- seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ if(originalCardId != null) {
+ // 琛ュ崱
+ seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
+ }else {
+ // 寮�鏂板崱鎴栨崲鍗�
+ //if(cardCost > 0) {
+ // seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ //}else {
+ // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
+ //}
+ seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ }
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(activeTime);
@@ -180,7 +203,8 @@
}
Map map = new HashMap();
- map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+// map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map.put("projectNo", String.format("%02x", projectNo));
map.put("orderNumber", rec);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
@@ -374,7 +398,7 @@
}
/**
- * 娣诲姞娉ㄩ攢璁板綍
+ * 娣诲姞娉ㄩ攢鎿嶄綔璁板綍
* 鏀粯鏂瑰紡涓虹幇閲�
*/
SeCardOperate seCardOperate = new SeCardOperate();
@@ -393,7 +417,7 @@
}
Map map_response = new HashMap();
- map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map_response) ;
@@ -486,7 +510,7 @@
}
Map map_response = new HashMap();
- map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map_response) ;
@@ -574,7 +598,7 @@
}
Map map_response = new HashMap();
- map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map_response) ;
@@ -646,7 +670,7 @@
}
/**
- * 娣诲姞琛ユ墸璁板綍
+ * 娣诲姞琛ユ墸鎿嶄綔璁板綍
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -744,7 +768,7 @@
}
Map map_response = new HashMap();
- map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map_response) ;
@@ -829,25 +853,66 @@
}
/**
+ * 鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝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){
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()) ;
@@ -873,9 +938,9 @@
public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo){
try {
QueryResultVo<List<VoActiveCard>> res = cardOperateSv.getActiveCards(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildErrorMsg(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);
@@ -902,9 +967,9 @@
public BaseResponse<QueryResultVo<List<VoReissueCard>>> getReissueCards(QoReissueCard vo){
try {
QueryResultVo<List<VoReissueCard>> res = cardOperateSv.getReissueCards(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildErrorMsg(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);
@@ -939,9 +1004,9 @@
try {
QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildErrorMsg(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);
@@ -967,11 +1032,11 @@
@SsoAop()
public BaseResponse<Map> getReceipts(QoReceipt vo){
try {
- Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
- if(res.size() == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.No_RECEIPTS.getMessage());
- }
- return BaseResponseUtils.buildSuccess(res);
+ // Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
+ // if(res.size() == 0) {
+ // return BaseResponseUtils.buildErrorMsg(SellResultCode.No_RECEIPTS.getMessage());
+ // }
+ return BaseResponseUtils.buildSuccess(cardOperateSv.getReceipts(vo));
} catch (Exception e) {
log.error("鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
--
Gitblit v1.8.0