From 66aa7a9df2b5576ab3335c9d250f74ed0347bf23 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 29 三月 2024 13:58:46 +0800
Subject: [PATCH] 恢复查询控制器接口（不小心把未完成的代码提交了)
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 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 5bfd02b..5978104 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,10 +10,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.util.AmountToChinese;
import com.dy.pipIrrGlobal.util.Constant;
-import com.dy.pipIrrGlobal.voSe.VoActiveCard;
-import com.dy.pipIrrGlobal.voSe.VoActiveCardNew;
-import com.dy.pipIrrGlobal.voSe.VoRecharge;
-import com.dy.pipIrrGlobal.voSe.VoReissueCard;
+import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.converter.RechargeDtoMapper;
import com.dy.pipIrrSell.cardOperate.dto.*;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
@@ -484,6 +481,7 @@
seCardOperate.setClientId(clientId);
seCardOperate.setMoney(money);
seCardOperate.setTradeAmount(-refund);
+ seCardOperate.setPaymentId(1L);
seCardOperate.setOperateType(OperateTypeENUM.LOSS.getCode());
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
@@ -794,13 +792,15 @@
public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QoRecharge vo){
try {
QueryResultVo<List<VoRecharge>> res = cardOperateSv.getRecharges(vo);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.No_RECHARGES.getMessage());
+ }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇鍏呭�艰褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
-
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗鏄庣粏
@@ -830,33 +830,6 @@
/**
- * 鑾峰彇浜ゆ槗姹囨�昏褰�
- * @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 = "getStatistics")
- @SsoAop()
- public BaseResponse<Map> getStatistics(QoTransactionStatistics vo){
- try {
- Map res = cardOperateSv.getTransactionStatistics(vo);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ浜ゆ槗姹囨�昏褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
-
- /**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�
* @param vo
* @return
@@ -872,9 +845,9 @@
})
@GetMapping(path = "/getActiveCards")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoActiveCardNew>>> getActiveCards(QoActiveCard vo){
+ public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo){
try {
- QueryResultVo<List<VoActiveCardNew>> res = cardOperateSv.getActiveCards(vo);
+ QueryResultVo<List<VoActiveCard>> res = cardOperateSv.getActiveCards(vo);
if(res.itemTotal == 0) {
return BaseResponseUtils.buildFail(SellResultCode.No_ActiveCards.getMessage());
}
@@ -884,8 +857,6 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
-
-
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍
@@ -917,6 +888,43 @@
}
/**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍
+ * 娉ㄩ攢銆佹寕澶便�佸啿姝ｃ�佽В閿侀�氱敤
+ * 娉ㄩ攢-3锛屾寕澶�-6锛屽啿姝�-7锛岃В閿�-8
+ * @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 = VoActiveCard.class))}
+ )
+ })
+ @GetMapping(path = "/getOptions")
+ @SsoAop()
+ 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());
+ }
+
+ try {
+ QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.No_CANCELS.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃
* @param vo
* @return
--
Gitblit v1.8.0