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 | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 21 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 4eb7374..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
@@ -11,10 +11,8 @@
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.*;
@@ -63,7 +61,6 @@
private Integer projectNo;
/**
* 寮�鍗�
- * 褰撳崱鐗囪垂鐢ㄤ负0鏃跺嵆涓烘崲鍗℃搷浣滐紝涓嶆敹鍗＄墖璐圭敤锛屼笉鏀朵綑棰�
* @param po 寮�鍗′紶鍏ュ璞�
* @param bindingResult
* @return 姘村崱缂栧彿
@@ -143,21 +140,21 @@
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());
+ //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) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
- * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
+ * 娣诲姞寮�鍗℃搷浣滆褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -170,11 +167,12 @@
seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
}else {
// 寮�鏂板崱鎴栨崲鍗�
- if(cardCost > 0) {
- seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
- }else {
- seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
- }
+ //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);
@@ -400,7 +398,7 @@
}
/**
- * 娣诲姞娉ㄩ攢璁板綍
+ * 娣诲姞娉ㄩ攢鎿嶄綔璁板綍
* 鏀粯鏂瑰紡涓虹幇閲�
*/
SeCardOperate seCardOperate = new SeCardOperate();
@@ -672,7 +670,7 @@
}
/**
- * 娣诲姞琛ユ墸璁板綍
+ * 娣诲姞琛ユ墸鎿嶄綔璁板綍
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -855,6 +853,57 @@
}
/**
+ * 鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝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
--
Gitblit v1.8.0