From 03df72155ccd47912384b3e5f3fceb7331e377de Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 13 九月 2024 14:48:49 +0800
Subject: [PATCH] 2024-09-13 朱宝民 优化获取交易明细记录，余额改为操作表余额，返回字段增加收银员姓名及分页参数
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 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 29a0cd6..c3638e5 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,7 +7,6 @@
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;
@@ -76,6 +75,11 @@
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
@@ -138,6 +142,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) {
@@ -145,7 +156,7 @@
}
/**
- * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
+ * 娣诲姞寮�鍗℃搷浣滆褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -153,7 +164,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);
@@ -378,7 +400,7 @@
}
/**
- * 娣诲姞娉ㄩ攢璁板綍
+ * 娣诲姞娉ㄩ攢鎿嶄綔璁板綍
* 鏀粯鏂瑰紡涓虹幇閲�
*/
SeCardOperate seCardOperate = new SeCardOperate();
@@ -650,7 +672,7 @@
}
/**
- * 娣诲姞琛ユ墸璁板綍
+ * 娣诲姞琛ユ墸鎿嶄綔璁板綍
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -837,21 +859,11 @@
* @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()) ;
@@ -877,9 +889,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);
@@ -906,9 +918,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);
@@ -943,9 +955,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);
@@ -971,11 +983,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